]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
testprogs: Reformat test_trust_user_account.sh
authorAndreas Schneider <asn@samba.org>
Fri, 22 Apr 2022 13:46:05 +0000 (15:46 +0200)
committerPavel Filipensky <pfilipensky@samba.org>
Wed, 10 Aug 2022 13:17:31 +0000 (13:17 +0000)
shfmt -w -p -i 0 -fn testprogs/blackbox/test_trust_user_account.sh

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
testprogs/blackbox/test_trust_user_account.sh

index 63024a9b158eed1eafd1a919aed302db772f516c..94a3aa3e9ba55fa35738623b028eda007941633b 100755 (executable)
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: test_trust_user_account.sh PREFIX OUR_REALM OUR_FLAT REMOTE_REALM REMOTE_FLAT
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
@@ -14,8 +14,7 @@ REMOTE_REALM="$4"
 REMOTE_FLAT="$5"
 shift 5
 
-. `dirname $0`/subunit.sh
-
+. $(dirname $0)/subunit.sh
 
 samba_tool="$BINDIR/samba-tool"
 samba4bindir="$BINDIR"
@@ -30,7 +29,7 @@ KEYTAB="$PREFIX/tmptda.keytab"
 KRB5_TRACE=/dev/stderr
 export KRB5_TRACE
 
-testit "retrieve keytab for TDA of $REMOTE_REALM" $PYTHON $samba_tool domain exportkeytab $KEYTAB $CONFIGURATION --principal "$REMOTE_FLAT\$@$OUR_REALM" || failed=`expr $failed + 1`
+testit "retrieve keytab for TDA of $REMOTE_REALM" $PYTHON $samba_tool domain exportkeytab $KEYTAB $CONFIGURATION --principal "$REMOTE_FLAT\$@$OUR_REALM" || failed=$(expr $failed + 1)
 
 KRB5CCNAME="$PREFIX/tmptda.ccache"
 samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
@@ -50,9 +49,9 @@ EXPECTED_SALT="${OUR_REALM}krbtgt${REMOTE_FLAT}"
 # "^virtualKerberosSalt: ${EXPECTED_SALT}\\\$\$"
 #
 EXPECTED_GREP="^virtualKerberosSalt: ${EXPECTED_SALT}\$"
-testit_grep "get virtualKerberosSalt for TDA of $REMOTE_FLAT\$" "$EXPECTED_GREP" $PYTHON $samba_tool user getpassword "$REMOTE_FLAT\$" $CONFIGURATION --attributes=virtualKerberosSalt || failed=`expr $failed + 1`
+testit_grep "get virtualKerberosSalt for TDA of $REMOTE_FLAT\$" "$EXPECTED_GREP" $PYTHON $samba_tool user getpassword "$REMOTE_FLAT\$" $CONFIGURATION --attributes=virtualKerberosSalt || failed=$(expr $failed + 1)
 
-testit "kinit with keytab for TDA of $REMOTE_REALM" $samba4kinit -t $KEYTAB "$REMOTE_FLAT\$@$OUR_REALM" || failed=`expr $failed + 1`
+testit "kinit with keytab for TDA of $REMOTE_REALM" $samba4kinit -t $KEYTAB "$REMOTE_FLAT\$@$OUR_REALM" || failed=$(expr $failed + 1)
 
 rm -f $KRB5CCNAME $KEYTAB