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

s3:tests: Reformat test_winbind_ignore_domains.sh

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

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
---

diff --git a/source3/script/tests/test_winbind_ignore_domains.sh b/source3/script/tests/test_winbind_ignore_domains.sh
index adce8abb09c..1454eca6ffb 100755
--- a/source3/script/tests/test_winbind_ignore_domains.sh
+++ b/source3/script/tests/test_winbind_ignore_domains.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-incdir=`dirname $0`/../../../testprogs/blackbox
+incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 . $incdir/common_test_fns.inc
 
@@ -15,33 +15,34 @@ global_inject_conf=$(dirname $SMB_CONF_PATH)/global_inject.conf
 SERVER_FQDN=$(echo "$SERVER.$REALM" | awk '{print tolower($0)}')
 
 TRUST_BASE_DN=$($ldbsearch -H ldap://$TRUST_SERVER -b "" -s base defaultNamingContext | awk '/^defaultNamingContext/ {print $2}')
-if [ $? -ne 0 ] ; then
-    echo "Could not find trusted base DN" | subunit_fail_test "test_idmap_ad"
-    exit 1
+if [ $? -ne 0 ]; then
+	echo "Could not find trusted base DN" | subunit_fail_test "test_idmap_ad"
+	exit 1
 fi
 
 #
 # Add POSIX ids to trusted domain
 #
-add_posix_ids() {
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-       -U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
+add_posix_ids()
+{
+	cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
+		-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Administrator,CN=Users,$TRUST_BASE_DN
 changetype: modify
 add: uidNumber
 uidNumber: 2500000
 EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-       -U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
+	cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
+		-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Users,CN=Users,$TRUST_BASE_DN
 changetype: modify
 add: gidNumber
 gidNumber: 2500001
 EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-       -U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
+	cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
+		-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Admins,CN=Users,$TRUST_BASE_DN
 changetype: modify
 add: gidNumber
@@ -52,25 +53,26 @@ EOF
 #
 # Remove POSIX ids from trusted domain
 #
-remove_posix_ids() {
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-       -U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
+remove_posix_ids()
+{
+	cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
+		-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Administrator,CN=Users,$TRUST_BASE_DN
 changetype: modify
 delete: uidNumber
 uidNumber: 2500000
 EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-       -U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
+	cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
+		-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Users,CN=Users,$TRUST_BASE_DN
 changetype: modify
 delete: gidNumber
 gidNumber: 2500001
 EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-       -U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
+	cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
+		-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Admins,CN=Users,$TRUST_BASE_DN
 changetype: modify
 delete: gidNumber
@@ -80,23 +82,23 @@ EOF
 
 add_posix_ids
 
-echo "" > $global_inject_conf
+echo "" >$global_inject_conf
 $smbcontrol winbindd reload-config
 $wbinfo -p
 
-test_smbclient "test_winbind_ignore_domains_ok_ntlm_ip" "ls" "//$SERVER_IP/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=`expr $failed + 1`
-test_smbclient "test_winbind_ignore_domains_ok_ntlm_fqdn" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=`expr $failed + 1`
-test_smbclient "test_winbind_ignore_domains_ok_krb5" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_USERNAME@$TRUST_REALM%$TRUST_PASSWORD -k || failed=`expr $failed + 1`
+test_smbclient "test_winbind_ignore_domains_ok_ntlm_ip" "ls" "//$SERVER_IP/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=$(expr $failed + 1)
+test_smbclient "test_winbind_ignore_domains_ok_ntlm_fqdn" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=$(expr $failed + 1)
+test_smbclient "test_winbind_ignore_domains_ok_krb5" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_USERNAME@$TRUST_REALM%$TRUST_PASSWORD -k || failed=$(expr $failed + 1)
 
-echo "winbind:ignore domains = $TRUST_DOMAIN" > $global_inject_conf
+echo "winbind:ignore domains = $TRUST_DOMAIN" >$global_inject_conf
 $smbcontrol winbindd reload-config
 $wbinfo -p
 
-test_smbclient_expect_failure "test_winbind_ignore_domains_fail_ntlm_ip" "ls" "//$SERVER_IP/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=`expr $failed + 1`
-test_smbclient_expect_failure "test_winbind_ignore_domains_fail_ntlm_fqdn" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=`expr $failed + 1`
-test_smbclient_expect_failure "test_winbind_ignore_domains_fail_krb5" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_USERNAME@$TRUST_REALM%$TRUST_PASSWORD -k || failed=`expr $failed + 1`
+test_smbclient_expect_failure "test_winbind_ignore_domains_fail_ntlm_ip" "ls" "//$SERVER_IP/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=$(expr $failed + 1)
+test_smbclient_expect_failure "test_winbind_ignore_domains_fail_ntlm_fqdn" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_DOMAIN/$TRUST_USERNAME%$TRUST_PASSWORD || failed=$(expr $failed + 1)
+test_smbclient_expect_failure "test_winbind_ignore_domains_fail_krb5" "ls" "//$SERVER_FQDN/tmp" -U $TRUST_USERNAME@$TRUST_REALM%$TRUST_PASSWORD -k || failed=$(expr $failed + 1)
 
-echo "" > $global_inject_conf
+echo "" >$global_inject_conf
 $smbcontrol winbindd reload-config
 $wbinfo -p
 remove_posix_ids