git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
59d8d17
)
Don't specify what should be a default option in the generated smb.conf
author
Andrew Bartlett
<abartlet@samba.org>
Thu, 27 Mar 2008 23:38:12 +0000
(10:38 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Thu, 27 Mar 2008 23:38:12 +0000
(10:38 +1100)
Instead, sub in "", so that the default continued to come from the code.
Andrew Bartlett
source/scripting/python/samba/provision.py
patch
|
blob
|
history
diff --git
a/source/scripting/python/samba/provision.py
b/source/scripting/python/samba/provision.py
index e97ce694b4cab133687c16973f0acb6d2b0e6977..d5e66d842c154cbb1094f5dd49bb59bd04fd6333 100644
(file)
--- a/
source/scripting/python/samba/provision.py
+++ b/
source/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")