From: Andreas Schneider <asn@samba.org>
Date: Fri, 22 Apr 2022 13:34:09 +0000 (+0200)
Subject: s3:tests: Reformat test_groupmap.sh
X-Git-Tag: talloc-2.3.4~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db882106399103e0653e2d01cfc09e9ca531b891;p=thirdparty%2Fsamba.git

s3:tests: Reformat test_groupmap.sh

shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
---

diff --git a/source3/script/tests/test_groupmap.sh b/source3/script/tests/test_groupmap.sh
index 46640a91312..a1e9a0832df 100755
--- a/source3/script/tests/test_groupmap.sh
+++ b/source3/script/tests/test_groupmap.sh
@@ -3,19 +3,22 @@
 # note that this needs root access to add unix groups,
 # so this cannot be run on the build farm
 
-testone() {
-    echo $*
-    $VALGRIND bin/net groupmap $*
+testone()
+{
+	echo $*
+	$VALGRIND bin/net groupmap $*
 }
 
-tstart() {
-    TBASE=`date '+%s'`
+tstart()
+{
+	TBASE=$(date '+%s')
 }
 
-treport() {
-    TNOW=`date '+%s'`
-    echo "Took `expr $TNOW - $TBASE` seconds"
-    TBASE=$TNOW
+treport()
+{
+	TNOW=$(date '+%s')
+	echo "Took $(expr $TNOW - $TBASE) seconds"
+	TBASE=$TNOW
 }
 
 rm -f $PREFIX_ABS/var/locks/group_mapping.?db
@@ -23,7 +26,7 @@ rm -f $PREFIX_ABS/var/locks/group_mapping.?db
 NLOCAL=12
 NGROUP=11
 NBUILTIN=10
-DOMSID=`bin/net getlocalsid | awk '{print $6}'`
+DOMSID=$(bin/net getlocalsid | awk '{print $6}')
 FORSID="S-1-2-3-4-5"
 
 echo "DOMSID $DOMSID"
@@ -31,34 +34,34 @@ echo "FORSID $FORSID"
 
 tstart
 echo "Creating unix groups"
-for i in `seq 1 1 $NLOCAL`; do
-  unixgroup=testlocal$i;
-  gid=`expr 30000 + $i`;
-  groupdel $unixgroup 2> /dev/null
-  groupadd -g $gid $unixgroup || exit 1
-done
-for i in `seq 1 1 $NGROUP`; do
-  unixgroup=testgrp$i;
-  gid=`expr 40000 + $i`;
-  groupdel $unixgroup 2> /dev/null
-  groupadd -g $gid $unixgroup || exit 1
-done
-for i in `seq 1 1 $NBUILTIN`; do
-  unixgroup=testb$i;
-  gid=`expr 50000 + $i`;
-  groupdel $unixgroup 2> /dev/null
-  groupadd -g $gid $unixgroup || exit 1
+for i in $(seq 1 1 $NLOCAL); do
+	unixgroup=testlocal$i
+	gid=$(expr 30000 + $i)
+	groupdel $unixgroup 2>/dev/null
+	groupadd -g $gid $unixgroup || exit 1
+done
+for i in $(seq 1 1 $NGROUP); do
+	unixgroup=testgrp$i
+	gid=$(expr 40000 + $i)
+	groupdel $unixgroup 2>/dev/null
+	groupadd -g $gid $unixgroup || exit 1
+done
+for i in $(seq 1 1 $NBUILTIN); do
+	unixgroup=testb$i
+	gid=$(expr 50000 + $i)
+	groupdel $unixgroup 2>/dev/null
+	groupadd -g $gid $unixgroup || exit 1
 done
 date
 
 treport
 
 echo "Creating local groups"
-for i in `seq 1 1 $NLOCAL`; do
-  unixgroup=testlocal$i;
-  ntgroup=ntlgrp$i;
-  rid=`expr 10000 + $i`;
-  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=local || exit 1
+for i in $(seq 1 1 $NLOCAL); do
+	unixgroup=testlocal$i
+	ntgroup=ntlgrp$i
+	rid=$(expr 10000 + $i)
+	testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=local || exit 1
 done
 
 echo "trying a duplicate add"
@@ -67,50 +70,50 @@ testone add rid=10001 unixgroup=testlocal1 ntgroup=foo type=local && exit 1
 treport
 
 echo "Creating domain groups"
-for i in `seq 1 1 $NGROUP`; do
-  unixgroup=testgrp$i;
-  ntgroup=ntgrp$i;
-  rid=`expr 20000 + $i`;
-  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=domain || exit 1
+for i in $(seq 1 1 $NGROUP); do
+	unixgroup=testgrp$i
+	ntgroup=ntgrp$i
+	rid=$(expr 20000 + $i)
+	testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=domain || exit 1
 done
 
 treport
 
 echo "Creating builtin groups"
-for i in `seq 1 1 $NBUILTIN`; do
-  unixgroup=testb$i;
-  ntgroup=ntbgrp$i;
-  rid=`expr 30000 + $i`;
-  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=builtin || exit 1
+for i in $(seq 1 1 $NBUILTIN); do
+	unixgroup=testb$i
+	ntgroup=ntbgrp$i
+	rid=$(expr 30000 + $i)
+	testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=builtin || exit 1
 done
 
 treport
 
 echo "Adding domain groups to local groups"
-for i in `seq 1 1 $NLOCAL`; do
- for j in `seq 1 1 $i`; do
+for i in $(seq 1 1 $NLOCAL); do
+	for j in $(seq 1 1 $i); do
 
-  lrid=`expr 10000 + $i`;
-  drid=`expr 20000 + $j`;
+		lrid=$(expr 10000 + $i)
+		drid=$(expr 20000 + $j)
 
-  testone addmem $DOMSID-$lrid $DOMSID-$drid || exit 1
-  ( testone listmem $DOMSID-$lrid | sort -r ) || exit 1
- done
+		testone addmem $DOMSID-$lrid $DOMSID-$drid || exit 1
+		(testone listmem $DOMSID-$lrid | sort -r) || exit 1
+	done
 done
 
 echo "trying a duplicate addmem"
 testone addmem $DOMSID-10001 $DOMSID-20001 && exit 1
 
 echo "Adding foreign SIDs to local groups"
-for i in `seq 1 1 $NLOCAL`; do
- for j in `seq 1 1 $i`; do
+for i in $(seq 1 1 $NLOCAL); do
+	for j in $(seq 1 1 $i); do
 
-  lrid=`expr 10000 + $i`;
-  frid=`expr 70000 + $j`;
+		lrid=$(expr 10000 + $i)
+		frid=$(expr 70000 + $j)
 
-  testone addmem $DOMSID-$lrid $FORSID-$frid || exit 1
-  ( testone listmem $DOMSID-$lrid | sort -r ) || exit 1
- done
+		testone addmem $DOMSID-$lrid $FORSID-$frid || exit 1
+		(testone listmem $DOMSID-$lrid | sort -r) || exit 1
+	done
 done
 
 echo "trying a duplicate foreign addmem"
@@ -119,9 +122,9 @@ testone addmem $DOMSID-10001 $FORSID-70001 && exit 1
 treport
 
 echo "Listing local group memberships of domain groups"
-for i in `seq 1 1 $NGROUP`; do
-  rid=`expr 20000 + $i`;
-  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+for i in $(seq 1 1 $NGROUP); do
+	rid=$(expr 20000 + $i)
+	(testone memberships $DOMSID-$rid | sort -r) || exit 1
 done
 
 echo "Trying memberships on bogus sid"
@@ -132,9 +135,9 @@ treport
 testone list | sort
 
 echo "Deleting some domain groups"
-for i in `seq 2 2 $NGROUP`; do
-  drid=`expr 20000 + $i`;
- testone delete sid=$DOMSID-$drid || exit 1
+for i in $(seq 2 2 $NGROUP); do
+	drid=$(expr 20000 + $i)
+	testone delete sid=$DOMSID-$drid || exit 1
 done
 
 echo "Trying duplicate domain group delete"
@@ -143,9 +146,9 @@ testone delete sid=$DOMSID-20002 && exit 1
 treport
 
 echo "Deleting some local groups"
-for i in `seq 2 4 $NLOCAL`; do
- lrid=`expr 10000 + $i`;
- testone delete sid=$DOMSID-$lrid || exit 1
+for i in $(seq 2 4 $NLOCAL); do
+	lrid=$(expr 10000 + $i)
+	testone delete sid=$DOMSID-$lrid || exit 1
 done
 
 echo "Trying duplicate local group delete"
@@ -154,9 +157,9 @@ testone delete sid=$DOMSID-10002 && exit 1
 treport
 
 echo "Modifying some domain groups"
-for i in `seq 3 2 $NGROUP`; do
-  drid=`expr 20000 + $i`;
-  testone modify sid=$DOMSID-$drid comment="newcomment-$i" type=domain || exit 1
+for i in $(seq 3 2 $NGROUP); do
+	drid=$(expr 20000 + $i)
+	testone modify sid=$DOMSID-$drid comment="newcomment-$i" type=domain || exit 1
 done
 
 treport
@@ -164,22 +167,22 @@ treport
 testone list | sort
 
 echo "Listing local group memberships"
-for i in `seq 1 1 $NLOCAL`; do
-  rid=`expr 20000 + $i`;
-  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+for i in $(seq 1 1 $NLOCAL); do
+	rid=$(expr 20000 + $i)
+	(testone memberships $DOMSID-$rid | sort -r) || exit 1
 done
 
 treport
 
 echo "Removing some domain groups from local groups"
-for i in `seq 1 2 $NLOCAL`; do
- for j in `seq 1 3 $i`; do
+for i in $(seq 1 2 $NLOCAL); do
+	for j in $(seq 1 3 $i); do
 
-  lrid=`expr 10000 + $i`;
-  drid=`expr 20000 + $j`;
+		lrid=$(expr 10000 + $i)
+		drid=$(expr 20000 + $j)
 
-  testone delmem $DOMSID-$lrid $DOMSID-$drid || exit 1
- done
+		testone delmem $DOMSID-$lrid $DOMSID-$drid || exit 1
+	done
 done
 
 echo "Trying duplicate delmem"
@@ -188,25 +191,25 @@ testone delmem $DOMSID-10001 $DOMSID-20001 && exit 1
 treport
 
 echo "Listing local group memberships"
-for i in `seq 1 1 $NLOCAL`; do
-  rid=`expr 20000 + $i`;
-  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+for i in $(seq 1 1 $NLOCAL); do
+	rid=$(expr 20000 + $i)
+	(testone memberships $DOMSID-$rid | sort -r) || exit 1
 done
 
 treport
 
 echo "Deleting unix groups"
-for i in `seq 1 1 $NLOCAL`; do
-  unixgroup=testlocal$i;
-  groupdel $unixgroup 2> /dev/null
+for i in $(seq 1 1 $NLOCAL); do
+	unixgroup=testlocal$i
+	groupdel $unixgroup 2>/dev/null
 done
-for i in `seq 1 1 $NGROUP`; do
-  unixgroup=testgrp$i;
-  groupdel $unixgroup 2> /dev/null
+for i in $(seq 1 1 $NGROUP); do
+	unixgroup=testgrp$i
+	groupdel $unixgroup 2>/dev/null
 done
-for i in `seq 1 1 $NBUILTIN`; do
-  unixgroup=testb$i;
-  groupdel $unixgroup 2> /dev/null
+for i in $(seq 1 1 $NBUILTIN); do
+	unixgroup=testb$i
+	groupdel $unixgroup 2>/dev/null
 done
 
 treport