selftest: move all winbind test rules to one place

We now run wbinfo_simple additionally against plugin_s4_dc and dc

This also extends many of the tests to run against more environments,
hence the additional knownfail entries.

For winbind.wbclient, the fl2003dc environment has been selected not
to run with password history so as to allow the winindd.wbinfo test to
complete (once switched to running winbindd).

Andrew Bartlett

Change-Id: I475fd9937e515796b5e47c042a8bfa85f76441ca
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index ad9a32d8f7fa03f440b60b80a8a5dd7fa155a41a..c4fb166ecf651242a1de3cfe36f7aa2df8a87a50 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -115,7 +115,6 @@
 ^samba4.smb2.oplock.doc
 ^samba4.smb2.compound.related3
 ^samba4.smb2.compound.compound-break
-^samba4.winbind.struct.*.show_sequence     # Not yet working in winbind
 ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate\(.*\)$
 ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand\(.*\)$
 ^samba4.*base.delaywrite.*delayed update of write time 3a\(.*\)$
@@ -242,42 +241,101 @@
 #
 # The Samba4 winbind does not cover the full winbind protocol, so these are expected
 #
-^samba3.winbind.struct.show_sequence\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcPingDc\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcPingDc2\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcListTrusts\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcLookupDomainController\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcLookupDomainControllerEx\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcResolveWinsByName\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcResolveWinsByIP\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcLookupRids\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcGetSidAliases\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcLogonUser\(plugin_s4_dc\)
-^samba3.winbind.wbclient.wbcChangeUserPassword\(plugin_s4_dc\)
-^samba4.blackbox.wbinfo\(dc:local\).wbinfo -N against dc
-^samba4.blackbox.wbinfo\(dc:local\).wbinfo -I against dc
-^samba4.blackbox.wbinfo\(dc:local\).wbinfo  --trusted-domains against dc
-^samba4.blackbox.wbinfo\(dc:local\).wbinfo --all-domains against dc
-^samba4.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo -N against plugin_s4_dc
-^samba4.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo -I against plugin_s4_dc
-^samba4.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo  --trusted-domains against plugin_s4_dc
-^samba4.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo --all-domains against plugin_s4_dc
-^samba4.blackbox.wbinfo\(s4member:local\).wbinfo -N against s4member
-^samba4.blackbox.wbinfo\(s4member:local\).wbinfo -I against s4member
-^samba4.blackbox.wbinfo\(s4member:local\).wbinfo  --trusted-domains against s4member
-^samba4.blackbox.wbinfo\(s4member:local\).wbinfo --all-domains against s4member
-^samba4.blackbox.wbinfo\(rodc:local\).wbinfo -N against rodc
-^samba4.blackbox.wbinfo\(rodc:local\).wbinfo -I against rodc
-^samba4.blackbox.wbinfo\(rodc:local\).wbinfo  --trusted-domains against rodc
-^samba4.blackbox.wbinfo\(rodc:local\).wbinfo --all-domains against rodc
-^samba4.blackbox.wbinfo\(promoted_dc:local\).wbinfo -N against promoted_dc
-^samba4.blackbox.wbinfo\(promoted_dc:local\).wbinfo -I against promoted_dc
-^samba4.blackbox.wbinfo\(promoted_dc:local\).wbinfo  --trusted-domains against promoted_dc
-^samba4.blackbox.wbinfo\(promoted_dc:local\).wbinfo --all-domains against promoted_dc
+^samba4.winbind.struct.show_sequence\(plugin_s4_dc\)
+^samba.blackbox.wbinfo\(dc:local\).wbinfo -N against dc
+^samba.blackbox.wbinfo\(dc:local\).wbinfo -I against dc
+^samba.blackbox.wbinfo\(dc:local\).wbinfo  --trusted-domains against dc
+^samba.blackbox.wbinfo\(dc:local\).wbinfo --all-domains against dc
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo -N against plugin_s4_dc
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo -I against plugin_s4_dc
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo  --trusted-domains against plugin_s4_dc
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo --all-domains against plugin_s4_dc
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo -N against s4member
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo -I against s4member
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo  --trusted-domains against s4member
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo --all-domains against s4member
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo -N against rodc
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo -I against rodc
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo  --trusted-domains against rodc
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo --all-domains against rodc
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo -N against promoted_dc
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo -I against promoted_dc
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo  --trusted-domains against promoted_dc
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo --all-domains against promoted_dc
 #
 # This makes less sense when not running against an AD DC
 #
