testprogs: Manually reformat testit commands in test_pkinit_simple.sh

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

1 files changed, 217 insertions, 87 deletions

diff --git a/testprogs/blackbox/test_pkinit_simple.sh b/testprogs/blackbox/test_pkinit_simple.sh
index bb0f661630a..ea3dfa96584 100755
--- a/testprogs/blackbox/test_pkinit_simple.sh
+++ b/testprogs/blackbox/test_pkinit_simple.sh
@@ -66,109 +66,239 @@ PKUSER="--pk-user=FILE:$PREFIX/pkinit/USER-${USER_PRINCIPAL_NAME}-cert.pem,$PREF
 # STEP1:
 # Now we set the UF_SMARTCARD_REQUIRED bit
 # This means we have a normal enabled account *without* a known password
-testit "STEP1 samba-tool user create $USERNAME --smartcard-required" $PYTHON ${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 || failed=$((failed + 1))
-testit_expect_failure "STEP1 Test login with NTLM" $smbclient "$unc" -c 'ls' -U$USERNAME%$PASSWORD || failed=$((failed + 1))
-testit_expect_failure "STEP1 Test wbinfo with password" $wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD || failed=$((failed + 1))
-
-testit "STEP1 kinit with pkinit (name specified) " $samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP1 kinit renew ticket (name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP1 Test login with kerberos ccache (name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit_expect_failure "STEP1 kinit with pkinit (wrong name specified) " $samba4kinit $enctype --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 || failed=$((failed + 1))
-
-testit "STEP1 kinit with pkinit (enterprise name specified)" $samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP1 kinit renew ticket (enterprise name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP1 Test login with kerberos ccache (enterprise name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit_expect_failure "STEP1 kinit with pkinit (wrong enterprise name specified) " $samba4kinit $enctype --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 || failed=$((failed + 1))
-
-testit "STEP1 kinit with pkinit (enterprise name in cert)" $samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise || failed=$((failed + 1))
-testit "STEP1 kinit renew ticket (enterprise name in cert)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP1 Test login with kerberos ccache (enterprise name in cert)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
+testit "STEP1 samba-tool user create $USERNAME --smartcard-required" \
+	$PYTHON ${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 ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP1 Test login with NTLM" \
+	$smbclient "$unc" -c 'ls' -U$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP1 Test wbinfo with password" \
+	$wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+
+testit "STEP1 kinit with pkinit (name specified) " \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP1 kinit renew ticket (name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP1 Test login with kerberos ccache (name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit_expect_failure "STEP1 kinit with pkinit (wrong name specified) " \
+	$samba4kinit $enctype --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 ||
+	failed=$((failed + 1))
+
+testit "STEP1 kinit with pkinit (enterprise name specified)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP1 kinit renew ticket (enterprise name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP1 Test login with kerberos ccache (enterprise name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit_expect_failure "STEP1 kinit with pkinit (wrong enterprise name specified) " \
+	$samba4kinit $enctype --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 ||
+	failed=$((failed + 1))
+
+testit "STEP1 kinit with pkinit (enterprise name in cert)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	failed=$((failed + 1))
+testit "STEP1 kinit renew ticket (enterprise name in cert)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP1 Test login with kerberos ccache (enterprise name in cert)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
 
 # STEP2:
 # We still have UF_SMARTCARD_REQUIRED, but with a known password
-testit "STEP2 samba-tool user setpassword $USERNAME --newpassword" $PYTHON ${samba_tool} user setpassword $USERNAME --newpassword=$PASSWORD || failed=$((failed + 1))
-
-testit_expect_failure "STEP2 kinit with password" $samba4kinit $enctype --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM || failed=$((failed + 1))
-test_smbclient "STEP2 Test login with NTLM" 'ls' "$unc" -U$USERNAME%$PASSWORD || failed=$((failed + 1))
-testit_expect_failure "STEP2 Test wbinfo with password" $wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD || failed=$((failed + 1))
-
-testit "STEP2 kinit with pkinit (name specified) " $samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP2 kinit renew ticket (name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP2 Test login with kerberos ccache (name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit "STEP2 kinit with pkinit (enterprise name specified)" $samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP2 kinit renew ticket (enterprise name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP2 Test login with kerberos ccache (enterprise name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit "STEP2 kinit with pkinit (enterprise name in cert)" $samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise || failed=$((failed + 1))
-testit "STEP2 kinit renew ticket (enterprise name in cert)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP2 Test login with kerberos ccache (enterprise name in cert)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
+testit "STEP2 samba-tool user setpassword $USERNAME --newpassword" \
+	$PYTHON ${samba_tool} user setpassword $USERNAME --newpassword=$PASSWORD ||
+	failed=$((failed + 1))
+
+testit_expect_failure "STEP2 kinit with password" \
+	$samba4kinit $enctype --password-file=$PASSFILE_PATH --request-pac $USERNAME@$REALM ||
+	failed=$((failed + 1))
+test_smbclient "STEP2 Test login with NTLM" \
+	'ls' "$unc" -U$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP2 Test wbinfo with password" \
+	$wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+
+testit "STEP2 kinit with pkinit (name specified) " \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP2 kinit renew ticket (name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP2 Test login with kerberos ccache (name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit "STEP2 kinit with pkinit (enterprise name specified)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP2 kinit renew ticket (enterprise name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP2 Test login with kerberos ccache (enterprise name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit "STEP2 kinit with pkinit (enterprise name in cert)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	failed=$((failed + 1))
+testit "STEP2 kinit renew ticket (enterprise name in cert)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP2 Test login with kerberos ccache (enterprise name in cert)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
 
 # STEP3:
 # The account is a normal account without the UF_SMARTCARD_REQUIRED bit set
-testit "STEP3 samba-tool user setpassword $USERNAME --smartcard-required" $PYTHON ${samba_tool} user setpassword $USERNAME --newpassword=$PASSWORD --clear-smartcard-required || failed=$((failed + 1))
-
-testit "STEP3 kinit with password" $samba4kinit $enctype --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 || failed=$((failed + 1))
-test_smbclient "STEP3 Test login with NTLM" 'ls' "$unc" -U$USERNAME%$PASSWORD || failed=$((failed + 1))
-testit "STEP3 Test wbinfo with password" $wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD || failed=$((failed + 1))
-
-testit "STEP3 kinit with pkinit (name specified) " $samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP3 kinit renew ticket (name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP3 Test login with kerberos ccache (name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit "STEP3 kinit with pkinit (enterprise name specified)" $samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP3 kinit renew ticket (enterprise name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP3 Test login with kerberos ccache (enterprise name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit "STEP3 kinit with pkinit (enterprise name in cert)" $samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise || failed=$((failed + 1))
-testit "STEP3 kinit renew ticket (enterprise name in cert)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP3 Test login with kerberos ccache (enterprise name in cert)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
+testit "STEP3 samba-tool user setpassword $USERNAME --smartcard-required" \
+	$PYTHON ${samba_tool} user setpassword $USERNAME --newpassword=$PASSWORD --clear-smartcard-required ||
+	failed=$((failed + 1))
+
+testit "STEP3 kinit with password" \
+	$samba4kinit $enctype --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 ||
+	failed=$((failed + 1))
+test_smbclient "STEP3 Test login with NTLM" \
+	'ls' "$unc" -U$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+testit "STEP3 Test wbinfo with password" \
+	$wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+
+testit "STEP3 kinit with pkinit (name specified) " \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP3 kinit renew ticket (name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP3 Test login with kerberos ccache (name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit "STEP3 kinit with pkinit (enterprise name specified)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP3 kinit renew ticket (enterprise name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP3 Test login with kerberos ccache (enterprise name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit "STEP3 kinit with pkinit (enterprise name in cert)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	failed=$((failed + 1))
+testit "STEP3 kinit renew ticket (enterprise name in cert)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP3 Test login with kerberos ccache (enterprise name in cert)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
 
 # STEP4:
 # Now we set the UF_SMARTCARD_REQUIRED bit
 # This means we have a normal enabled account *without* a known password
-testit "STEP4 samba-tool user setpassword $USERNAME --smartcard-required" $PYTHON ${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 || failed=$((failed + 1))
-testit_expect_failure "STEP4 Test login with NTLM" $smbclient "$unc" -c 'ls' -U$USERNAME%$PASSWORD || failed=$((failed + 1))
-testit_expect_failure "STEP4 Test wbinfo with password" $wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD || failed=$((failed + 1))
-
-testit "STEP4 kinit with pkinit (name specified) " $samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP4 kinit renew ticket (name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP4 Test login with kerberos ccache (name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit "STEP4 kinit with pkinit (enterprise name specified)" $samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM || failed=$((failed + 1))
-testit "STEP4 kinit renew ticket (enterprise name specified)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP4 Test login with kerberos ccache (enterprise name specified)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
-
-testit "STEP4 kinit with pkinit (enterprise name in cert)" $samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise || failed=$((failed + 1))
-testit "STEP4 kinit renew ticket (enterprise name in cert)" $samba4kinit --request-pac -R || failed=$((failed + 1))
-test_smbclient "STEP4 Test login with kerberos ccache (enterprise name in cert)" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$((failed + 1))
+testit "STEP4 samba-tool user setpassword $USERNAME --smartcard-required" \
+	$PYTHON ${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 ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP4 Test login with NTLM" \
+	$smbclient "$unc" -c 'ls' -U$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP4 Test wbinfo with password" \
+	$wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+
+testit "STEP4 kinit with pkinit (name specified) " \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP4 kinit renew ticket (name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP4 Test login with kerberos ccache (name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit "STEP4 kinit with pkinit (enterprise name specified)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --enterprise $USERNAME@$REALM ||
+	failed=$((failed + 1))
+testit "STEP4 kinit renew ticket (enterprise name specified)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP4 Test login with kerberos ccache (enterprise name specified)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
+
+testit "STEP4 kinit with pkinit (enterprise name in cert)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	failed=$((failed + 1))
+testit "STEP4 kinit renew ticket (enterprise name in cert)" \
+	$samba4kinit --request-pac -R ||
+	failed=$((failed + 1))
+test_smbclient "STEP4 Test login with kerberos ccache (enterprise name in cert)" \
+	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME ||
+	failed=$((failed + 1))
 
 # STEP5:
 # disable the account
-testit "STEP5 samba-tool user disable $USERNAME" $PYTHON ${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 || failed=$((failed + 1))
-testit_expect_failure "STEP5 Test login with NTLM" $smbclient "$unc" -c 'ls' -U$USERNAME%$PASSWORD || failed=$((failed + 1))
-testit_expect_failure "STEP5 Test wbinfo with password" $wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD || failed=$((failed + 1))
-
-testit_expect_failure "STEP5 kinit with pkinit (name specified) " $samba4kinit $enctype --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 || failed=$((failed + 1))
-testit_expect_failure "STEP5 kinit with pkinit (enterprise name in cert)" $samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise || failed=$((failed + 1))
+testit "STEP5 samba-tool user disable $USERNAME" \
+	$PYTHON ${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 ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP5 Test login with NTLM" \
+	$smbclient "$unc" -c 'ls' -U$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP5 Test wbinfo with password" \
+	$wbinfo --authenticate=$DOMAIN/$USERNAME%$PASSWORD ||
+	failed=$((failed + 1))
+
+testit_expect_failure "STEP5 kinit with pkinit (name specified) " \
+	$samba4kinit $enctype --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 ||
+	failed=$((failed + 1))
+testit_expect_failure "STEP5 kinit with pkinit (enterprise name in cert)" \
+	$samba4kinit $enctype --request-pac --renewable $PKUSER --pk-enterprise ||
+	failed=$((failed + 1))
 
 # STEP6:
 # cleanup
-testit "STEP6 samba-tool user delete $USERNAME " $PYTHON ${samba_tool} user delete $USERNAME || failed=$((failed + 1))
+testit "STEP6 samba-tool user delete $USERNAME " \
+	$PYTHON ${samba_tool} user delete $USERNAME ||
+	failed=$((failed + 1))
 
 rm -f $PASSFILE_PATH
 rm -f $KRB5CCNAME_PATH