git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2eb229b)
remove debugging testprogs/blackbox/test_net_ads.sh
authorStefan Metzmacher <metze@samba.org>
Thu, 27 Oct 2022 12:28:55 +0000 (14:28 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 11 Dec 2023 14:55:16 +0000 (15:55 +0100)
testprogs/blackbox/test_net_ads.sh patch | blob | history

diff --git a/testprogs/blackbox/test_net_ads.sh b/testprogs/blackbox/test_net_ads.sh
index 93914ba7612fde07d50863377b373ab18ded738b..4a7a07f8602180aba4da2f545b832f9f1d205dab 100755 (executable)
--- a/testprogs/blackbox/test_net_ads.sh
+++ b/testprogs/blackbox/test_net_ads.sh
@@ -94,9 +94,6 @@ uc_netbios=$(echo $netbios | tr '[:lower:]' '[:upper:]')
 lc_realm=$(echo $REALM | tr '[:upper:]' '[:lower:]')
 fqdn="$netbios.$lc_realm"
 
-testit_expect_failure "metze keytab.list.init" $VALGRIND $net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
-testit_expect_failure "metze spn.list.init" $VALGRIND $net_tool ads setspn list -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
-
 krb_princ="primary/instance@$REALM"
 testit "test (dedicated keytab) add a fully qualified krb5 principal" $VALGRIND $net_tool ads keytab add $krb_princ -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
 
@@ -170,50 +167,7 @@ testit_expect_failure "test (dedicated keytab) fail to parse windows spn with mi
 windows_spn="$spn_service/$spn_host/"
 testit_expect_failure "test (dedicated keytab) fail to parse windows spn with missing servicename" $VALGRIND $net_tool ads keytab add $windows_spn -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
 
-testit_expect_failure "metze keytab.list.before" $VALGRIND $net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
-testit_expect_failure "metze spn.list.before" $VALGRIND $net_tool ads setspn list -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
-
-#testit_expect_failure "metze list" $VALGRIND $net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file"
-#test: samba4.blackbox.net_ads.metze list(ad_dc:client)
-#time: 2022-10-27 11:25:19.908812Z
-#failure: samba4.blackbox.net_ads.metze list(ad_dc:client) [
-#Exception: Exception: Vno  Type                                        Principal
-#  1  aes256-cts-hmac-sha1-96                     primary/instance@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     primary/instance@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            primary/instance@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     machine123$@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     machine123$@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            machine123$@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     nfs/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     nfs/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     nfs/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     nfs/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            nfs/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            nfs/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     random_srv/somehost.subdomain.domain@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     random_srv/somehost.subdomain.domain@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            random_srv/somehost.subdomain.domain@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     writetoad/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     writetoad/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     writetoad/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     writetoad/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            writetoad/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            writetoad/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     host/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     host/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     host/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     host/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            host/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            host/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     restrictedkrbhost/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     restrictedkrbhost/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     restrictedkrbhost/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     restrictedkrbhost/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            restrictedkrbhost/197972f406.addom.samba.example.com@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            restrictedkrbhost/197972F406@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes256-cts-hmac-sha1-96                     197972F406$@ADDOM.SAMBA.EXAMPLE.COM
-#  1  aes128-cts-hmac-sha1-96                     197972F406$@ADDOM.SAMBA.EXAMPLE.COM
-#  1  arcfour-hmac-md5                            197972F406$@ADDOM.SAMBA.EXAMPLE.COM
+# now delete the keytab entries again...
 
 krb_princ="primary/instance@$REALM"
 testit "test (dedicated keytab) delete a fully qualified krb5 principal" $VALGRIND $net_tool ads keytab delete $krb_princ -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
@@ -267,13 +221,6 @@ testit "test (dedicated keytab) spn is written to AD (using keytab add_update_ad
 found=$($net_tool ads setspn list -U$DC_USERNAME%$DC_PASSWORD | grep $ad_service | wc -l)
 testit "test (dedicated keytab) spn is written to AD (using keytab add_update_ads) is still in ad after deletion from keytab" test $found -eq 2 || failed=`expr $failed + 1`
 
-testit_expect_failure "metze keytab.list.after" $VALGRIND $net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1`
-testit_expect_failure "metze spn.list.after" $VALGRIND $net_tool ads setspn list -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
-
-echo "rm -rf $BASEDIR/$WORKDIR"
-
-exit $failed
-
 testit "changetrustpw (dedicated keytab)" $VALGRIND $net_tool ads changetrustpw || failed=`expr $failed + 1`
 
 testit "leave (dedicated keytab)" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1`
Work in progress branches