-^samba4.blackbox.wbinfo\(s3member:local\).wbinfo -U against s3member
-^samba4.blackbox.wbinfo\(s3member:local\).wbinfo -G against s3member
-^samba4.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane mapping
-^samba4.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U against s3member
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G against s3member
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane mapping
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping
+^samba4.winbind.struct.show_sequence\(dc\)
+^samba.wbinfo_simple.\(dc:local\).--allocate-uid
+^samba.wbinfo_simple.\(dc:local\).--allocate-gid
+^samba.wbinfo_simple.\(s4member:local\).--allocate-uid
+^samba.wbinfo_simple.\(s4member:local\).--allocate-gid
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-uid
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--allocate-gid
+#
+# These just happen to fail for some reason (probably because they run against the s4 winbind)
+#
+^samba4.winbind.pac.pac\(plugin_s4_dc:local\)
+^samba4.winbind.pac.pac\(s4member:local\)
+^samba4.winbind.struct.show_sequence\(s4member:local\)
+^samba4.winbind.struct.show_sequence\(plugin_s4_dc:local\)
+^samba4.winbind.struct.getdcname\(s3member:local\)
+^samba4.winbind.struct.lookup_name_sid\(s3member:local\)
+^samba4.winbind.wbclient.wbcPingDc\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcPingDc2\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcListTrusts\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcLookupDomainController\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcLookupDomainControllerEx\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcResolveWinsByName\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcResolveWinsByIP\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcLookupRids\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcGetSidAliases\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcLogonUser\(fl2003dc:local\)
+^samba4.winbind.wbclient.wbcChangeUserPassword\(fl2003dc:local\)
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--all-domains.wbinfo\(plugin_s4_dc:local\)
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--trusted-domains.wbinfo\(plugin_s4_dc:local\)
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--online-status.wbinfo\(plugin_s4_dc:local\)
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--online-status --domain=BUILTIN.wbinfo\(plugin_s4_dc:local\)
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--online-status --domain=PLUGINDOMAIN.wbinfo\(plugin_s4_dc:local\)
+^samba.wbinfo_simple.\(plugin_s4_dc:local\).--change-secret --domain=PLUGINDOMAIN.wbinfo\(plugin_s4_dc:local\)
+^samba.wbinfo_simple.\(dc:local\).--all-domains.wbinfo\(dc:local\)
+^samba.wbinfo_simple.\(dc:local\).--trusted-domains.wbinfo\(dc:local\)
+^samba.wbinfo_simple.\(dc:local\).--online-status.wbinfo\(dc:local\)
+^samba.wbinfo_simple.\(dc:local\).--online-status --domain=BUILTIN.wbinfo\(dc:local\)
+^samba.wbinfo_simple.\(dc:local\).--online-status --domain=SAMBADOMAIN.wbinfo\(dc:local\)
+^samba.wbinfo_simple.\(dc:local\).--change-secret --domain=SAMBADOMAIN.wbinfo\(dc:local\)
+^samba.wbinfo_simple.\(dc:local\).--online-status --domain=SAMBADOMAIN.wbinfo\(dc:local\)
+^samba.wbinfo_simple.\(s4member:local\).--all-domains.wbinfo\(s4member:local\)
+^samba.wbinfo_simple.\(s4member:local\).--trusted-domains.wbinfo\(s4member:local\)
+^samba.wbinfo_simple.\(s4member:local\).--online-status.wbinfo\(s4member:local\)
+^samba.wbinfo_simple.\(s4member:local\).--online-status --domain=BUILTIN.wbinfo\(s4member:local\)
+^samba.wbinfo_simple.\(s4member:local\).--online-status --domain=SAMBADOMAIN.wbinfo\(s4member:local\)
+^samba.wbinfo_simple.\(s4member:local\).--change-secret --domain=SAMBADOMAIN.wbinfo\(s4member:local\)
+^samba.blackbox.wbinfo\(dc:local\).wbinfo -N against dc\(dc:local\)
+^samba.blackbox.wbinfo\(dc:local\).wbinfo -I against dc\(dc:local\)
+^samba.blackbox.wbinfo\(dc:local\).wbinfo  --trusted-domains against dc\(dc:local\)
+^samba.blackbox.wbinfo\(dc:local\).wbinfo --all-domains against dc\(dc:local\)
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo -N against s4member\(s4member:local\)
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo -I against s4member\(s4member:local\)
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo  --trusted-domains against s4member\(s4member:local\)
+^samba.blackbox.wbinfo\(s4member:local\).wbinfo --all-domains against s4member\(s4member:local\)
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo -N against rodc\(rodc:local\)
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo -I against rodc\(rodc:local\)
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo  --trusted-domains against rodc\(rodc:local\)
+^samba.blackbox.wbinfo\(rodc:local\).wbinfo --all-domains against rodc\(rodc:local\)
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo -N against promoted_dc\(promoted_dc:local\)
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo -I against promoted_dc\(promoted_dc:local\)
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo  --trusted-domains against promoted_dc\(promoted_dc:local\)
+^samba.blackbox.wbinfo\(promoted_dc:local\).wbinfo --all-domains against promoted_dc\(promoted_dc:local\)
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo -N against plugin_s4_dc\(plugin_s4_dc:local\)
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo -I against plugin_s4_dc\(plugin_s4_dc:local\)
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo  --trusted-domains against plugin_s4_dc\(plugin_s4_dc:local\)
+^samba.blackbox.wbinfo\(plugin_s4_dc:local\).wbinfo --all-domains against plugin_s4_dc\(plugin_s4_dc:local\)
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U against s3member\(s3member:local\)
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -U check for sane mapping\(s3member:local\)
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G against s3member\(s3member:local\)
+^samba.blackbox.wbinfo\(s3member:local\).wbinfo -G check for sane mapping\(s3member:local\)

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 33635f40349ae9c6886d482de5283f0190324918..5ce2e84113224615ff51e1c457491ac650639725 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1323,6 +1323,34 @@ sub provision_fl2003dc($$)
                                   "locDCpass6",
                                   undef, "allow dns updates = nonsecure and secure", "", undef);
 
