diff options
| -rwxr-xr-x | nsswitch/tests/test_idmap_ad.sh | 7 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nsswitch/tests/test_idmap_ad.sh b/nsswitch/tests/test_idmap_ad.sh index 3e36498efcb..d89ed20a799 100755 --- a/nsswitch/tests/test_idmap_ad.sh +++ b/nsswitch/tests/test_idmap_ad.sh @@ -3,14 +3,17 @@ # Basic testing of id mapping with idmap_ad # -if [ $# -ne 3 ]; then - echo Usage: $0 DOMAIN DC_SERVER DC_PASSWORD +if [ $# -ne 6 ]; then + echo Usage: $0 DOMAIN DC_SERVER DC_PASSWORD TRUST_DOMAIN TRUST_SERVER TRUST_PASSWORD exit 1 fi DOMAIN="$1" DC_SERVER="$2" DC_PASSWORD="$3" +TRUST_DOMAIN="$4" +TRUST_SERVER="$5" +TRUST_PASSWORD="$6" wbinfo="$VALGRIND $BINDIR/wbinfo" ldbmodify="$VALGRIND $BINDIR/ldbmodify" diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 147e53da558..c856f28ddb1 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -564,7 +564,7 @@ for t in tests: elif t == "idmap.rid": plantestsuite(t, "ad_member_idmap_rid", [os.path.join(samba3srcdir, "../nsswitch/tests/test_idmap_rid.sh"), '$DOMAIN', '2000000']) elif t == "idmap.ad": - plantestsuite(t, "ad_member_idmap_ad", [os.path.join(samba3srcdir, "../nsswitch/tests/test_idmap_ad.sh"), '$DOMAIN', '$DC_SERVER', '$DC_PASSWORD']) + plantestsuite(t, "ad_member_idmap_ad", [os.path.join(samba3srcdir, "../nsswitch/tests/test_idmap_ad.sh"), '$DOMAIN', '$DC_SERVER', '$DC_PASSWORD', '$TRUST_DOMAIN', '$TRUST_SERVER', '$TRUST_PASSWORD']) elif t == "raw.acls": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_simple_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple-40') |