sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-13 05:49:31 +03:00
Code Activity

s4-provision: Place xattr.tdb in the actual state directory

Browse Source 
This patch does two things: it fixes up the spelling of "state dir" to
"state directory" so that we actually find the smb.conf parameter, and
we move it to after we process the global settings in case this is
changed in the future.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2012-06-05 09:56:53 +10:00
parent 68769c26ff
commit d2b635cc2f
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source4/scripting/python/samba/provision/__init__.py
View File

@ -627,19 +627,6 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir,
#Load non-existant file
if os.path.exists(smbconf):
lp.load(smbconf)
if eadb:
if use_ntvfs and not lp.get("posix:eadb"):
if targetdir is not None:
privdir = os.path.join(targetdir, "private")
else:
privdir = lp.get("private dir")
lp.set("posix:eadb", os.path.abspath(os.path.join(privdir, "eadb.tdb")))
elif not use_ntvfs and not lp.get("xattr_tdb:file"):
if targetdir is not None:
statedir = os.path.join(targetdir, "state")
else:
statedir = lp.get("state dir")
lp.set("xattr_tdb:file", os.path.abspath(os.path.join(statedir, "xattr.tdb")))
if global_param is not None:
for ent in global_param:
@ -656,6 +643,20 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir,
lp.set("state directory", global_settings["state directory"])
lp.set("cache directory", global_settings["cache directory"])
if eadb:
if use_ntvfs and not lp.get("posix:eadb"):
if targetdir is not None:
privdir = os.path.join(targetdir, "private")
else:
privdir = lp.get("private dir")
lp.set("posix:eadb", os.path.abspath(os.path.join(privdir, "eadb.tdb")))
elif not use_ntvfs and not lp.get("xattr_tdb:file"):
if targetdir is not None:
statedir = os.path.join(targetdir, "state")
else:
statedir = lp.get("state directory")
lp.set("xattr_tdb:file", os.path.abspath(os.path.join(statedir, "xattr.tdb")))
shares = {}
if serverrole == "domain controller":
shares["sysvol"] = os.path.join(lp.get("state directory"), "sysvol")