summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2015-02-03 11:36:49 +1300
committerAndrew Bartlett <abartlet@samba.org>2015-02-08 08:07:07 +0100
commit32e2b75a96b45d64d6059240ef2e8da924c6c84e (patch)
tree21f38c83478cbb15f9d8e796a6444fb16ea5b03d
parent5fe76cc02a1f09213b4b4a65dc53ad4d2ce97c86 (diff)
downloadsamba-32e2b75a96b45d64d6059240ef2e8da924c6c84e.tar.gz
samba-32e2b75a96b45d64d6059240ef2e8da924c6c84e.tar.xz
samba-32e2b75a96b45d64d6059240ef2e8da924c6c84e.zip
selftest: Run krb5.kdc with an account that has a UPN and an SPN
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Pair-programmed-with: Garming Sam <garming@catalyst.net.nz> Signed-off-by: Garming Sam <garming@catalyst.net.nz>
-rwxr-xr-xselftest/target/Samba4.pm2
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index c85b4a7580..1cc74b7987 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -829,6 +829,8 @@ sub provision_raw_step2($$$)
changetype: modify
replace: userPrincipalName
userPrincipalName: testallowed_upn\@$ctx->{realm}
+replace: servicePrincipalName
+servicePrincipalName: host/testallowed
-
";
close(LDIF);
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 313bd67b3f..c188a0ca6d 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -572,7 +572,7 @@ for env in ["dc", "rodc", "promoted_dc", "plugin_s4_dc", "fl2000dc", "fl2003dc",
plansmbtorture4testsuite('krb5.kdc', "%s:local" % env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-P', '--workgroup=$DOMAIN', '--realm=$REALM', '--option=torture:expect_machine_account=true'] + extra_options,
"samba4.krb5.kdc with machine account")
- plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-Utestallowed%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM', '--option=torture:krb5-upn=testallowed_upn@$REALM'] + extra_options,
+ plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-Utestallowed%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM', '--option=torture:expect_machine_account=true', '--option=torture:krb5-upn=testallowed_upn@$REALM'] + extra_options,
"samba4.krb5.kdc with account ALLOWED permission to replicate to an RODC")
# TODO: Verifying the databases really should be a part of the