1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-04 00:59:13 +03:00

s4-param: use "state directory" and "cache directory" options

instead of "state dir" and "cache dir" in order be compatible
with the source3 code.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Björn Baumbach
2011-07-20 12:56:22 +02:00
committed by Stefan Metzmacher
parent 7f9d45bf10
commit bed50f04cb
2 changed files with 9 additions and 9 deletions

View File

@ -719,19 +719,19 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole,
if targetdir is not None:
privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
lockdir_line = "lock dir = " + os.path.abspath(targetdir)
statedir_line = "state dir = " + os.path.abspath(targetdir)
cachedir_line = "cache dir = " + os.path.abspath(targetdir)
statedir_line = "state directory = " + os.path.abspath(targetdir)
cachedir_line = "cache directory = " + os.path.abspath(targetdir)
lp.set("lock dir", os.path.abspath(targetdir))
lp.set("state dir", os.path.abspath(targetdir))
lp.set("cache dir", os.path.abspath(targetdir))
lp.set("state directory", os.path.abspath(targetdir))
lp.set("cache directory", os.path.abspath(targetdir))
else:
privatedir_line = ""
lockdir_line = ""
statedir_line = ""
cachedir_line = ""
sysvol = os.path.join(lp.get("state dir"), "sysvol")
sysvol = os.path.join(lp.get("state directory"), "sysvol")
netlogon = os.path.join(sysvol, realm.lower(), "scripts")
setup_file(setup_path("provision.smb.conf.%s" % smbconfsuffix),