summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2008-03-27 17:49:56 +0100
committerKai Blin <kai@samba.org>2008-03-27 17:49:56 +0100
commit677dc6aa897aed0919050545155fbd868c210b89 (patch)
tree61e239435e85b4293deda808867ec328b87be6bd /source4
parent35f33a26404866c676285356a17e42b56523008a (diff)
downloadsamba-677dc6aa897aed0919050545155fbd868c210b89.tar.gz
samba-677dc6aa897aed0919050545155fbd868c210b89.tar.bz2
samba-677dc6aa897aed0919050545155fbd868c210b89.zip
provision: Initialize uninitialized variables if "targetdir" is not
defined and there is no smb.conf file (This used to be commit 19c29f473883be0a17fa740de9feb226f347df4a)
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 47d00f8871..e97ce694b4 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -373,7 +373,10 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
lockdir_line = "lock dir = " + os.path.abspath(targetdir)
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")
+
sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
netlogon = os.path.join(sysvol, realm.lower(), "scripts")