testprogs: Remove the usage of enctype in test_pkinit_simple.sh

This is not needed anymore and the default is AES in the meantime.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

1 files changed, 24 insertions, 26 deletions

diff --git a/testprogs/blackbox/test_pkinit_simple.sh b/testprogs/blackbox/test_pkinit_simple.sh
index 8ced1a17632..f5465071e04 100755
--- a/testprogs/blackbox/test_pkinit_simple.sh
+++ b/testprogs/blackbox/test_pkinit_simple.sh
@@ -16,7 +16,6 @@ PASSWORD="${3}"
 REALM="${4}"
 DOMAIN="${5}"
 PREFIX="${6}"
-ENCTYPE="${7}"
 smbclient="${8}"
 shift 8
 failed=0
@@ -48,7 +47,6 @@ fi
 . $(dirname $0)/subunit.sh
 . $(dirname $0)/common_test_fns.inc
 
-enctype="-e $ENCTYPE"
 unc="//$SERVER/tmp"
 
 KRB5CCNAME_PATH="$PREFIX/tmpccache"
@@ -71,7 +69,7 @@ testit "STEP1 samba-tool user create $USERNAME --smartcard-required" \
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP1 kinit with password" \
-	$samba4kinit $enctype --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
+	$samba4kinit --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit_expect_failure "STEP1 Test login with NTLM" \
 	"${smbclient}" "${unc}" -c 'ls' "-U${USERNAME}%${PASSWORD}" ||
