selftest: test listing trusted domains that includes an NT4 domain

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15533

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/knownfail.d/samba3.blackbox.list_nt4_trusts b/selftest/knownfail.d/samba3.blackbox.list_nt4_trusts
new file mode 100644 (file)
index 0000000..546e087
--- /dev/null
+++ b/selftest/knownfail.d/samba3.blackbox.list_nt4_trusts
@@ -0,0 +1 @@
+^samba3.blackbox.list_nt4_trusts.nt4trust_wbinfo_m\(ad_member_idmap_ad\)

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index e1e6dc512c1fafe66f83aab8d2b032e18ae33854..c8489407e01b65f3962edee5ace166c077453280 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1418,6 +1418,7 @@ sub setup_ad_member_idmap_ad
        idmap config $dcvars->{TRUST_DOMAIN} : backend = ad
        idmap config $dcvars->{TRUST_DOMAIN} : range = 2000000-2999999
        gensec_gssapi:requested_life_time = 5
+       winbind scan trusted domains = yes
 ";
 
        my $ret = $self->provision(

diff --git a/source3/script/tests/test_list_nt4_trust.sh b/source3/script/tests/test_list_nt4_trust.sh
new file mode 100755 (executable)
index 0000000..03ee7fc
--- /dev/null
+++ b/source3/script/tests/test_list_nt4_trust.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+incdir=$(dirname $0)/../../../testprogs/blackbox
+. $incdir/subunit.sh
+. $incdir/common_test_fns.inc
+
+failed=0
+
+wbinfo="$BINDIR/wbinfo"
+smbclient="$BINDIR/smbclient"
+
+test_trust_wbinfo_m() {
+    i=0
+    # Give the server some time to list trusted domains
+    while [ $i -lt 10 ] ; do
+             $wbinfo -m --verbose | grep "SAMBA-TEST" && return 0
+             sleep 2
+             i=$((i + 1))
+    done
+    return 1
+}
+
+testit "nt4trust_wbinfo_m" test_trust_wbinfo_m || failed=$(expr $failed + 1)
+
+testok $0 $failed

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index dd9e1b550d701007741d6df9286b5d3b8ca0330d..0901c2480c8017078f17064e3f0be9625be1d016 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -1861,6 +1861,10 @@ plantestsuite("samba3.blackbox.nt4_trusts",
               "fl2008r2dc",
               [os.path.join(samba3srcdir, "script/tests/test_nt4_trust.sh")])
 
+plantestsuite("samba3.blackbox.list_nt4_trusts",
+              "ad_member_idmap_ad",
+              [os.path.join(samba3srcdir, "script/tests/test_list_nt4_trust.sh")])
+
 def planclusteredmembertestsuite(tname, prefix):
     '''Define a clustered test for the clusteredmember environment'''