[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Mar 5 01:51:03 MST 2012
The branch, master has been updated
via 14d3137 s3-lsasd: Fix debug messages on registration failure
via 6dbf632 selftest: Reduce declarations of smbclient_auth tests by moving into a loop
via fc57623 selftest: run smbtorture_s3 tests against the ntvfs file server
via 4c926a7 selftest: Reduce time in cleanup loop, try waitpid on all 3 children
via ebe8aa9 selftest: start to run more dcerpc tests against plugin_s4_dc
via 0582d03 selftest: forward rpcecho to Samba4 in plugin_s4_dc
from 53a147d selftest.run: Factor out read_testlist_file and open_file_or_pipe.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 14d31376aab703dbb14d1cd786baeaf84361cd96
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Mar 3 12:18:21 2012 +1100
s3-lsasd: Fix debug messages on registration failure
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Mon Mar 5 09:50:17 CET 2012 on sn-devel-104
commit 6dbf632bc3e035ffd68fe67e06657593870dc2ac
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 5 14:52:36 2012 +1100
selftest: Reduce declarations of smbclient_auth tests by moving into a loop
commit fc5762388a725cd18d10a356960382ea050c8064
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 5 14:28:15 2012 +1100
selftest: run smbtorture_s3 tests against the ntvfs file server
This checks not only the behaviour of the NTVFS file server, but also the
client library and authentication stack.
Andrew Bartlett
commit 4c926a708d5d9a4b5e986b8aa18cdb95e8dc0142
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 5 11:12:00 2012 +1100
selftest: Reduce time in cleanup loop, try waitpid on all 3 children
commit ebe8aa9cc18afa5027b1afd7b6e086613268c083
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 5 10:46:23 2012 +1100
selftest: start to run more dcerpc tests against plugin_s4_dc
commit 0582d03efe8ef8992b5e1e6cad68ba885844682b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 5 10:34:30 2012 +1100
selftest: forward rpcecho to Samba4 in plugin_s4_dc
-----------------------------------------------------------------------
Summary of changes:
selftest/knownfail | 13 +++++++++++++
selftest/target/Samba3.pm | 18 ++++++++++++------
selftest/target/Samba4.pm | 5 +++--
source3/rpc_server/lsasd.c | 6 +++---
source3/selftest/tests.py | 5 ++---
source4/selftest/tests.py | 3 ++-
6 files changed, 35 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index cc5d16b..1a6c6bd 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -7,6 +7,19 @@
^samba3.blackbox.failure.failure # this is designed to fail, for testing our test infrastructure
.*driver.add_driver_timestamps # we only can store dates, not timestamps
^samba3.smbtorture_s3.LOCAL-TALLOC-DICT #fails
+^samba3.smbtorture_s3.plain\(dc\).LOCK9 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).OPLOCK2 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).STREAMERROR # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).DIR1 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).DIR-CREATETIME # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).DELETE-LN # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).POSIX # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).UID-REGRESSION-TEST # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).SHORTNAME-TEST # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).POSIX-APPEND # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).NTTRANS-FSCTL # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).SMB2-NEGPROT # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).BAD-NBT-SESSION # Fails against the s4 ntvfs server
^samba3.nbt.dgram.*netlogon2
^samba3.*rap.sam.*.useradd # Not provided by Samba 3
^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 87763aa..797ae71 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -54,9 +54,12 @@ sub teardown_env($$)
# This should give it time to write out the gcov data
until ($count > 20) {
- if (Samba::cleanup_child($smbdpid, "smbd") == -1
- && Samba::cleanup_child($nmbdpid, "nmbd") == -1
- && Samba::cleanup_child($winbinddpid, "winbindd") == -1) {
+ my $smbdchild = Samba::cleanup_child($smbdpid, "smbd");
+ my $nmbdchild = Samba::cleanup_child($nmbdpid, "nmbd");
+ my $winbinddchild = Samba::cleanup_child($winbinddpid, "winbindd");
+ if ($smbdchild == -1
+ && $nmbdchild == -1
+ && $winbinddchild == -1) {
last;
}
sleep(1);
@@ -73,9 +76,12 @@ sub teardown_env($$)
$count = 0;
until ($count > 10) {
- if (Samba::cleanup_child($smbdpid, "smbd") == -1
- && Samba::cleanup_child($nmbdpid, "nmbd") == -1
- && Samba::cleanup_child($winbinddpid, "winbindd") == -1) {
+ my $smbdchild = Samba::cleanup_child($smbdpid, "smbd");
+ my $nmbdchild = Samba::cleanup_child($nmbdpid, "nmbd");
+ my $winbinddchild = Samba::cleanup_child($winbinddpid, "winbindd");
+ if ($smbdchild == -1
+ && $nmbdchild == -1
+ && $winbinddchild == -1) {
last;
}
sleep(1);
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 8e27620..698cd12 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -679,7 +679,8 @@ nogroup:x:65534:nobody
SAMBA_TEST_FIFO => "$ctx->{prefix}/samba_test.fifo",
SAMBA_TEST_LOG => "$ctx->{prefix}/samba_test.log",
SAMBA_TEST_LOG_POS => 0,
- NSS_WRAPPER_WINBIND_SO_PATH => Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so")
+ NSS_WRAPPER_WINBIND_SO_PATH => Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so"),
+ LOCAL_PATH => $ctx->{tmpdir}
};
return $ret;
@@ -1264,7 +1265,7 @@ sub provision_plugin_s4_dc($$)
my $extra_smbconf_options = "
server services = -smb +s3fs
-dcerpc endpoint servers = -unixinfo -rpcecho -spoolss -winreg -wkssvc -srvsvc
+dcerpc endpoint servers = -unixinfo -spoolss -winreg -wkssvc -srvsvc
[IPC\$]
vfs objects = dfs_samba4
diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index 416a3b3..ad184d8 100644
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -930,21 +930,21 @@ void start_lsasd(struct tevent_context *ev_ctx,
status = rpc_lsarpc_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register winreg rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register lsarpc rpc inteface in lsasd! (%s)\n",
nt_errstr(status)));
exit(1);
}
status = rpc_samr_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register lsasd rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register samr rpc inteface in lsasd! (%s)\n",
nt_errstr(status)));
exit(1);
}
status = rpc_netlogon_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register lsasd rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register netlogon rpc inteface in lsasd! (%s)\n",
nt_errstr(status)));
exit(1);
}
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index d14f18b..74c745f 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -74,6 +74,7 @@ tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7",
for t in tests:
plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
plantestsuite("samba3.smbtorture_s3.crypt(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "-e", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.plain(dc).%s" % t, "dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
local_tests=[
"LOCAL-SUBSTITUTE",
@@ -120,6 +121,7 @@ tests=["--ping", "--separator",
for env in ["s3dc", "member", "s3member"]:
plantestsuite("samba3.blackbox.smbclient_auth.plain (%s)" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration])
+ plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration])
for t in tests:
plantestsuite("samba3.wbinfo_s3.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t])
@@ -142,9 +144,6 @@ plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join
for env in ["secserver"]:
plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) domain creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN\\\\$DC_USERNAME', '$DC_PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no"])
-for env in ["member", "s3member"]:
- plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) member creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER\\\\$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration])
-
for env in ["maptoguest", "secshare", "secserver"]:
plantestsuite("samba3.blackbox.smbclient_auth.plain (%s) local creds" % env, env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', binpath('smbclient3'), configuration + " --option=clientntlmv2auth=no --option=clientlanmanauth=yes"])
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 9d36f41..bc8bf12 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -189,7 +189,7 @@ for ntlmoptions in [
transports = ["ncacn_np", "ncacn_ip_tcp"]
#Kerberos varies between functional levels, so it is important to check this on all of them
-for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
+for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc", "plugin_s4_dc"]:
transport = "ncacn_np"
plansmbtorturetestsuite('rpc.pac', env, ["%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.pac on %s" % (transport,))
for transport in transports:
@@ -438,6 +438,7 @@ planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
planpythontestsuite("none", "wafsamba.tests.test_utils", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
planoldpythontestsuite("dc:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])
planoldpythontestsuite("dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
+planoldpythontestsuite("plugin_s4_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
plantestsuite("samba4.ldap.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
plantestsuite("samba4.tokengroups.python(dc)", "dc:local", [python, os.path.join(samba4srcdir, "dsdb/tests/python/token_group.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
plantestsuite("samba4.sam.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sam.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
--
Samba Shared Repository
More information about the samba-cvs
mailing list