summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-28 10:38:12 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-28 10:38:12 +1100
commit4ddce8c28ca5abe2ac52cfb3a2956803f585b51a (patch)
treefefed3f05fff4ed27602deff9216e8e65fd1ad6c
parentde80e63efa857e39144650117985e9148eab033e (diff)
downloadsamba-4ddce8c28ca5abe2ac52cfb3a2956803f585b51a.tar.gz
samba-4ddce8c28ca5abe2ac52cfb3a2956803f585b51a.tar.bz2
samba-4ddce8c28ca5abe2ac52cfb3a2956803f585b51a.zip
Don't specify what should be a default option in the generated smb.conf
Instead, sub in "", so that the default continued to come from the code. Andrew Bartlett (This used to be commit b1829da8f75175fcc569a3a9195f2358731055a9)
-rw-r--r--source4/scripting/python/samba/provision.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e97ce694b4..d5e66d842c 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -374,8 +374,8 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
default_lp.set("lock dir", os.path.abspath(targetdir))
else:
- privatedir_line = "private_dir = " + default_lp.get("private dir")
- lockdir_line = "lock dir = " + default_lp.get("lock dir")
+ privatedir_line = ""
+ lockdir_line = ""
sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
netlogon = os.path.join(sysvol, realm.lower(), "scripts")