testprogs: Reformat test_chgdcpass.sh

Signed-off-by: Andreas Schneider <asn@samba.org>

diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh
index d7d1d030c19a0cb6597f305870c4c66f23c89d31..8b0ef45673f20f5f9548e444cc30575539d585dc 100755 (executable)
--- a/testprogs/blackbox/test_chgdcpass.sh
+++ b/testprogs/blackbox/test_chgdcpass.sh
@@ -4,10 +4,10 @@
 # Copyright (C) 2006-2008 Andrew Bartlett <abartlet@samba.org>
 
 if [ $# -lt 4 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: test_kinit.sh SERVER USERNAME REALM DOMAIN PREFIX SMBCLIENT
 EOF
-exit 1;
+       exit 1
 fi
 
 SERVER=$1
@@ -31,15 +31,15 @@ if test -x $BINDIR/samba4kinit; then
        samba4kinit_binary=bin/samba4kinit
 fi
 
-
 machineaccountccache="$samba4srcdir/scripting/bin/machineaccountccache"
 
 unc="//$SERVER/tmp"
 
-. `dirname $0`/subunit.sh
-. `dirname $0`/common_test_fns.inc
+. $(dirname $0)/subunit.sh
+. $(dirname $0)/common_test_fns.inc
 
-test_drs() {
+test_drs()
+{
        function="$1"
        name="$2"
        shift
@@ -64,50 +64,50 @@ export KRB5CCNAME
 rm -f $KRB5CCNAME
 
 if [ $heimdal -eq 1 ]; then
-       testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME   || failed=`expr $failed + 1`
+       testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME || failed=$(expr $failed + 1)
 else
-       testit "kinit with keytab" $samba4kinit -k -t $PROVDIR/private/secrets.keytab $USERNAME || failed=`expr $failed + 1`
+       testit "kinit with keytab" $samba4kinit -k -t $PROVDIR/private/secrets.keytab $USERNAME || failed=$(expr $failed + 1)
 fi
 
 #This is important because it puts the ticket for the old KVNO and password into a local ccache
-test_smbclient "Test login with kerberos ccache before password change" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=`expr $failed + 1`
+test_smbclient "Test login with kerberos ccache before password change" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1)
 
 #check that drs bind works before we change the password (prime the ccache)
-test_drs bind "Test drs bind with with kerberos ccache" || failed=`expr $failed + 1`
+test_drs bind "Test drs bind with with kerberos ccache" || failed=$(expr $failed + 1)
 
 #check that drs options works before we change the password (prime the ccache)
-test_drs options "Test drs options with with kerberos ccache" || failed=`expr $failed + 1`
+test_drs options "Test drs options with with kerberos ccache" || failed=$(expr $failed + 1)
 
-testit "change dc password" $PYTHON $samba4srcdir/scripting/devel/chgtdcpass --configfile=$PROVDIR/etc/smb.conf || failed=`expr $failed + 1`
+testit "change dc password" $PYTHON $samba4srcdir/scripting/devel/chgtdcpass --configfile=$PROVDIR/etc/smb.conf || failed=$(expr $failed + 1)
 
 #This is important because it shows that the old ticket remains valid (as it must) for incoming connections after the DC password is changed
-test_smbclient "Test login with kerberos ccache after password change" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=`expr $failed + 1`
+test_smbclient "Test login with kerberos ccache after password change" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1)
 
 #check that drs bind works after we change the password
-test_drs bind "Test drs bind with new password" || failed=`expr $failed + 1`
+test_drs bind "Test drs bind with new password" || failed=$(expr $failed + 1)
 
 #check that drs options works after we change the password
-test_drs options "Test drs options with new password" || failed=`expr $failed + 1`
+test_drs options "Test drs options with new password" || failed=$(expr $failed + 1)
 
-testit "change dc password (2nd time)" $PYTHON $samba4srcdir/scripting/devel/chgtdcpass --configfile=$PROVDIR/etc/smb.conf || failed=`expr $failed + 1`
+testit "change dc password (2nd time)" $PYTHON $samba4srcdir/scripting/devel/chgtdcpass --configfile=$PROVDIR/etc/smb.conf || failed=$(expr $failed + 1)
 
 # This is important because it shows that the old ticket is discarded if the server rejects it (as it must) after the password was changed twice in succession.
 # This also ensures we handle the case where the domain is re-provisioned etc
-test_smbclient "Test login with kerberos ccache after 2nd password change" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=`expr $failed + 1`
+test_smbclient "Test login with kerberos ccache after 2nd password change" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1)
 
 #check that drs bind works after we change the password a 2nd time
-test_drs bind "Test drs bind after 2nd password change" || failed=`expr $failed + 1`
+test_drs bind "Test drs bind after 2nd password change" || failed=$(expr $failed + 1)
 
 #check that drs options works after we change the password a 2nd time
-test_drs options "Test drs options after 2nd password change" || failed=`expr $failed + 1`
+test_drs options "Test drs options after 2nd password change" || failed=$(expr $failed + 1)
 
 #This confirms that the DC password is valid for a kinit too
 if [ $heimdal -eq 1 ]; then
-       testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME   || failed=`expr $failed + 1`
+       testit "kinit with keytab" $samba4kinit $enctype -t $PROVDIR/private/secrets.keytab --use-keytab $USERNAME || failed=$(expr $failed + 1)
 else
-       testit "kinit with keytab" $samba4kinit -k -t $PROVDIR/private/secrets.keytab $USERNAME || failed=`expr $failed + 1`
+       testit "kinit with keytab" $samba4kinit -k -t $PROVDIR/private/secrets.keytab $USERNAME || failed=$(expr $failed + 1)
 fi
-test_smbclient "Test login with kerberos ccache with fresh kinit" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=`expr $failed + 1`
+test_smbclient "Test login with kerberos ccache with fresh kinit" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1)
 
 rm -f $KRB5CCNAME