sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/param/loadparm.c
View File

@ -1083,7 +1083,7 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
{
.label = "state dir",
.label = "state directory",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szStateDir),
@ -1091,7 +1091,7 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
{
.label = "cache dir",
.label = "cache directory",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szCacheDir),
@ -3309,8 +3309,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "pid directory", dyn_PIDDIR);
lpcfg_do_global_parameter(lp_ctx, "lock dir", dyn_LOCKDIR);
lpcfg_do_global_parameter(lp_ctx, "state dir", dyn_STATEDIR);
lpcfg_do_global_parameter(lp_ctx, "cache dir", dyn_CACHEDIR);
lpcfg_do_global_parameter(lp_ctx, "state directory", dyn_STATEDIR);
lpcfg_do_global_parameter(lp_ctx, "cache directory", dyn_CACHEDIR);
lpcfg_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
lpcfg_do_global_parameter(lp_ctx, "socket address", "");

10
source4/scripting/python/samba/provision/__init__.py
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),