@@ -81,7 +79,7 @@ testit_expect_failure "STEP1 Test wbinfo with password" \
 	failed=$((failed + 1))
 
 testit "STEP1 kinit with pkinit (name specified) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP1 kinit renew ticket (name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -91,15 +89,15 @@ test_smbclient "STEP1 Test login with kerberos ccache (name specified)" \
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP1 kinit with pkinit (wrong name specified) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER not$USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER not$USERNAME@$REALM ||
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP1 kinit with pkinit (wrong name specified 2) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER $SERVER@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER $SERVER@$REALM ||
 	failed=$((failed + 1))
 
 testit "STEP1 kinit with pkinit (enterprise name specified)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP1 kinit renew ticket (enterprise name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -109,15 +107,15 @@ test_smbclient "STEP1 Test login with kerberos ccache (enterprise name specified
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP1 kinit with pkinit (wrong enterprise name specified) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise not$USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER --enterprise not$USERNAME@$REALM ||
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP1 kinit with pkinit (wrong enterprise name specified 2) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $SERVER$@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER --enterprise $SERVER$@$REALM ||
 	failed=$((failed + 1))
 
 testit "STEP1 kinit with pkinit (enterprise name in cert)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	$samba4kinit --request-pac --renewable $PKUSER --pk-enterprise ||
 	failed=$((failed + 1))
 testit "STEP1 kinit renew ticket (enterprise name in cert)" \
 	$samba4kinit --request-pac -R ||
@@ -133,7 +131,7 @@ testit "STEP2 samba-tool user setpassword $USERNAME --newpassword" \
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP2 kinit with password" \
-	$samba4kinit $enctype --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
+	$samba4kinit --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
 	failed=$((failed + 1))
 test_smbclient "STEP2 Test login with NTLM" \
 	'ls' "$unc" -U"${USERNAME}%${PASSWORD}" ||
@@ -143,7 +141,7 @@ testit_expect_failure "STEP2 Test wbinfo with password" \
 	failed=$((failed + 1))
 
 testit "STEP2 kinit with pkinit (name specified) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP2 kinit renew ticket (name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -153,7 +151,7 @@ test_smbclient "STEP2 Test login with kerberos ccache (name specified)" \
 	failed=$((failed + 1))
 
 testit "STEP2 kinit with pkinit (enterprise name specified)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP2 kinit renew ticket (enterprise name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -163,7 +161,7 @@ test_smbclient "STEP2 Test login with kerberos ccache (enterprise name specified
 	failed=$((failed + 1))
 
 testit "STEP2 kinit with pkinit (enterprise name in cert)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	$samba4kinit --request-pac --renewable $PKUSER --pk-enterprise ||
 	failed=$((failed + 1))
 testit "STEP2 kinit renew ticket (enterprise name in cert)" \
 	$samba4kinit --request-pac -R ||
@@ -179,7 +177,7 @@ testit "STEP3 samba-tool user setpassword $USERNAME --smartcard-required" \
 	failed=$((failed + 1))
 
 testit "STEP3 kinit with password" \
-	$samba4kinit $enctype --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
+	$samba4kinit --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
 	failed=$((failed + 1))
 test_smbclient "STEP3 Test login with user kerberos ccache" \
 	'ls' "$unc" --use-krb5-ccache="${KRB5CCNAME}" ||
@@ -192,7 +190,7 @@ testit "STEP3 Test wbinfo with password" \
 	failed=$((failed + 1))
 
 testit "STEP3 kinit with pkinit (name specified) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP3 kinit renew ticket (name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -202,7 +200,7 @@ test_smbclient "STEP3 Test login with kerberos ccache (name specified)" \
 	failed=$((failed + 1))
 
 testit "STEP3 kinit with pkinit (enterprise name specified)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP3 kinit renew ticket (enterprise name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -212,7 +210,7 @@ test_smbclient "STEP3 Test login with kerberos ccache (enterprise name specified
 	failed=$((failed + 1))
 
 testit "STEP3 kinit with pkinit (enterprise name in cert)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	$samba4kinit --request-pac --renewable $PKUSER --pk-enterprise ||
 	failed=$((failed + 1))
 testit "STEP3 kinit renew ticket (enterprise name in cert)" \
 	$samba4kinit --request-pac -R ||
@@ -229,7 +227,7 @@ testit "STEP4 samba-tool user setpassword $USERNAME --smartcard-required" \
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP4 kinit with password" \
-	$samba4kinit $enctype --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
+	$samba4kinit --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit_expect_failure "STEP4 Test login with NTLM" \
 	"${smbclient}" "${unc}" -c 'ls' -U"${USERNAME}%${PASSWORD}" ||
@@ -239,7 +237,7 @@ testit_expect_failure "STEP4 Test wbinfo with password" \
 	failed=$((failed + 1))
 
 testit "STEP4 kinit with pkinit (name specified) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP4 kinit renew ticket (name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -249,7 +247,7 @@ test_smbclient "STEP4 Test login with kerberos ccache (name specified)" \
 	failed=$((failed + 1))
 
 testit "STEP4 kinit with pkinit (enterprise name specified)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit "STEP4 kinit renew ticket (enterprise name specified)" \
 	$samba4kinit --request-pac -R ||
@@ -259,7 +257,7 @@ test_smbclient "STEP4 Test login with kerberos ccache (enterprise name specified
 	failed=$((failed + 1))
 
 testit "STEP4 kinit with pkinit (enterprise name in cert)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	$samba4kinit --request-pac --renewable $PKUSER --pk-enterprise ||
 	failed=$((failed + 1))
 testit "STEP4 kinit renew ticket (enterprise name in cert)" \
 	$samba4kinit --request-pac -R ||
@@ -275,7 +273,7 @@ testit "STEP5 samba-tool user disable $USERNAME" \
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP5 kinit with password" \
-	$samba4kinit $enctype --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
+	$samba4kinit --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit_expect_failure "STEP5 Test login with NTLM" \
 	"${smbclient}" "${unc}" -c 'ls' -U"${USERNAME}%${PASSWORD}" ||
@@ -285,13 +283,13 @@ testit_expect_failure "STEP5 Test wbinfo with password" \
 	failed=$((failed + 1))
 
 testit_expect_failure "STEP5 kinit with pkinit (name specified) " \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit_expect_failure "STEP5 kinit with pkinit (enterprise name specified)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	$samba4kinit --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
 	failed=$((failed + 1))
 testit_expect_failure "STEP5 kinit with pkinit (enterprise name in cert)" \
-	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	$samba4kinit --request-pac --renewable $PKUSER --pk-enterprise ||
 	failed=$((failed + 1))
 
 # STEP6: