summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorDouglas VanLeuven <roamdad@sonic.net>2008-03-03 11:08:59 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-03 11:08:59 +1100
commitc20cf59768d585baf4524c54dadba1ec60673894 (patch)
tree650f9e46fcbe49468be34379a61465f603d345f8 /source4/scripting
parent2db6aec31fe2b106e394dd7027064de4e6951b36 (diff)
downloadsamba-c20cf59768d585baf4524c54dadba1ec60673894.tar.gz
samba-c20cf59768d585baf4524c54dadba1ec60673894.tar.bz2
samba-c20cf59768d585baf4524c54dadba1ec60673894.zip
Fix member server provision
Can't add "member server" because the script aborts with null reference when no match on serverrole. This is fixed by checking for the keyword "member server". (This used to be commit 62536750ae06248a49c6b56c86d01b0062bb54f0)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 55935b0037..e9aded205a 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -830,7 +830,7 @@ def provision(lp, setup_dir, message, paths, session_info,
message("Setting up smb.conf")
if serverrole == "domain controller":
smbconfsuffix = "dc"
- elif serverrole == "member":
+ elif serverrole == "member server":
smbconfsuffix = "member"
setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix),
paths.smbconf, {