diff options
| author | Andreas Schneider <asn@samba.org> | 2018-04-20 11:24:30 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-05-24 11:29:22 +0200 |
| commit | ee22c6fb26182d8f8aca7f82b9b85debe864b3b2 (patch) | |
| tree | 07425796c96dc2fd5597411ed8d5865b61fef5d6 | |
| parent | 4bbc5a872192191810e8297967a26a73a09ff2c1 (diff) | |
| download | samba-ee22c6fb26182d8f8aca7f82b9b85debe864b3b2.tar.gz | |
nsswitch: Add a test looking up the user using the upn
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13369
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 0d2f743d826b87b369e25fc6bb9ff61f2b0896aa)
| -rwxr-xr-x | nsswitch/tests/test_wbinfo_name_lookup.sh | 9 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/nsswitch/tests/test_wbinfo_name_lookup.sh b/nsswitch/tests/test_wbinfo_name_lookup.sh index 696e25b3a2a..a8fd5ec4d99 100755 --- a/nsswitch/tests/test_wbinfo_name_lookup.sh +++ b/nsswitch/tests/test_wbinfo_name_lookup.sh @@ -8,8 +8,9 @@ exit 1; fi DOMAIN=$1 -DC_USERNAME=$2 -shift 2 +REALM=$2 +DC_USERNAME=$3 +shift 3 failed=0 sambabindir="$BINDIR" @@ -22,6 +23,10 @@ testit "name-to-sid.single-separator" \ $wbinfo -n $DOMAIN/$DC_USERNAME || \ failed=$(expr $failed + 1) +testit "name-to-sid.upn" \ + $wbinfo -n $DC_USERNAME@$REALM || \ + failed=$(expr $failed + 1) + # Two separator characters should fail testit_expect_failure "name-to-sid.double-separator" \ $wbinfo -n $DOMAIN//$DC_USERNAME || \ diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 172d3300463..a5acab2792a 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -210,7 +210,7 @@ plantestsuite("samba3.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, plantestsuite("samba3.wbinfo_name_lookup", env, [ os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_name_lookup.sh"), - '$DOMAIN', '$DC_USERNAME' ]) + '$DOMAIN', '$REALM', '$DC_USERNAME' ]) t = "WBCLIENT-MULTI-PING" plantestsuite("samba3.smbtorture_s3.%s" % t, env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//foo/bar', '""', '""', smbtorture3, ""]) plantestsuite("samba3.substitutions", env, [os.path.join(samba3srcdir, "script/tests/test_substitutions.sh"), "$SERVER", "alice", "Secret007", "$PREFIX"]) |