Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 10:50:00 +0000 (11:50 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 25 Jan 2008 10:50:00 +0000 (11:50 +0100)
Conflicts:

source/scripting/python/samba/provision.py

source/scripting/python/samba/provision.py

index 26c4afe3c88490f6212f5276c9872506b509c081..f244679eb512763b414f7aea2b4e1472cc927c3b 100644 (file)
@@ -198,7 +198,6 @@ def provision_paths_from_lp(lp, dnsdomain, private_dir=None):
     paths.samdb = os.path.join(private_dir, lp.get("sam database") or "samdb.ldb")
     paths.secrets = os.path.join(private_dir, lp.get("secrets database") or "secrets.ldb")
     paths.templates = os.path.join(private_dir, "templates.ldb")
-
     paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
     paths.winsdb = os.path.join(private_dir, "wins.ldb")
     paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")