+       unless (defined $ret) {
+               return undef;
+       }
+
+       $ret->{DC_SERVER} = $ret->{SERVER};
+       $ret->{DC_SERVER_IP} = $ret->{SERVER_IP};
+       $ret->{DC_NETBIOSNAME} = $ret->{NETBIOSNAME};
+       $ret->{DC_USERNAME} = $ret->{USERNAME};
+       $ret->{DC_PASSWORD} = $ret->{PASSWORD};
+
+       my @samba_tool_options;
+       push (@samba_tool_options, Samba::bindir_path($self, "samba-tool"));
+       push (@samba_tool_options, "domain");
+       push (@samba_tool_options, "passwordsettings");
+       push (@samba_tool_options, "set");
+       push (@samba_tool_options, "--configfile=$ret->{SERVERCONFFILE}");
+       push (@samba_tool_options, "--min-pwd-age=0");
+       push (@samba_tool_options, "--history-length=1");
+
+       my $samba_tool_cmd = join(" ", @samba_tool_options);
+
+       unless (system($samba_tool_cmd) == 0) {
+               warn("Unable to set min password age to 0: \n$samba_tool_cmd\n");
+               return undef;
+       }
+
+        return $ret;
+
        unless($self->add_wins_config("$prefix/private")) {
                warn("Unable to add wins configuration");
                return undef;

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index deea4a0a1744c5ecaaef2e243e8ac10487324428..5cee5245a95b3024a7568900d41cd28b9c1e0aef 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -23,8 +23,6 @@ sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "../
 import selftesthelpers
 from selftesthelpers import *
 smbtorture4_options.extend([
-   '--option="torture:winbindd_netbios_name=$SERVER"',
-   '--option="torture:winbindd_netbios_domain=$DOMAIN"',
    '--option=torture:sharedelay=100000',
    '--option=torture:writetimeupdatedelay=500000',
    ])
@@ -128,42 +126,6 @@ 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', 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', smbclient3, configuration])
 
