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

s3:tests: Reformat test_inherit_owner.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_inherit_owner.sh b/source3/script/tests/test_inherit_owner.sh
index 9783235883c..aa616711e4f 100755
--- a/source3/script/tests/test_inherit_owner.sh
+++ b/source3/script/tests/test_inherit_owner.sh
@@ -5,10 +5,10 @@
 # extensions to fetch the UNIX owner of a file.
 
 if [ $# -lt 10 ]; then
-cat <<EOF
+	cat <<EOF
 Usage: $0 SERVER USERNAME PASSWORD PREFIX SMBCLIENT SMBCACLS NET SHARE INH_WIN INH_UNIX <additional args>
 EOF
-exit 1;
+	exit 1
 fi
 
 SERVER="$1"
@@ -27,114 +27,122 @@ SMBCLIENT="$VALGRIND ${SMBCLIENT} ${ADDARGS}"
 SMBCACLS="$VALGRIND ${SMBCACLS} ${ADDARGS}"
 NET="$VALGRIND ${NET}"
 
-incdir=`dirname $0`/../../../testprogs/blackbox
+incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
-create_file() {
-    local share=$1
-    local fname=$2
-    local rem_dirname=$(dirname $fname)
-    local bname=$(basename $fname)
-    touch $PREFIX/$bname
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rm $bname" 2>/dev/null
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; allinfo $bname" 2>/dev/null | grep "NT_STATUS_OBJECT_NAME_NOT_FOUND" || exit 1
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "lcd $PREFIX; cd $rem_dirname; put $bname" 2>/dev/null || exit 1
+create_file()
+{
+	local share=$1
+	local fname=$2
+	local rem_dirname=$(dirname $fname)
+	local bname=$(basename $fname)
+	touch $PREFIX/$bname
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rm $bname" 2>/dev/null
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; allinfo $bname" 2>/dev/null | grep "NT_STATUS_OBJECT_NAME_NOT_FOUND" || exit 1
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "lcd $PREFIX; cd $rem_dirname; put $bname" 2>/dev/null || exit 1
 }
 
-create_dir() {
-    local share=$1
-    local dname=$2
-    local rem_dirname=$(dirname $dname)
-    local bname=$(basename $dname)
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rmdir $bname" 2>/dev/null
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; allinfo $bname" 2>/dev/null | grep "NT_STATUS_OBJECT_NAME_NOT_FOUND" || exit 1
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; mkdir $bname" 2>/dev/null || exit 1
+create_dir()
+{
+	local share=$1
+	local dname=$2
+	local rem_dirname=$(dirname $dname)
+	local bname=$(basename $dname)
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rmdir $bname" 2>/dev/null
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; allinfo $bname" 2>/dev/null | grep "NT_STATUS_OBJECT_NAME_NOT_FOUND" || exit 1
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; mkdir $bname" 2>/dev/null || exit 1
 }
 
-cleanup_file() {
-    local share=$1
-    local fname=$2
-    local rem_dirname=$(dirname $fname)
-    local bname=$(basename $fname)
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rm $bname" 2>/dev/null || exit 1
+cleanup_file()
+{
+	local share=$1
+	local fname=$2
+	local rem_dirname=$(dirname $fname)
+	local bname=$(basename $fname)
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rm $bname" 2>/dev/null || exit 1
 }
 
-cleanup_dir() {
-    local share=$1
-    local dname=$2
-    local rem_dirname=$(dirname $dname)
-    local bname=$(basename $dname)
-    $SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rmdir $bname" 2>/dev/null || exit 1
+cleanup_dir()
+{
+	local share=$1
+	local dname=$2
+	local rem_dirname=$(dirname $dname)
+	local bname=$(basename $dname)
+	$SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "cd $rem_dirname; rmdir $bname" 2>/dev/null || exit 1
 }
 
-set_win_owner() {
-    local share=$1
-    local fname=$2
-    local owner=$3
-    $SMBCACLS //$SERVER/$share $fname -U $USERNAME%$PASSWORD -C $owner 2>/dev/null || exit 1
+set_win_owner()
+{
+	local share=$1
+	local fname=$2
+	local owner=$3
+	$SMBCACLS //$SERVER/$share $fname -U $USERNAME%$PASSWORD -C $owner 2>/dev/null || exit 1
 }
 
-unix_owner_id_is() {
-    local share=$1
-    local fname=$2
-    local expected_id=$3
-    local actual_id
-    actual_id=$($SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "posix; getfacl $fname" 2>/dev/null | sed -rn 's/^# owner: (.*)/\1/p')
-    if ! test "x$actual_id" = "x$expected_id" ; then
-        echo "Actual uid of $share/$fname is [$actual_id] expected [$expected_id]"
-        exit 1
-    fi
+unix_owner_id_is()
+{
+	local share=$1
+	local fname=$2
+	local expected_id=$3
+	local actual_id
+	actual_id=$($SMBCLIENT //$SERVER/$share -U $USERNAME%$PASSWORD -c "posix; getfacl $fname" 2>/dev/null | sed -rn 's/^# owner: (.*)/\1/p')
+	if ! test "x$actual_id" = "x$expected_id"; then
+		echo "Actual uid of $share/$fname is [$actual_id] expected [$expected_id]"
+		exit 1
+	fi
 }
 
-get_unix_id() {
-    local user=$1
-    local ent
-    ent=$(getent passwd $user) || exit 1
-    echo "$ent" | awk -F: '{print $3}'
+get_unix_id()
+{
+	local user=$1
+	local ent
+	ent=$(getent passwd $user) || exit 1
+	echo "$ent" | awk -F: '{print $3}'
 }
 
-win_owner_is() {
-    local share=$1
-    local fname=$2
-    local expected_owner=$3
-    local actual_owner
-    actual_owner=$($SMBCACLS //$SERVER/$share $fname -U $USERNAME%$PASSWORD 2>/dev/null | sed -rn 's/^OWNER:(.*)/\1/p')
-    if ! test "x$actual_owner" = "x$expected_owner" ; then
-        echo "Actual owner of $share/$fname is [$actual_owner] expected [$expected_owner]"
-        exit 1
-    fi
+win_owner_is()
+{
+	local share=$1
+	local fname=$2
+	local expected_owner=$3
+	local actual_owner
+	actual_owner=$($SMBCACLS //$SERVER/$share $fname -U $USERNAME%$PASSWORD 2>/dev/null | sed -rn 's/^OWNER:(.*)/\1/p')
+	if ! test "x$actual_owner" = "x$expected_owner"; then
+		echo "Actual owner of $share/$fname is [$actual_owner] expected [$expected_owner]"
+		exit 1
+	fi
 }
 
 default_uid=$(get_unix_id $USERNAME)
 alt_uid=$(get_unix_id force_user)
 
-if [ "$INH_WIN" = "0" ] && [ "$INH_UNIX" = "0" ] ; then
-    #default - file owned by creator, change-owner modifies both
-    WIN_OWNER_AFTER_CREATE="$SERVER/$USERNAME"
-    UNIX_OWNER_AFTER_CREATE=$(get_unix_id $USERNAME)
-    WIN_OWNER_AFTER_CHOWN="$SERVER/smbget_user"
-    UNIX_OWNER_AFTER_CHOWN=$(get_unix_id smbget_user)
-    TEST_LABEL="default"
-elif [ "$INH_WIN" = "1" ] && [ "$INH_UNIX" = "1" ] ; then
-    #inherit owner=windows and unix - file owned by parent
-    #owner, change-owner modifies both
-    WIN_OWNER_AFTER_CREATE="$SERVER/force_user"
-    UNIX_OWNER_AFTER_CREATE=$(get_unix_id force_user)
-    WIN_OWNER_AFTER_CHOWN="$SERVER/smbget_user"
-    UNIX_OWNER_AFTER_CHOWN=$(get_unix_id smbget_user)
-    TEST_LABEL="both"
-elif [ "$INH_WIN" = "0" ] && [ "$INH_UNIX" = "1" ] ; then
-    #inherit owner=unix only - windows owner is creator,
-    #unix owner inherited, upon change-owner only windows
-    #owner is changed
-    WIN_OWNER_AFTER_CREATE="$SERVER/$USERNAME"
-    UNIX_OWNER_AFTER_CREATE=$(get_unix_id force_user)
-    WIN_OWNER_AFTER_CHOWN="$SERVER/smbget_user"
-    UNIX_OWNER_AFTER_CHOWN=$(get_unix_id force_user)
-    TEST_LABEL="unix"
+if [ "$INH_WIN" = "0" ] && [ "$INH_UNIX" = "0" ]; then
+	#default - file owned by creator, change-owner modifies both
+	WIN_OWNER_AFTER_CREATE="$SERVER/$USERNAME"
+	UNIX_OWNER_AFTER_CREATE=$(get_unix_id $USERNAME)
+	WIN_OWNER_AFTER_CHOWN="$SERVER/smbget_user"
+	UNIX_OWNER_AFTER_CHOWN=$(get_unix_id smbget_user)
+	TEST_LABEL="default"
+elif [ "$INH_WIN" = "1" ] && [ "$INH_UNIX" = "1" ]; then
+	#inherit owner=windows and unix - file owned by parent
+	#owner, change-owner modifies both
+	WIN_OWNER_AFTER_CREATE="$SERVER/force_user"
+	UNIX_OWNER_AFTER_CREATE=$(get_unix_id force_user)
+	WIN_OWNER_AFTER_CHOWN="$SERVER/smbget_user"
+	UNIX_OWNER_AFTER_CHOWN=$(get_unix_id smbget_user)
+	TEST_LABEL="both"
+elif [ "$INH_WIN" = "0" ] && [ "$INH_UNIX" = "1" ]; then
+	#inherit owner=unix only - windows owner is creator,
+	#unix owner inherited, upon change-owner only windows
+	#owner is changed
+	WIN_OWNER_AFTER_CREATE="$SERVER/$USERNAME"
+	UNIX_OWNER_AFTER_CREATE=$(get_unix_id force_user)
+	WIN_OWNER_AFTER_CHOWN="$SERVER/smbget_user"
+	UNIX_OWNER_AFTER_CHOWN=$(get_unix_id force_user)
+	TEST_LABEL="unix"
 else
-    echo "Unknown combination INH_WIN=$INH_WIN INH_UNIX=$INH_UNIX"
-    exit 1
+	echo "Unknown combination INH_WIN=$INH_WIN INH_UNIX=$INH_UNIX"
+	exit 1
 fi
 
 # SETUP