The branch, master has been updated
via 00a5366 s4-provision: Use "state directory" from lp, as it is
always set
from 8b01b88 Trivial Comment fix: Supply a missing word in a comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 00a5366fdbb58905ebc66bfe58e707a3b9c92b11
Author: Amitay Isaacs <[email protected]>
Date: Thu Mar 1 19:37:25 2012 +1100
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 <[email protected]>
Autobuild-Date: Thu Mar 1 11:41:02 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
.../scripting/python/samba/provision/__init__.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provision/__init__.py
b/source4/scripting/python/samba/provision/__init__.py
index 48dd867..d00c3de 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")
--
Samba Shared Repository
