The branch, v4-0-test has been updated via 64babbec22f165e34799d36ff4b76806d9fead50 (commit) via 04fe8c8aefae8da8966954d0654c37adf2d0361d (commit) from 3131847cb67dadd8ee6fcbca5055927b8ba8a219 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit 64babbec22f165e34799d36ff4b76806d9fead50 Merge: 04fe8c8aefae8da8966954d0654c37adf2d0361d 3131847cb67dadd8ee6fcbca5055927b8ba8a219 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 25 11:50:00 2008 +0100 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial Conflicts: source/scripting/python/samba/provision.py commit 04fe8c8aefae8da8966954d0654c37adf2d0361d Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 25 11:47:44 2008 +0100 python/provision: Reload secrets when necessary, fix unix names in mappings. Pair programmed with Andrew. ----------------------------------------------------------------------- Summary of changes: source/scripting/python/samba/provision.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py index 26c4afe..f244679 100644 --- a/source/scripting/python/samba/provision.py +++ b/source/scripting/python/samba/provision.py @@ -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") -- Samba Shared Repository