git.samba.org
/
ira
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b01b88
)
s4-provision: Use "state directory" from lp, as it is always set
author
Amitay Isaacs
<amitay@gmail.com>
Thu, 1 Mar 2012 08:37:25 +0000
(19:37 +1100)
committer
Amitay Isaacs
<amitay@samba.org>
Thu, 1 Mar 2012 10:41:02 +0000
(11:41 +0100)
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
source4/scripting/python/samba/provision/__init__.py
patch
|
blob
|
history
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")