summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2012-03-01 19:37:25 +1100
committerAmitay Isaacs <amitay@samba.org>2012-03-01 11:41:02 +0100
commit00a5366fdbb58905ebc66bfe58e707a3b9c92b11 (patch)
treebe51bee308a0d2128304b81a3a4c131675b4a1f6 /source4
parent8b01b88fe85ef69a054456540ff3c92927bfc08a (diff)
downloadsamba-00a5366fdbb58905ebc66bfe58e707a3b9c92b11.tar.gz
samba-00a5366fdbb58905ebc66bfe58e707a3b9c92b11.tar.bz2
samba-00a5366fdbb58905ebc66bfe58e707a3b9c92b11.zip
s4-provision: Use "state directory" from lp, as it is always set
This fixes new provisions when --targetdir is not provided. Autobuild-User: Amitay Isaacs <amitay@samba.org> Autobuild-Date: Thu Mar 1 11:41:02 CET 2012 on sn-devel-104
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 48dd8673c7..d00c3ded47 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -645,8 +645,7 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir,
shares = {}
if serverrole == "domain controller":
- shares["sysvol"] = os.path.join(global_settings["state directory"],
- "sysvol")
+ shares["sysvol"] = os.path.join(lp.get("state directory"), "sysvol")
shares["netlogon"] = os.path.join(shares["sysvol"], realm.lower(),
"scripts")