[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sun Aug 21 19:47:03 MDT 2011
The branch, master has been updated
via 43c0863 set passdb backend in Samba4 make test environments too
via 28f84aa selftest: skip all plugin_s4_dc tests if we do not have LDAP libs
via 399eae1 s4-provision set passdb backend to 'samba4' in template smb.conf files
from d713f9e s3-passdb: Only delete 1 entry from memcache.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 43c0863333355961a9a3951459005bba0e714f4f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Aug 22 10:05:02 2011 +1000
set passdb backend in Samba4 make test environments too
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Mon Aug 22 03:46:21 CEST 2011 on sn-devel-104
commit 28f84aa55ae830c31430ed2b67b0ea7ba8bbe8de
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Aug 22 10:00:25 2011 +1000
selftest: skip all plugin_s4_dc tests if we do not have LDAP libs
This is needed as otherwise make test fails on any system without
OpenLDAP libs and headers, which causes our users concern.
Andrew Bartlett
commit 399eae13a1675e3af58dc07ca719c1ab3d41fd06
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Aug 19 17:36:57 2011 +1000
s4-provision set passdb backend to 'samba4' in template smb.conf files
This will allow smbpasswd, net sam and pdbedit to 'just work' against
the newly created databases.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba4.pm | 2 ++
source3/param/loadparm_ctx.c | 4 +++-
source4/param/loadparm.c | 9 +++++++++
source4/selftest/tests.py | 11 ++++++-----
source4/setup/provision.smb.conf.dc | 2 ++
source4/setup/provision.smb.conf.member | 3 +++
source4/setup/provision.smb.conf.standalone | 3 +++
7 files changed, 28 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index df5a8bb..b47fd72 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -613,6 +613,8 @@ sub provision_raw_step1($$)
spn update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate
resolv:host file = $ctx->{dns_host_file}
dreplsrv:periodic_startup_interval = 0
+
+ passdb backend = samba4
";
if (defined($ctx->{sid_generator}) && $ctx->{sid_generator} ne "internal") {
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 3aadda1..abd7dbe 100644
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -75,7 +75,9 @@ static const struct loadparm_s3_context s3_fns =
.private_dir = lp_private_dir,
.ncalrpc_dir = lp_ncalrpc_dir,
- .lockdir = lp_lockdir
+ .lockdir = lp_lockdir,
+
+ .passdb_backend = lp_passdb_backend
};
const struct loadparm_s3_context *loadparm_s3_context(void)
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index ba9668a..74c0550 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -320,6 +320,14 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
{
+ .label = "passdb backend",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(passdb_backend),
+ .special = NULL,
+ .enum_list = NULL
+ },
+ {
.label = "dcerpc endpoint servers",
.type = P_LIST,
.p_class = P_GLOBAL,
@@ -1511,6 +1519,7 @@ FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
FN_GLOBAL_LIST(dcerpc_endpoint_servers, dcerpc_ep_servers)
FN_GLOBAL_LIST(server_services, server_services)
FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
+FN_GLOBAL_STRING(passdb_backend, passdb_backend)
FN_GLOBAL_STRING(auto_services, szAutoServices)
FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
FN_GLOBAL_LIST(passwordserver, szPasswordServers)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 2a7d3f0..21e1955 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -134,11 +134,12 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
#Plugin S4 DC tests (confirms named pipe auth forwarding). This can be expanded once kerberos is supported in the plugin DC
#
-for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
- for t in ncacn_np_tests:
- env = "plugin_s4_dc"
- transport = "ncacn_np"
- plantestsuite_loadlist("samba4.%s with %s" % (t, bindoptions), env, [valgrindify(smb4torture), "$LISTOPT", "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '-k', 'no', t])
+if have_ads_support:
+ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
+ for t in ncacn_np_tests:
+ env = "plugin_s4_dc"
+ transport = "ncacn_np"
+ plantestsuite_loadlist("samba4.%s with %s" % (t, bindoptions), env, [valgrindify(smb4torture), "$LISTOPT", "%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '-k', 'no', t])
for bindoptions in [""] + validate_list + ["bigendian"]:
for t in auto_rpc_tests:
diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc
index 3fd2e77..fd1ffd3 100644
--- a/source4/setup/provision.smb.conf.dc
+++ b/source4/setup/provision.smb.conf.dc
@@ -8,6 +8,8 @@
${STATEDIR_LINE}
${CACHEDIR_LINE}
+ passdb backend = samba4
+
[netlogon]
path = ${NETLOGONPATH}
read only = no
diff --git a/source4/setup/provision.smb.conf.member b/source4/setup/provision.smb.conf.member
index 6c57b5a..0fc4de5 100644
--- a/source4/setup/provision.smb.conf.member
+++ b/source4/setup/provision.smb.conf.member
@@ -7,3 +7,6 @@
${LOCKDIR_LINE}
${STATEDIR_LINE}
${CACHEDIR_LINE}
+
+ passdb backend = samba4
+
diff --git a/source4/setup/provision.smb.conf.standalone b/source4/setup/provision.smb.conf.standalone
index 6c57b5a..0fc4de5 100644
--- a/source4/setup/provision.smb.conf.standalone
+++ b/source4/setup/provision.smb.conf.standalone
@@ -7,3 +7,6 @@
${LOCKDIR_LINE}
${STATEDIR_LINE}
${CACHEDIR_LINE}
+
+ passdb backend = samba4
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list