-    tests = ["--ping", "--separator",
-             "--own-domain",
-             "--all-domains",
-             "--trusted-domains",
-             "--domain-info=BUILTIN",
-             "--domain-info=$DOMAIN",
-             "--online-status",
-             "--online-status --domain=BUILTIN",
-             "--online-status --domain=$DOMAIN",
-             "--check-secret --domain=$DOMAIN",
-             "--change-secret --domain=$DOMAIN",
-             "--check-secret --domain=$DOMAIN",
-             "--online-status --domain=$DOMAIN",
-             #Didn't pass yet# "--domain-users",
-             "--domain-groups",
-             "--name-to-sid=$DC_USERNAME",
-             "--name-to-sid=$DOMAIN/$DC_USERNAME",
-             #Didn't pass yet# "--user-info=$USERNAME",
-             "--user-groups=$DOMAIN/$DC_USERNAME",
-             "--authenticate=$DOMAIN/$DC_USERNAME%$DC_PASSWORD",
-             "--allocate-uid",
-             "--allocate-gid"]
-
-    for t in tests:
-        plantestsuite("samba3.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t])
-
-    plantestsuite(
-        "samba3.wbinfo_sids2xids.(%s:local)" % env, "%s:local" % env,
-        [os.path.join(samba3srcdir, "script/tests/test_wbinfo_sids2xids.sh")])
-
-    plantestsuite(
-        "samba3.ntlm_auth.diagnostics(%s:local)" % env, "%s:local" % env,
-        [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), ntlm_auth3, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
-
-    plantestsuite("samba3.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, ntlm_auth3,  '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
-
 for env in ["member", "s3member"]:
     plantestsuite("samba3.blackbox.net_cred_change.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_net_cred_change.sh"), configuration])
 
@@ -311,8 +273,6 @@ rpc = ["rpc.authcontext", "rpc.samba3.bind", "rpc.samba3.srvsvc", "rpc.samba3.sh
 
 local = ["local.ndr"]
 
-winbind = ["winbind.struct", "winbind.wbclient", "winbind.pac"]
-
 idmap = [ "idmap.rfc2307" ]
 
 rap = ["rap.basic", "rap.rpc", "rap.printing", "rap.sam"]
@@ -323,7 +283,7 @@ nbt = ["nbt.dgram" ]
 
 libsmbclient = ["libsmbclient"]
 
-tests= base + raw + smb2 + rpc + unix + local + winbind + rap + nbt + libsmbclient + idmap
+tests= base + raw + smb2 + rpc + unix + local + rap + nbt + libsmbclient + idmap
 
 for t in tests:
     if t == "base.delaywrite":

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 3f409a7610185f91a6d2b103e1f16cd1c52daf3c..4b80846db3643e856d1064570c03a37a29418446 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -370,21 +370,60 @@ plansmbtorture4testsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share'
 
 wb_opts = ["--option=\"torture:strict mode=no\"", "--option=\"torture:timelimit=1\"", "--option=\"torture:winbindd_separator=/\"", "--option=\"torture:winbindd_netbios_name=$SERVER\"", "--option=\"torture:winbindd_netbios_domain=$DOMAIN\""]
 
-winbind_struct_tests = smbtorture4_testsuites("winbind.struct")
-winbind_ndr_tests = smbtorture4_testsuites("winbind.ndr")
-for env in ["plugin_s4_dc", "dc", "s4member"]:
-    for t in winbind_struct_tests:
-        plansmbtorture4testsuite(t, env, wb_opts + ['//_none_/_none_'])
+winbind_ad_client_tests = smbtorture4_testsuites("winbind.struct") + smbtorture4_testsuites("winbind.pac")
+winbind_wbclient_tests = smbtorture4_testsuites("winbind.wbclient")
+for env in ["plugin_s4_dc", "s4member", "s3member"]:
+    for t in winbind_ad_client_tests:
+        plansmbtorture4testsuite(t, "%s:local" % env, wb_opts + ['//$SERVER/tmp', '--realm=$REALM', '--machine-pass', '--option=torture:addc=$DC_SERVER'])
+
+for env in ["s3dc", "fl2003dc"]:
+    for t in winbind_wbclient_tests:
+        plansmbtorture4testsuite(t, "%s:local" % env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD')
+
+for env in ["s3dc", "member", "plugin_s4_dc", "dc", "s3member", "s4member"]:
+    tests = ["--ping", "--separator",
+             "--own-domain",
+             "--all-domains",
+             "--trusted-domains",
+             "--domain-info=BUILTIN",
+             "--domain-info=$DOMAIN",
+             "--online-status",
+             "--online-status --domain=BUILTIN",
+             "--online-status --domain=$DOMAIN",
+             "--check-secret --domain=$DOMAIN",
+             "--change-secret --domain=$DOMAIN",
+             "--check-secret --domain=$DOMAIN",
+             "--online-status --domain=$DOMAIN",
+             #Didn't pass yet# "--domain-users",
+             "--domain-groups",
+             "--name-to-sid=$DC_USERNAME",
+             "--name-to-sid=$DOMAIN/$DC_USERNAME",
+             #Didn't pass yet# "--user-info=$USERNAME",
+             "--user-groups=$DOMAIN/$DC_USERNAME",
+             "--authenticate=$DOMAIN/$DC_USERNAME%$DC_PASSWORD",
+             "--allocate-uid",
+             "--allocate-gid"]
+
+    for t in tests:
+        plantestsuite("samba.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t])
+
+    plantestsuite(
+        "samba.wbinfo_sids2xids.(%s:local)" % env, "%s:local" % env,
+        [os.path.join(samba3srcdir, "script/tests/test_wbinfo_sids2xids.sh")])
+
+    plantestsuite(
+        "samba.ntlm_auth.diagnostics(%s:local)" % env, "%s:local" % env,
+        [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), ntlm_auth3, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
+
+    plantestsuite("samba.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, ntlm_auth3,  '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
 
-    for t in winbind_ndr_tests:
-        plansmbtorture4testsuite(t, env, wb_opts + ['//_none_/_none_'])
 
 nsstest4 = binpath("nsstest")
 for env in ["plugin_s4_dc", "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")])
+        plantestsuite("samba.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")
+        skiptestsuite("samba.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=[]):
@@ -505,7 +544,7 @@ for env in ['vampire_dc', 'promoted_dc']:
     plantestsuite("samba4.blackbox.samba_tool_demote(%s)" % env, env, [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/%s' % env, smbclient4])
 
 for env in ["dc", "s4member", "rodc", "promoted_dc", "plugin_s4_dc", "s3member"]:
-    plantestsuite("samba4.blackbox.wbinfo(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', env])
+    plantestsuite("samba.blackbox.wbinfo(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', env])
 
 # TODO: Verifying the databases really should be a part of the
 # environment teardown.