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

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 48dd8673c7a159500364a7243595a67703a71966..d00c3ded479a336e54bae33194ea8421218daad7 100644 (file)
--- 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")