testprogs: Reformat test_export_keytab_mit.sh

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

diff --git a/testprogs/blackbox/test_export_keytab_mit.sh b/testprogs/blackbox/test_export_keytab_mit.sh
index 6441f82b5180e3604d153a9cdd46f4abf8a73541..36575f2ed37647cd50d3287823d3ee696d0c8332 100755 (executable)
--- a/testprogs/blackbox/test_export_keytab_mit.sh
+++ b/testprogs/blackbox/test_export_keytab_mit.sh
@@ -90,49 +90,102 @@ if [ $krb5_major_version -eq 1 ] && [ $krb5_minor_version -lt 18 ]; then
        EXPECTED_NKEYS=5
 fi
 
-testit "create local user $TEST_USER" $VALGRIND $PYTHON $samba_newuser $TEST_USER $TEST_PASSWORD "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
-
-testit "dump keytab from domain" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain" "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS
-
-testit "dump keytab from domain (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain (2nd time)" "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS
-
-testit "dump keytab from domain for cifs service principal" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain for cifs service principal" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" $EXPECTED_NKEYS
-testit "dump keytab from domain for cifs service principal (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
-test_keytab "read keytab from domain for cifs service principal (2nd time)" "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" $EXPECTED_NKEYS
-
-testit "dump keytab from domain for user principal" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-user-princ --principal=$TEST_USER "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
-test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-user-princ" "$TEST_USER@$REALM" $EXPECTED_NKEYS
-testit "dump keytab from domain for user principal (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-user-princ --principal=$TEST_USER@$REALM "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
-test_keytab "dump keytab from domain for user principal (2nd time)" "$PREFIX/tmpkeytab-user-princ" "$TEST_USER@$REALM" $EXPECTED_NKEYS
+testit "create local user $TEST_USER" \
+       $VALGRIND $PYTHON $samba_newuser $TEST_USER $TEST_PASSWORD \
+       "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
+
+testit "dump keytab from domain" \
+       $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all \
+       "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
+test_keytab "read keytab from domain" \
+       "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS
+
+testit "dump keytab from domain (2nd time)" \
+       $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all \
+       "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
+test_keytab "read keytab from domain (2nd time)" \
+       "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS
+
+testit "dump keytab from domain for cifs service principal" \
+       $VALGRIND $PYTHON $samba_tool domain exportkeytab \
+       $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN \
+       "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
+test_keytab "read keytab from domain for cifs service principal" \
+       "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" $EXPECTED_NKEYS
+testit "dump keytab from domain for cifs service principal (2nd time)" \
+       $VALGRIND $PYTHON $samba_tool domain exportkeytab \
+       $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN \
+       "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
+test_keytab "read keytab from domain for cifs service principal (2nd time)" \
+       "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" $EXPECTED_NKEYS
+
+testit "dump keytab from domain for user principal" \
+       $VALGRIND $PYTHON $samba_tool domain exportkeytab \
+       $PREFIX/tmpkeytab-user-princ --principal=$TEST_USER \
+       "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
+test_keytab "dump keytab from domain for user principal" \
+       "$PREFIX/tmpkeytab-user-princ" "$TEST_USER@$REALM" $EXPECTED_NKEYS
+testit "dump keytab from domain for user principal (2nd time)" \
+       $VALGRIND $PYTHON $samba_tool domain exportkeytab \
+       $PREFIX/tmpkeytab-user-princ --principal=$TEST_USER@$REALM \
+       "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
+test_keytab "dump keytab from domain for user principal (2nd time)" \
+       "$PREFIX/tmpkeytab-user-princ" "$TEST_USER@$REALM" $EXPECTED_NKEYS
 
 KRB5CCNAME="$PREFIX/tmpuserccache"
 export KRB5CCNAME
 
-testit "kinit with keytab as user" $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-all $TEST_USER@$REALM || failed=$(expr $failed + 1)
-test_smbclient "Test login with user kerberos ccache" 'ls' --use-krb5-ccache="${KRB5CCNAME}" || failed=$(expr $failed + 1)
+testit "kinit with keytab as user" \
+       $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-all \
+       $TEST_USER@$REALM || \
+       failed=$(expr $failed + 1)
+test_smbclient "Test login with user kerberos ccache" \
+       'ls' --use-krb5-ccache="${KRB5CCNAME}" || \
+       failed=$(expr $failed + 1)
 $samba_kdestroy
 
-testit "kinit with keytab as user (one princ)" $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-user-princ $TEST_USER@$REALM || failed=$(expr $failed + 1)
-test_smbclient "Test login with user kerberos ccache (one princ)" 'ls' --use-krb5-ccache="${KRB5CCNAME}" || failed=$(expr $failed + 1)
+testit "kinit with keytab as user (one princ)" \
+       $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-user-princ \
+       $TEST_USER@$REALM || \
+       failed=$(expr $failed + 1)
+test_smbclient "Test login with user kerberos ccache (one princ)" \
+       'ls' --use-krb5-ccache="${KRB5CCNAME}" || \
+       failed=$(expr $failed + 1)
 $samba_kdestroy
 
 KRB5CCNAME="$PREFIX/tmpadminccache"
 export KRB5CCNAME
 
-testit "kinit with keytab as $USERNAME" $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-all $USERNAME@$REALM || failed=$(expr $failed + 1)
+testit "kinit with keytab as $USERNAME" \
+       $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-all $USERNAME@$REALM || \
+       failed=$(expr $failed + 1)
 
 KRB5CCNAME="$PREFIX/tmpserverccache"
 export KRB5CCNAME
 echo "$samba_kinit -k -t $PREFIX/tmpkeytab-server cifs/$SERVER_FQDN"
-testit "kinit with SPN from keytab" $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-server cifs/$SERVER_FQDN || failed=$(expr $failed + 1)
+testit "kinit with SPN from keytab" \
+       $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-server \
+       cifs/$SERVER_FQDN || \
+       failed=$(expr $failed + 1)
 
 # cleanup
-testit "delete user $TEST_USER" $VALGRIND $PYTHON $samba_tool user delete "${TEST_USER}" --use-krb5-ccache="${KRB5CCNAME}" "${CONFIGURATION}" "$@" || failed=$(expr $failed + 1)
+testit "delete user $TEST_USER" \
+       $VALGRIND $PYTHON $samba_tool user delete "${TEST_USER}" \
+       --use-krb5-ccache="${KRB5CCNAME}" "${CONFIGURATION}" "$@" || \
+       failed=$(expr $failed + 1)
 
 $samba_kdestroy
-rm -f $PREFIX/tmpadminccache $PREFIX/tmpuserccache $PREFIX/tmpkeytab $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-server
+rm -f $PREFIX/tmpadminccache \
+       $PREFIX/tmpuserccache \
+       $PREFIX/tmpkeytab \
+       $PREFIX/tmpkeytab-2 \
+       $PREFIX/tmpkeytab-server
 
 exit $failed