[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Thu Jul 21 02:07:02 MDT 2011
The branch, master has been updated
via e3fc1ab selftest: use "state directory" and "cache directory" options
via bed50f0 s4-param: use "state directory" and "cache directory" options
from 7f9d45b samba-tool: make sure we exit with an error on a bad command
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e3fc1aba860bb5b1460e4a9390257041a785846b
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Jul 20 13:02:22 2011 +0200
selftest: use "state directory" and "cache directory" options
instead of "state dir" and "cache dir"
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Thu Jul 21 10:06:32 CEST 2011 on sn-devel-104
commit bed50f04cb2234a0a2d6f3036405237b465b46ae
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Jul 20 12:56:22 2011 +0200
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 at samba.org>
-----------------------------------------------------------------------
Summary of changes:
selftest/selftest.pl | 4 ++--
selftest/target/Samba4.pm | 4 ++--
source4/param/loadparm.c | 8 ++++----
.../scripting/python/samba/provision/__init__.py | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 218f83b..78627c8 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -639,8 +639,8 @@ sub write_clientconf($$$)
print CF "
private dir = $clientdir/private
lock dir = $clientdir/lockdir
- state dir = $clientdir/statedir
- cache dir = $clientdir/cachedir
+ state directory = $clientdir/statedir
+ cache directory = $clientdir/cachedir
ncalrpc dir = $clientdir/ncalrpcdir
name resolve order = file bcast
panic action = $RealBin/gdb_backtrace \%d
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 47f1bad..a1d894d 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -597,8 +597,8 @@ sub provision_raw_step1($$)
pid directory = $ctx->{piddir}
ncalrpc dir = $ctx->{ncalrpcdir}
lock dir = $ctx->{lockdir}
- state dir = $ctx->{statedir}
- cache dir = $ctx->{cachedir}
+ state directory = $ctx->{statedir}
+ cache directory = $ctx->{cachedir}
winbindd socket directory = $ctx->{winbindd_socket_dir}
winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index b18f8fc..3b0eefe 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -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", "");
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 5b8dc70..4724afe 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -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),
--
Samba Shared Repository
More information about the samba-cvs
mailing list