[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Feb 15 22:58:03 MST 2012
The branch, master has been updated
via 95d3096 s3-selftest: Remove .posix_s3 from s3 test names
via 7e0e713 selftest: Remove 'if have_ads_support:' from tests.py
via 3cf091c s3-smbd: Avoid starting log lines with the word 'error'
via 6917575 selftest: skip plugin_s4_dc if we do not have ADS
via 8ea068d selftest: Run nsstest against more environments
via c006b9b selftest: skip targets that are not compiled in if we do not have ADS
via 212b3ec s3-selftest: Require SMB signing for ktest environment
via 22a2c46f selftest: Do not start up an already-running test environment
via e1f9fb7 selftest: Make plugin_s4_dc set the cached environment correctly
via a8a8361 wintest: update WinXP-1 snapshot
via 8f6ddb3 wintest: Change Windows 7 VM
via 61ccb46 wintest: Give the Windows VM a little more time to start back up
via de2bb2a wintest: Samba is now all version 4.0
via 98e438d wintest: Cope with nc not timing out even when -w 1 is specified
via 97859d1 wintest: s3 moved smb.conf to /etc
via 81ddb83 wintest: Update VM used for W2K8R2A
via 15a0de6 wintest: Allow access denied when turning off the firewall
via 2ba57f4 wintest: Retry joining the domain a few times
via 032a2c4 wintest: connect to correct hostname in test_net_use
via 00f86a3 s3-nmbd: Initialise newly non-static variables
from dd5868d s3: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY, bug 8760
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 95d3096f9881fcf7717c55d6f6281b799236fff7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Feb 14 21:42:16 2012 +1100
s3-selftest: Remove .posix_s3 from s3 test names
As far as I can tell, this simply referred to the posix_s3.sh script
that originally ran these tests.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Thu Feb 16 06:57:09 CET 2012 on sn-devel-104
commit 7e0e71340625942bc11b87ab3e4fdf71a7c7de86
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Feb 14 09:05:21 2012 +1100
selftest: Remove 'if have_ads_support:' from tests.py
The selftest system now skips launching these if the environment is not available.
Andrew Bartlett
commit 3cf091cf68023eeea9ebd0f2cadb14e658c98421
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Feb 13 17:44:34 2012 +1100
s3-smbd: Avoid starting log lines with the word 'error'
commit 6917575fe3d0e34acae0d4a14a407a80c11daf99
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 16 15:12:49 2012 +1100
selftest: skip plugin_s4_dc if we do not have ADS
commit 8ea068d70291db1d06334a2211056d7902d6fe29
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 16 15:10:00 2012 +1100
selftest: Run nsstest against more environments
commit c006b9b898e93149f83969d0b1d8e4dafc6fbfeb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Feb 14 09:04:16 2012 +1100
selftest: skip targets that are not compiled in if we do not have ADS
commit 212b3ec1a0a593a5684dfe9cbefc4f3b728f120b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Feb 14 19:22:14 2012 +1100
s3-selftest: Require SMB signing for ktest environment
This will help weed out session key errors in the krb5 code.
Andrew Bartlett
commit 22a2c46f844f8c0897bc3d3ef2f613bfc885873a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Feb 15 08:55:05 2012 +1100
selftest: Do not start up an already-running test environment
Otherwise we may re-provision the dc just because we started it via s3member or s4member
first.
Andrew Bartlett
commit e1f9fb79c79e6a1ef72b07c8df6256caa291e957
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Feb 15 16:08:05 2012 +1100
selftest: Make plugin_s4_dc set the cached environment correctly
commit a8a83611f01cf9d27b4dae7efa94f97aa7868e58
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 16 13:51:10 2012 +1100
wintest: update WinXP-1 snapshot
commit 8f6ddb3c0295029e76432d9a5db8a1fa696d3071
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 16 11:34:49 2012 +1100
wintest: Change Windows 7 VM
commit 61ccb465dbdae0f64ff93fe678721a9f954718b0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Feb 15 14:44:24 2012 +1100
wintest: Give the Windows VM a little more time to start back up
commit de2bb2a7f85cc75c37372cda38eb6b9741b77a15
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Feb 15 10:08:07 2012 +1100
wintest: Samba is now all version 4.0
commit 98e438df00111541958b54543b3056c06783fd73
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Feb 15 09:29:27 2012 +1100
wintest: Cope with nc not timing out even when -w 1 is specified
commit 97859d1ce809bab0cd3b6a4235a6cc09efea458f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Feb 14 22:43:50 2012 +1100
wintest: s3 moved smb.conf to /etc
commit 81ddb83943c3d96e6c4b86ae4d7a2905fbd32818
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Feb 14 21:42:44 2012 +1100
wintest: Update VM used for W2K8R2A
commit 15a0de66cb750f935f2b908763d2369e23366d6c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 16 14:01:44 2012 +1100
wintest: Allow access denied when turning off the firewall
commit 2ba57f42b8d31d994d565d0c6daf339dddb61069
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 16 13:51:55 2012 +1100
wintest: Retry joining the domain a few times
commit 032a2c4ce3ec275379b1de37dccb0040071254c4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Feb 16 13:51:32 2012 +1100
wintest: connect to correct hostname in test_net_use
commit 00f86a36e076130c2c34a49b8dc820f34bf65d85
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Feb 15 09:56:43 2012 +1100
s3-nmbd: Initialise newly non-static variables
Found by testing with wintest. When the variables were made non-static in
c21f6a1c6869a5086634bb830d6c3689dea539a3 the implicit initialisation to 0
was lost.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
selftest/flapping | 10 +++---
selftest/knownfail | 8 ++--
selftest/target/Samba3.pm | 30 ++++++++++++++++
selftest/target/Samba4.pm | 31 +++++++++++-----
source3/nmbd/nmbd.c | 8 ++--
source3/selftest/tests.py | 80 ++++++++++++++++++--------------------------
source3/smbd/error.c | 12 +++++-
source4/selftest/tests.py | 36 ++++++++------------
wintest/conf/abartlet.conf | 12 +++---
wintest/test-s3.py | 16 ++++----
wintest/wintest.py | 44 ++++++++++++++++++------
11 files changed, 168 insertions(+), 119 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/flapping b/selftest/flapping
index 1b8fb9c..2828d67 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -11,10 +11,10 @@
^samba3.raw.mux.* #This test is flaky on the async lock time
^samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel
^samba4.nbt.winsreplication.owned # fails sometimes, timing related
-^samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ?
-^samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
+^samba3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ?
+^samba3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
.*printer.*print_test_extended # fails on some hosts due to timing issues ?
.*printer.*print_test # fails on some hosts due to timing issues ?
-.*posix_s3.rpc.spoolss.printer # seems to be flakey currently, but should be fixed
-^samba3.posix_s3.rap.printing # fails sometimes on sn-devel
-^samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure
+.*rpc.spoolss.printer # seems to be flakey currently, but should be fixed
+^samba3.rap.printing # fails sometimes on sn-devel
+^samba3.smb2.lock.*.rw-exclusive # another intermittent failure
diff --git a/selftest/knownfail b/selftest/knownfail
index 40c3995..e99f5d4 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -7,13 +7,13 @@
^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.posix_s3.nbt.dgram.*netlogon2
+^samba3.nbt.dgram.*netlogon2
^samba3.*rap.sam.*.useradd # Not provided by Samba 3
^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
-^samba3.posix_s3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
+^samba3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
# see bug 8412
-^samba3.posix_s3.smb2.rename.*.simple_nodelete
-^samba3.posix_s3.smb2.rename.*.no_share_delete_no_delete_access
+^samba3.smb2.rename.*.simple_nodelete
+^samba3.smb2.rename.*.no_share_delete_no_delete_access
#These rpcclient combinations (pipe-level authentication but without sign or seal) need fixing in s3
^samba3.blackbox.rpcclient over ncacn_np with \[spnego\]
^samba3.blackbox.rpcclient over ncacn_np with \[spnego,bigendian\]
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 7ecb481..e8a03e7 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -11,6 +11,21 @@ use FindBin qw($RealBin);
use POSIX;
use target::Samba;
+sub have_ads($) {
+ my ($self);
+ my $found_ads = 0;
+ my $smbd_build_options = Samba::bindir_path($self, "smbd") . " -b";
+ my @build_options = `$smbd_build_options`;
+ foreach my $option (@build_options) {
+ if ($option =~ "WITH_ADS") {
+ $found_ads = 1;
+ }
+ }
+
+ # If we were not built with ADS support, pretend we were never even available
+ return $found_ads;
+}
+
sub new($$) {
my ($classname, $bindir, $binary_mapping, $srcdir, $server_maxtime) = @_;
my $self = { vars => {},
@@ -89,6 +104,10 @@ sub setup_env($$$)
{
my ($self, $envname, $path) = @_;
+ if (defined($self->{vars}->{$envname})) {
+ return $self->{vars}->{$envname};
+ }
+
if ($envname eq "s3dc") {
return $self->setup_s3dc("$path/s3dc");
} elsif ($envname eq "secshare") {
@@ -202,6 +221,11 @@ sub setup_admember($$$$)
{
my ($self, $prefix, $dcvars, $iface) = @_;
+ # If we didn't build with ADS, pretend this env was never available
+ if (not $self->have_ads()) {
+ return "UNKNOWN";
+ }
+
print "PROVISIONING S3 AD MEMBER$iface...";
my $member_options = "
@@ -410,6 +434,11 @@ sub setup_ktest($$$)
{
my ($self, $prefix) = @_;
+ # If we didn't build with ADS, pretend this env was never available
+ if (not $self->have_ads()) {
+ return "UNKNOWN";
+ }
+
print "PROVISIONING server with security=ads...";
my $ktest_options = "
@@ -417,6 +446,7 @@ sub setup_ktest($$$)
realm = ktest.samba.example.com
security = ads
username map = $prefix/lib/username.map
+ server signing = required
";
my $ret = $self->provision($prefix,
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 8ac3ee7..73b73ca 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1388,6 +1388,10 @@ sub setup_env($$$)
$ENV{ENVNAME} = $envname;
+ if (defined($self->{vars}->{$envname})) {
+ return $self->{vars}->{$envname};
+ }
+
if ($envname eq "dc") {
return $self->setup_dc("$path/dc");
} elsif ($envname eq "fl2000dc") {
@@ -1658,19 +1662,26 @@ sub setup_plugin_s4_dc($$)
{
my ($self, $path) = @_;
- my $env = $self->provision_plugin_s4_dc($path);
- if (defined $env) {
- $self->check_or_start($env, "single");
-
- $self->wait_for_start($env);
+ # If we didn't build with ADS, pretend this env was never available
+ if (not $self->{target3}->have_ads()) {
+ return "UNKNOWN";
+ }
- my $s3_part_env = $self->{target3}->setup_plugin_s4_dc($path, $env, 30);
- if (not defined($s3_part_env)) {
- return undef;
- }
+ my $env = $self->provision_plugin_s4_dc($path);
+ unless ($env) {
+ return undef;
+ }
- $self->{vars}->{plugin_s4_dc} = $s3_part_env;
+ $self->check_or_start($env, "single");
+
+ $self->wait_for_start($env);
+
+ my $s3_part_env = $self->{target3}->setup_plugin_s4_dc($path, $env, 30);
+ unless ($s3_part_env) {
+ return undef;
}
+
+ $self->{vars}->{plugin_s4_dc} = $env;
return $env;
}
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 5392eb1..35a9a31 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -725,11 +725,11 @@ static bool open_sockets(bool isdaemon, int port)
int main(int argc, const char *argv[])
{
- bool is_daemon;
- bool opt_interactive;
+ bool is_daemon = false;
+ bool opt_interactive = false;
bool Fork = true;
- bool no_process_group;
- bool log_stdout;
+ bool no_process_group = false;
+ bool log_stdout = false;
poptContext pc;
char *p_lmhosts = NULL;
int opt;
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index d50b3ba..8d1c536 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -33,18 +33,6 @@ try:
except KeyError:
config_h = os.path.join(samba3srcdir, "include/autoconf/config.h")
-f = open(config_h, 'r')
-try:
- have_ads_support = ("HAVE_LDAP 1" in f.read())
-finally:
- f.close()
-
-f = open(config_h, 'r')
-try:
- have_ads_support &= ("HAVE_KRB5 1" in f.read())
-finally:
- f.close()
-
torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME",
"--target=samba3", "--basedir=$SELFTEST_TMPDIR",
'--option="torture:winbindd_netbios_name=$SERVER"',
@@ -63,7 +51,7 @@ sub.communicate("")
smb4torture_possible = (sub.returncode == 0)
def plansmbtorturetestsuite(name, env, options, description=''):
- modname = "samba3.posix_s3.%s %s" % (name, description)
+ modname = "samba3.%s %s" % (name, description)
cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
if smb4torture_possible:
plantestsuite_loadlist(modname, env, cmdline)
@@ -283,48 +271,46 @@ for s in signseal_options:
plantestsuite("samba3.blackbox.rpcclient over ncacn_np with [%s%s%s] " % (a, s, e), "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"),
"none", options, configuration])
- if have_ads_support:
- # We should try more combinations in future, but this is all
- # the pre-calculated credentials cache supports at the moment
- e = ""
- a = ""
- binding_string = "ncacn_np:$SERVER[%s%s%s]" % (a, s, e)
- options = binding_string + " -k yes --krb5-ccache=$PREFIX/ktest/krb5_ccache-2"
- plansmbtorturetestsuite(test, "ktest", options, 'krb5 with old ccache ncacn_np with [%s%s%s] ' % (a, s, e))
+ # We should try more combinations in future, but this is all
+ # the pre-calculated credentials cache supports at the moment
+ e = ""
+ a = ""
+ binding_string = "ncacn_np:$SERVER[%s%s%s]" % (a, s, e)
+ options = binding_string + " -k yes --krb5-ccache=$PREFIX/ktest/krb5_ccache-2"
+ plansmbtorturetestsuite(test, "ktest", options, 'krb5 with old ccache ncacn_np with [%s%s%s] ' % (a, s, e))
- options = binding_string + " -k yes --krb5-ccache=$PREFIX/ktest/krb5_ccache-3"
- plansmbtorturetestsuite(test, "ktest", options, 'krb5 ncacn_np with [%s%s%s] ' % (a, s, e))
+ options = binding_string + " -k yes --krb5-ccache=$PREFIX/ktest/krb5_ccache-3"
+ plansmbtorturetestsuite(test, "ktest", options, 'krb5 ncacn_np with [%s%s%s] ' % (a, s, e))
- auth_options2 = ["krb5", "spnego,krb5"]
- for a in auth_options2:
- binding_string = "ncacn_np:$SERVER[%s%s%s]" % (a, s, e)
+ auth_options2 = ["krb5", "spnego,krb5"]
+ for a in auth_options2:
+ binding_string = "ncacn_np:$SERVER[%s%s%s]" % (a, s, e)
- plantestsuite("samba3.blackbox.rpcclient krb5 ncacn_np with [%s%s%s] " % (a, s, e), "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"),
+ plantestsuite("samba3.blackbox.rpcclient krb5 ncacn_np with [%s%s%s] " % (a, s, e), "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"),
"$PREFIX/ktest/krb5_ccache-3", binding_string, "-k", configuration])
options_list = ["", "-e"]
for options in options_list:
- if have_ads_support:
- plantestsuite("samba3.blackbox.smbclient_krb5 old ccache %s" % options, "ktest:local",
- [os.path.join(samba3srcdir, "script/tests/test_smbclient_krb5.sh"),
- "$PREFIX/ktest/krb5_ccache-2",
- binpath('smbclient3'), "$SERVER", options, configuration])
-
- plantestsuite("samba3.blackbox.smbclient_krb5 old ccache %s" % options, "ktest:local",
- [os.path.join(samba3srcdir, "script/tests/test_smbclient_krb5.sh"),
- "$PREFIX/ktest/krb5_ccache-2",
- binpath('smbclient3'), "$SERVER", options, configuration])
-
- plantestsuite("samba3.blackbox.smbclient_large_file %s" % options, "ktest:local",
- [os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
- "$PREFIX/ktest/krb5_ccache-3",
- binpath('smbclient3'), "$SERVER", "$PREFIX", options, "-k " + configuration])
-
- plantestsuite("samba3.blackbox.smbclient_posix_large %s krb5" % options, "ktest:local",
- [os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
- "$PREFIX/ktest/krb5_ccache-3",
- binpath('smbclient3'), "$SERVER", "$PREFIX", options, "-k " + configuration])
+ plantestsuite("samba3.blackbox.smbclient_krb5 old ccache %s" % options, "ktest:local",
+ [os.path.join(samba3srcdir, "script/tests/test_smbclient_krb5.sh"),
+ "$PREFIX/ktest/krb5_ccache-2",
+ binpath('smbclient3'), "$SERVER", options, configuration])
+
+ plantestsuite("samba3.blackbox.smbclient_krb5 old ccache %s" % options, "ktest:local",
+ [os.path.join(samba3srcdir, "script/tests/test_smbclient_krb5.sh"),
+ "$PREFIX/ktest/krb5_ccache-2",
+ binpath('smbclient3'), "$SERVER", options, configuration])
+
+ plantestsuite("samba3.blackbox.smbclient_large_file %s" % options, "ktest:local",
+ [os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
+ "$PREFIX/ktest/krb5_ccache-3",
+ binpath('smbclient3'), "$SERVER", "$PREFIX", options, "-k " + configuration])
+
+ plantestsuite("samba3.blackbox.smbclient_posix_large %s krb5" % options, "ktest:local",
+ [os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
+ "$PREFIX/ktest/krb5_ccache-3",
+ binpath('smbclient3'), "$SERVER", "$PREFIX", options, "-k " + configuration])
plantestsuite("samba3.blackbox.smbclient_posix_large %s NTLM" % options, "s3dc:local",
[os.path.join(samba3srcdir, "script/tests/test_smbclient_posix_large.sh"),
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 815b857..d038acf 100644
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -71,7 +71,11 @@ void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatu
}
SIVAL(outbuf,smb_rcls,NT_STATUS_V(ntstatus));
SSVAL(outbuf,smb_flg2, SVAL(outbuf,smb_flg2)|FLAGS2_32_BIT_ERROR_CODES);
- DEBUG(3,("error packet at %s(%d) cmd=%d (%s) %s\n",
+ /* This must not start with the word 'error', as this
+ * is reserved in the subunit stream protocol, causing
+ * false errors to show up when debugging is turned
+ * on */
+ DEBUG(3,("NT error packet at %s(%d) cmd=%d (%s) %s\n",
file, line,
(int)CVAL(outbuf,smb_com),
smb_fn_name(CVAL(outbuf,smb_com)),
@@ -88,7 +92,11 @@ void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatu
SSVAL(outbuf,smb_rcls,eclass);
SSVAL(outbuf,smb_err,ecode);
- DEBUG(3,("error packet at %s(%d) cmd=%d (%s) eclass=%d ecode=%d\n",
+ /* This must not start with the word 'error', as this
+ * is reserved in the subunit stream protocol, causing
+ * false errors to show up when debugging is turned
+ * on */
+ DEBUG(3,("DOS error packet at %s(%d) cmd=%d (%s) eclass=%d ecode=%d\n",
file, line,
(int)CVAL(outbuf,smb_com),
smb_fn_name(CVAL(outbuf,smb_com)),
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index b1b7871..39c0f4b 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -70,13 +70,6 @@ try:
except KeyError:
config_h = os.path.join(samba4bindir, "default/include/config.h")
-f = open(config_h, 'r')
-try:
- # The other parts of the HAVE_ADS test are always supplied by the top level build
- have_ads_support = ("HAVE_LDAP 1" in f.read())
-finally:
- f.close()
-
# see if we support ldaps
f = open(config_h, 'r')
try:
@@ -139,12 +132,11 @@ 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
#
-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"
- plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '-k', 'no'], "samba4.%s with %s" % (t, bindoptions))
+for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
+ for t in ncacn_np_tests:
+ env = "plugin_s4_dc"
+ transport = "ncacn_np"
+ plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '-k', 'no'], "samba4.%s with %s" % (t, bindoptions))
for bindoptions in [""] + validate_list + ["bigendian"]:
for t in auto_rpc_tests:
@@ -361,11 +353,10 @@ for mech in [
signoptions = "%s --signing=off" % mech
name = "smb.signing disabled on with %s" % signoptions
plansmbtorturetestsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name)
- if have_ads_support:
- plansmbtorturetestsuite('base.xcopy', "s3member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name)
- plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'], "samba4.%s" % name)
- plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc",
- ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
+ plansmbtorturetestsuite('base.xcopy', "s3member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name)
+ plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'], "samba4.%s" % name)
+ plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc",
+ ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
plantestsuite("samba4.blackbox.bogusdomain", "s3member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$DC_USERNAME', '$DC_PASSWORD'], allow_empty_output=True)
for mech in [
@@ -392,10 +383,11 @@ for env in ["dc", "s4member"]:
plansmbtorturetestsuite(t, env, wb_opts + ['//_none_/_none_'])
nsstest4 = binpath("nsstest")
-if os.path.exists(nsstest4):
- plantestsuite("samba4.nss.test using winbind(s4member)", "s4member", [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "default/nsswitch/libnss-winbind.so")])
-else:
- skiptestsuite("samba4.nss.test using winbind(s4member)", "nsstest not available")
+for env in ["dc", "s4member", "s3dc", "s3member", "member"]:
+ if os.path.exists(nsstest4):
+ plantestsuite("samba4.nss.test using winbind(%s)" % env, env, [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "default/nsswitch/libnss-winbind.so")])
+ else:
+ skiptestsuite("samba4.nss.test using winbind(%s)" % env, "nsstest not available")
subunitrun = valgrindify(python) + " " + os.path.join(samba4srcdir, "scripting/bin/subunitrun")
def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, extra_args=[]):
diff --git a/wintest/conf/abartlet.conf b/wintest/conf/abartlet.conf
index 2e92cc4..344ff17 100644
--- a/wintest/conf/abartlet.conf
+++ b/wintest/conf/abartlet.conf
@@ -38,16 +38,16 @@ PASSWORD2 : p at ssw0rd2
PASSWORD3 : p at ssw0rd3
# a Windows7 VM
-WINDOWS7_HOSTNAME : Windows7-1
-WINDOWS7_VM : Windows7-1
-WINDOWS7_SNAPSHOT : 1314657542
+WINDOWS7_HOSTNAME : Windows7-3
+WINDOWS7_VM : Windows7-3
+WINDOWS7_SNAPSHOT : 1329351855
WINDOWS7_USER : administrator
WINDOWS7_PASS : penguin
# a winxp VM - needs Windows XP Service Pack 2 Support Tools
WINXP_HOSTNAME : WinXP-1
WINXP_VM : WinXP-1
-WINXP_SNAPSHOT : 1290386227
+WINXP_SNAPSHOT : 1329361864
WINXP_USER : administrator
WINXP_PASS : penguin
@@ -57,8 +57,8 @@ W2K8R2A_VM : Win2008R2-3
W2K8R2A_REALM : 2008R2.HOWTO.ABARTLET.NET
W2K8R2A_DOMAIN : 2008R2HOWTO
W2K8R2A_PASS : penguin12#
-W2K8R2A_SNAPSHOT : 1291076421
-W2K8R2A_IP : 192.168.122.108
+W2K8R2A_SNAPSHOT : 1329218595
+W2K8R2A_IP : 192.168.122.57
# this w2k8r2 VM will become a DC in the samba domain
W2K8R2B_HOSTNAME : Win2008R2-1
diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 811e086..1e32e49 100755
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -43,7 +43,7 @@ def start_s3(t):
def test_wbinfo(t):
t.info('Testing wbinfo')
t.chdir('${PREFIX}')
- t.cmd_contains("bin/wbinfo --version", ["Version 3."])
+ t.cmd_contains("bin/wbinfo --version", ["Version 4."])
t.cmd_contains("bin/wbinfo -p", ["Ping to winbindd succeeded"])
t.retry_cmd("bin/wbinfo --online-status",
["BUILTIN : online",
@@ -74,8 +74,8 @@ def test_wbinfo(t):
def test_smbclient(t):
t.info('Testing smbclient')
t.chdir('${PREFIX}')
- t.cmd_contains("bin/smbclient --version", ["Version 3."])
- t.cmd_contains('bin/smbclient -L ${INTERFACE_IP} -U%', ["Domain=[${WIN_DOMAIN}]", "test", "IPC$", "Samba 3."],
+ t.cmd_contains("bin/smbclient --version", ["Version 4."])
+ t.cmd_contains('bin/smbclient -L ${INTERFACE_IP} -U%', ["Domain=[${WIN_DOMAIN}]", "test", "IPC$", "Samba 4."],
casefold=True)
child = t.pexpect_spawn('bin/smbclient //${HOSTNAME}.${WIN_REALM}/test -Uroot@${WIN_REALM}%${PASSWORD2}')
child.expect("smb:")
@@ -102,7 +102,7 @@ def test_smbclient(t):
def create_shares(t):
t.info("Adding test shares")
t.chdir('${PREFIX}')
- t.write_file("lib/smb.conf", '''
+ t.write_file("etc/smb.conf", '''
[test]
path = ${PREFIX}/test
read only = no
@@ -122,7 +122,7 @@ def prep_join_as_member(t, vm):
child = t.open_telnet("${WIN_HOSTNAME}", "administrator", "${WIN_PASS}", set_time=True)
t.get_ipconfig(child)
t.del_files(["var", "private"])
- t.write_file("lib/smb.conf", '''
+ t.write_file("etc/smb.conf", '''
[global]
netbios name = ${HOSTNAME}
log level = ${DEBUGLEVEL}
@@ -182,7 +182,7 @@ def test_join_as_member(t, vm):
def test_s3(t):
'''basic s3 testing'''
- t.setvar("SAMBA_VERSION", "Version 3")
+ t.setvar("SAMBA_VERSION", "Version 4")
t.check_prerequesites()
set_libpath(t)
@@ -232,7 +232,7 @@ def test_s3(t):
t.test_remote_smbclient('WINDOWS7', dom_username, dom_password, args='--option=clientntlmv2auth=no')
t.test_remote_smbclient('WINDOWS7', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k")
t.test_remote_smbclient('WINDOWS7', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k --option=clientusespnegoprincipal=yes")
- t.test_net_use('WINDOWS7', t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
+ t.test_net_use('WINDOWS7', dom_realm, t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
if t.have_var('WINXP_VM') and t.have_var('W2K8R2A_VM') and not t.skip("join_winxp_2008r2"):
if not dc_started:
@@ -251,7 +251,7 @@ def test_s3(t):
t.test_remote_smbclient('WINXP', dom_username, dom_password, args='--option=clientntlmv2auth=no')
t.test_remote_smbclient('WINXP', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k")
t.test_remote_smbclient('WINXP', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k --clientusespnegoprincipal=yes")
- t.test_net_use('WINXP', t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
+ t.test_net_use('WINXP', dom_realm, t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
t.info("S3 test: All OK")
diff --git a/wintest/wintest.py b/wintest/wintest.py
--
Samba Shared Repository
More information about the samba-cvs
mailing list