s4:setup: Reformat shell scripts
authorAndreas Schneider <asn@samba.org>
Wed, 23 Feb 2022 11:03:50 +0000 (12:03 +0100)
committerPavel Filipensky <pfilipensky@samba.org>
Fri, 15 Jul 2022 12:08:36 +0000 (12:08 +0000)
shfmt -f source4/setup/ | xargs shfmt -w -p -i 0 -fn

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
source4/setup/tests/blackbox_group.sh
source4/setup/tests/blackbox_newuser.sh
source4/setup/tests/blackbox_provision.sh
source4/setup/tests/blackbox_s3upgrade.sh
source4/setup/tests/blackbox_setpassword.sh
source4/setup/tests/blackbox_spn.sh
source4/setup/tests/blackbox_start_backup.sh
source4/setup/tests/blackbox_supported_features.sh
source4/setup/tests/blackbox_upgradeprovision.sh
source4/setup/tests/provision_fileperms.sh

index 5fa622ecb25896a92d64f438db88e5db35833300..7a5b3147f113ae51a0bb1b5acdf96509c1aff9c8 100755 (executable)
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_group.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
 shift 1
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 rm -rf $PREFIX/simple-dc
 mkdir -p $PREFIX
@@ -25,7 +24,8 @@ testit "user add" $PYTHON $samba_tool user create $CONFIG --given-name="User" --
 testit "user add" $PYTHON $samba_tool user create $CONFIG --given-name="User1" --surname="Tester" --initial="UT" testuser1 testp@ssw0Rd
 
 # test samba-tool user getgroups command
-user_getgroups_primary_only() {
+user_getgroups_primary_only()
+{
        res=$($PYTHON $samba_tool user getgroups $CONFIG testuser)
 
        primary_group=$(echo $res)
@@ -50,11 +50,12 @@ testit "group addmembers" $PYTHON $samba_tool group addmembers $CONFIG gdg testu
 testit "group addmembers" $PYTHON $samba_tool group addmembers $CONFIG udg testuser,testuser1
 
 # test samba-tool user getgroups command
-user_getgroups() {
+user_getgroups()
+{
        groups="dsg gsg usg ddg gdg udg"
 
        res=$($PYTHON $samba_tool user getgroups $CONFIG testuser)
-       for g in $groups ; do
+       for g in $groups; do
                echo "$res" | grep -q "^${g}$" || return 1
        done
 
@@ -65,11 +66,12 @@ user_getgroups() {
 testit "user getgroups" user_getgroups
 
 # test samba-tool user getgroups --full-dn command
-user_getgroups_full_dn() {
+user_getgroups_full_dn()
+{
        groups="dsg gsg usg ddg gdg udg"
 
        res=$($PYTHON $samba_tool user getgroups --full-dn $CONFIG testuser)
-       for g in $groups ; do
+       for g in $groups; do
                group_dn=$($PYTHON $samba_tool group show $CONFIG $g --attributes=dn)
                echo "$res" | grep -q "^${group_dn}$" || return 1
        done
@@ -82,7 +84,8 @@ user_getgroups_full_dn() {
 testit "user getgroups full-dn" user_getgroups
 
 # test settings a users primary group
-user_getgroups_primary_first() {
+user_getgroups_primary_first()
+{
        expected_primary_group=$1
        res=$($PYTHON $samba_tool user getgroups $CONFIG testuser)
 
index 52edb17a62489b85f7ae3660c2ee4d97600a3de4..84fa603723c7f5861b8c768203311fcc953ab713 100755 (executable)
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_newuser.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
 shift 1
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 rm -rf $PREFIX/simple-dc
 testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs
index 7fa206ebe82b5bf2cdc49eef3184dd738f3bc5c5..e77c91587f950a8287bcd7ae8a1f9360241e90a5 100755 (executable)
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_provision.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
 shift 1
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 #Prepare an empty smb.conf to ensure it is overwritten
 rm -rf $PREFIX/simple-default
@@ -20,7 +20,7 @@ testit "simple-default" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO
 #And try with just whitespace
 rm -rf $PREFIX/simple-dc
 mkdir -p $PREFIX/simple-dc/etc
-echo "  " > $PREFIX/simple-dc/etc/smb.conf
+echo "  " >$PREFIX/simple-dc/etc/smb.conf
 testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs
 #The rest of these tests are with no smb.conf file present
 
@@ -35,7 +35,8 @@ testit "simple-standalone" $PYTHON $BINDIR/samba-tool domain provision --server-
 rm -rf $PREFIX/blank-dc
 testit "blank-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank --use-ntvfs
 
-reprovision() {
+reprovision()
+{
        $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/simple-default" --use-ntvfs
 }
 
@@ -44,29 +45,30 @@ testit "reprovision" reprovision
 V_2012_R2=69
 V_2008_R2=47
 
-check_baseschema() {
+check_baseschema()
+{
        ldbsearch="ldbsearch"
        if [ -x "$BINDIR/ldbsearch" ]; then
-           ldbsearch="$BINDIR/ldbsearch"
+               ldbsearch="$BINDIR/ldbsearch"
        fi
 
        base=$($ldbsearch -H $PREFIX/$1/private/sam.ldb --scope=base dn)
-       dom=$(echo "$base" | grep "dn: " | cut -d " " -f 2);
+       dom=$(echo "$base" | grep "dn: " | cut -d " " -f 2)
 
        if [ -z "$dom" ]; then
-               echo "Unexpected ldbsearch output: $base";
+               echo "Unexpected ldbsearch output: $base"
        fi
 
        version=$($ldbsearch -H $PREFIX/$1/private/sam.ldb --scope=base \
-                 "objectVersion" -b "CN=SCHEMA,CN=CONFIGURATION,$dom");
-       version_num=$(echo "$version" | grep "objectVersion: " | cut -d " " -f 2);
+               "objectVersion" -b "CN=SCHEMA,CN=CONFIGURATION,$dom")
+       version_num=$(echo "$version" | grep "objectVersion: " | cut -d " " -f 2)
 
        if [ "$version_num" -eq "$2" ]; then
-               return 0;
+               return 0
        fi
 
-       echo "Fail: schema version $version_num != $2";
-       return 1;
+       echo "Fail: schema version $version_num != $2"
+       return 1
 }
 
 tname="schema version"
index 3c0afe96744f8180538cde3653844c164ddf60a9..908cb69b8dff9d8f3e77fcd450d17ca107c4d6fe 100755 (executable)
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_s3upgrade.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
-PREFIX=`pwd`"/$1"
+PREFIX=$(pwd)"/$1"
 shift 1
 
 samba4bindir="$BINDIR"
@@ -15,14 +15,14 @@ samba_tool="$samba4bindir/samba-tool"
 samba_net="$samba4bindir/net"
 testparm="$samba4bindir/testparm"
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 rm -rf $PREFIX/samba3-upgrade
 mkdir -p $PREFIX/samba3-upgrade
 cp -a $SRCDIR/testdata/samba3 $PREFIX/samba3-upgrade
 
 # Test 1 (s3 member)
-cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
+cat - >$PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
 [global]
    workgroup = SAMBA
    security = user
@@ -43,7 +43,7 @@ testit "samba3-upgrade-member" $PYTHON $samba_tool domain classicupgrade $PREFIX
 testit "samba3-upgrade-member-getlocalsid" $samba_net getlocalsid s3upgrade --configfile=$PREFIX/samba3-upgrade/s4_1/etc/smb.conf
 
 # Test 2 (s3 dc)
-cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
+cat - >$PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
 [global]
    workgroup = SAMBA
    netbiosname = S3UPGRADE
@@ -72,7 +72,7 @@ testit "samba3-upgrade-dc-getdomainsid" $samba_net getdomainsid --configfile=$PR
 rm -f $PREFIX/samba3-upgrade/samba3/wins.dat
 
 # Test 3 (s3 dc using testparm hook)
-cat - > $PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
+cat - >$PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
 [global]
    workgroup = SAMBA
    netbiosname = S3UPGRADE
index 2631d3eeabe9c32ff07f42184f970ae9299e2a85..4f6fd1e58b9d71ce736ffbc2cfd7d1d10ddca112 100755 (executable)
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_setpassword.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
 shift 1
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 samba_tool="./bin/samba-tool"
 
index 8f0258d0db87ae70486fc6dc3674a4d7c687d672..46e40618c5be81d089c42339b1d85b49fc0e227d 100755 (executable)
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_group.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
 shift 1
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 samba_tool="./bin/samba-tool"
 
index 749deb890a926f0b8c09adcdd63b48663e43966d..044b9c49a78d14d1cd85f566405fa17e87a99fde 100755 (executable)
@@ -4,10 +4,10 @@
 # manually (you have to run the samba-tool 'backup restore' command instead).
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: $0 PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
@@ -16,20 +16,20 @@ shift 1
 DBPATH=$PREFIX/start-backup
 mkdir -p $DBPATH
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 do_provision()
 {
-    $PYTHON $BINDIR/samba-tool domain provision \
-           --domain=FOO --realm=foo.example.com --use-ntvfs \
-           --targetdir=$DBPATH --option="pid directory = $DBPATH"
+       $PYTHON $BINDIR/samba-tool domain provision \
+               --domain=FOO --realm=foo.example.com --use-ntvfs \
+               --targetdir=$DBPATH --option="pid directory = $DBPATH"
 }
 
 add_backup_marker()
 {
-# manually add the backup marker that the backup cmd usually adds
-    $BINDIR/ldbmodify \
-       -H tdb://$DBPATH/private/sam.ldb <<EOF
+       # manually add the backup marker that the backup cmd usually adds
+       $BINDIR/ldbmodify \
+               -H tdb://$DBPATH/private/sam.ldb <<EOF
 dn: @SAMBA_DSDB
 changetype: modify
 add: backupDate
@@ -41,30 +41,30 @@ EOF
 
 start_backup()
 {
-    # start samba in interactive mode (if we don't, samba daemonizes and so the
-    # command's exit status is always zero (success), regardless of whether
-    # samba actually starts up or not). However, this means if this assertion
-    # were ever to fail (i.e. samba DOES startup from a backup file), then the
-    # test case would just hang. So we use a max-run-time of 5 secs so that
-    # samba will self-destruct in the bad case (max_runtime_handler() returns
-    # zero/success in this case, which allows us to tell the good case from the
-    # bad case).
-    OPTS="--maximum-runtime=5 -i"
-
-    # redirect logs to stderr (which we'll then redirect to stdout so we can
-    # capture it in a bash variable)
-    OPTS="$OPTS --debug-stdout"
-
-    # start samba and capture the debug output
-    OUTPUT=$($BINDIR/samba --configfile=$DBPATH/etc/smb.conf $OPTS 2>&1)
-    if [ $? -eq 0 ] ; then
-        echo "ERROR: Samba should not have started successfully"
-        return 1
-    fi
-
-    # check the reason we're failing is because prime_ldb_databases() is
-    # detecting that this is a backup DB (and not some other reason)
-    echo "$OUTPUT" | grep "failed to start: Database is a backup"
+       # start samba in interactive mode (if we don't, samba daemonizes and so the
+       # command's exit status is always zero (success), regardless of whether
+       # samba actually starts up or not). However, this means if this assertion
+       # were ever to fail (i.e. samba DOES startup from a backup file), then the
+       # test case would just hang. So we use a max-run-time of 5 secs so that
+       # samba will self-destruct in the bad case (max_runtime_handler() returns
+       # zero/success in this case, which allows us to tell the good case from the
+       # bad case).
+       OPTS="--maximum-runtime=5 -i"
+
+       # redirect logs to stderr (which we'll then redirect to stdout so we can
+       # capture it in a bash variable)
+       OPTS="$OPTS --debug-stdout"
+
+       # start samba and capture the debug output
+       OUTPUT=$($BINDIR/samba --configfile=$DBPATH/etc/smb.conf $OPTS 2>&1)
+       if [ $? -eq 0 ]; then
+               echo "ERROR: Samba should not have started successfully"
+               return 1
+       fi
+
+       # check the reason we're failing is because prime_ldb_databases() is
+       # detecting that this is a backup DB (and not some other reason)
+       echo "$OUTPUT" | grep "failed to start: Database is a backup"
 }
 
 # setup a DB and manually mark it as being a "backup"
index e8c6a151c62007a7b25777fd57a7abce5c404522..9861fbc39279c116a517ec38471f98d2cb259e79 100755 (executable)
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_supported_features.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
@@ -14,29 +14,29 @@ DBPATH=$PREFIX/supported-features
 
 mkdir -p $DBPATH
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 ldbmodify="ldbmodify"
 if [ -x "$BINDIR/ldbmodify" ]; then
-    ldbmodify="$BINDIR/ldbmodify"
+       ldbmodify="$BINDIR/ldbmodify"
 fi
 
 ldbdel="ldbdel"
 if [ -x "$BINDIR/ldbdel" ]; then
-    ldbdel="$BINDIR/ldbdel"
+       ldbdel="$BINDIR/ldbdel"
 fi
 
 ldbsearch="ldbsearch"
 if [ -x "$BINDIR/ldbsearch" ]; then
-    ldbsearch="$BINDIR/ldbsearch"
+       ldbsearch="$BINDIR/ldbsearch"
 fi
 
 testit "provision" $PYTHON $BINDIR/samba-tool domain provision \
-       --domain=FOO --realm=foo.example.com \
-       --targetdir=$DBPATH --use-ntvfs
+       --domain=FOO --realm=foo.example.com \
+       --targetdir=$DBPATH --use-ntvfs
 
 testit "add-compatible-feature" $ldbmodify \
-       -H tdb://$DBPATH/private/sam.ldb <<EOF
+       -H tdb://$DBPATH/private/sam.ldb <<EOF
 dn: @SAMBA_DSDB
 changetype: modify
 add: compatibleFeatures
@@ -49,25 +49,23 @@ EOF
 # should not be listed in compatibleFeatures even though we tried to
 # put it there.
 
-ldb_search_fail() {
-    $ldbsearch -H tdb://$DBPATH/private/sam.ldb \
-               -s base -b "$1" "$2" \
-        |   grep -q "$3"
+ldb_search_fail()
+{
+       $ldbsearch -H tdb://$DBPATH/private/sam.ldb \
+               -s base -b "$1" "$2" |
+               grep -q "$3"
 }
 
-
 testit_expect_failure "find-compatible-feature" \
-                      ldb_search_fail '@SAMBA_DSDB' 'compatibleFeatures' non-existent-feature
-
+       ldb_search_fail '@SAMBA_DSDB' 'compatibleFeatures' non-existent-feature
 
 # just make sure the thing we're using is normally findable
 testit "find-test-feature" \
-       $ldbsearch -H tdb://$DBPATH/private/sam.ldb \
-       -b 'CN=LostAndFound,DC=foo,DC=example,DC=com'
-
+       $ldbsearch -H tdb://$DBPATH/private/sam.ldb \
+       -b 'CN=LostAndFound,DC=foo,DC=example,DC=com'
 
 testit "add-required-feature" $ldbmodify \
-       -H tdb://$DBPATH/private/sam.ldb <<EOF
+       -H tdb://$DBPATH/private/sam.ldb <<EOF
 dn: @SAMBA_DSDB
 changetype: modify
 add: requiredFeatures
@@ -80,8 +78,8 @@ EOF
 # required by this database. A search for anything should fail.
 
 testit_expect_failure "find-required-feature" \
-                      $ldbsearch -H tdb://$DBPATH/private/sam.ldb \
-                      -b 'CN=LostAndFound,DC=foo,DC=example,DC=com'
+       $ldbsearch -H tdb://$DBPATH/private/sam.ldb \
+       -b 'CN=LostAndFound,DC=foo,DC=example,DC=com'
 
 rm -rf $DBPATH
 
index 58f8af7672e2f2048b212497e642503179d3869e..7dded873c1f33b008ac9a62cd2527ba06dc097af 100755 (executable)
@@ -1,38 +1,41 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_upgradeprovision.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
 shift 1
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 [ ! -d $PREFIX ] && mkdir $PREFIX
 
-upgradeprovision_reference() {
-  if [ -d $PREFIX/upgradeprovision_reference ]; then
-    rm -fr $PREFIX/upgradeprovision_reference
-  fi
+upgradeprovision_reference()
+{
+       if [ -d $PREFIX/upgradeprovision_reference ]; then
+               rm -fr $PREFIX/upgradeprovision_reference
+       fi
        $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_reference" --server-role="dc" --use-ntvfs --base-schema=2008_R2
 }
 
-upgradeprovision() {
-  if [ -d $PREFIX/upgradeprovision ]; then
-    rm -fr $PREFIX/upgradeprovision
-  fi
+upgradeprovision()
+{
+       if [ -d $PREFIX/upgradeprovision ]; then
+               rm -fr $PREFIX/upgradeprovision
+       fi
        $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc" --use-ntvfs --base-schema=2008_R2
        $PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX/upgradeprovision/etc/smb.conf" --debugchange
 }
 
-upgradeprovision_full() {
-  if [ -d $PREFIX/upgradeprovision_full ]; then
-    rm -fr $PREFIX/upgradeprovision_full
-  fi
+upgradeprovision_full()
+{
+       if [ -d $PREFIX/upgradeprovision_full ]; then
+               rm -fr $PREFIX/upgradeprovision_full
+       fi
        $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc" --use-ntvfs --base-schema=2008_R2
        $PYTHON $BINDIR/samba_upgradeprovision --configfile="$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
 }
@@ -41,20 +44,24 @@ upgradeprovision_full() {
 # upgradeprovision (because we did a provision with the same template)
 # really doesn't change anything.
 
-ldapcmp() {
-        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --skip-missing-dn --filter=servicePrincipalName
+ldapcmp()
+{
+       $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --skip-missing-dn --filter=servicePrincipalName
 }
 
-ldapcmp_full() {
-        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision_full/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --skip-missing-dn --filter=servicePrincipalName
+ldapcmp_full()
+{
+       $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision_full/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --skip-missing-dn --filter=servicePrincipalName
 }
 
-ldapcmp_sd() {
-        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --sd --skip-missing-dn --filter=servicePrincipalName
+ldapcmp_sd()
+{
+       $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --sd --skip-missing-dn --filter=servicePrincipalName
 }
 
-ldapcmp_full_sd() {
-        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision_full/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --sd --skip-missing-dn --filter=servicePrincipalName
+ldapcmp_full_sd()
+{
+       $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision_full/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --sd --skip-missing-dn --filter=servicePrincipalName
 }
 
 testit "upgradeprovision" upgradeprovision
@@ -66,15 +73,15 @@ testit "ldapcmp_sd" ldapcmp_sd
 testit "ldapcmp_full_sd" ldapcmp_full_sd
 
 if [ -d $PREFIX/upgradeprovision ]; then
-  rm -fr $PREFIX/upgradeprovision
+       rm -fr $PREFIX/upgradeprovision
 fi
 
 if [ -d $PREFIX/upgradeprovision_full ]; then
-  rm -fr $PREFIX/upgradeprovision_full
+       rm -fr $PREFIX/upgradeprovision_full
 fi
 
 if [ -d $PREFIX/upgradeprovision_reference ]; then
-  rm -fr $PREFIX/upgradeprovision_reference
+       rm -fr $PREFIX/upgradeprovision_reference
 fi
 
 exit $failed
index 0b3ef0321fb483176a331537f5c88504c09fc874..c69b73ff84ccfa8cd33836b783a11be14899293f 100755 (executable)
@@ -1,52 +1,51 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: $0 PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
 PREFIX="$1"
 shift 1
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 # selftest sets the umask to zero. Explicitly set it to 022 here,
 # which should mean files should never be writable for anyone else
-ORIG_UMASK=`umask`
+ORIG_UMASK=$(umask)
 umask 0022
 
 # checks that the files in the 'private' directory created are not
 # world-writable
 check_private_file_perms()
 {
-    target_dir="$1/private"
-    result=0
-
-    for file in `ls $target_dir/`
-    do
-        filepath="$target_dir/$file"
-
-        # skip directories/sockets for now
-        if [ ! -f $filepath ] ; then
-            continue;
-        fi
-
-        # use stat to get the file permissions, i.e. -rw-------
-        file_perm=`stat -c "%A" $filepath`
-
-        # then use cut to drop the first 4 chars containing the file type
-        # and owner permissions. What's left is the group and other users
-        global_perm=`echo $file_perm | cut -c4-`
-
-        # check the remainder doesn't have write permissions set
-        if [ -z "${global_perm##*w*}" ] ; then
-            echo "Error: $file has $file_perm permissions"
-            result=1
-        fi
-    done
-    return $result
+       target_dir="$1/private"
+       result=0
+
+       for file in $(ls $target_dir/); do
+               filepath="$target_dir/$file"
+
+               # skip directories/sockets for now
+               if [ ! -f $filepath ]; then
+                       continue
+               fi
+
+               # use stat to get the file permissions, i.e. -rw-------
+               file_perm=$(stat -c "%A" $filepath)
+
+               # then use cut to drop the first 4 chars containing the file type
+               # and owner permissions. What's left is the group and other users
+               global_perm=$(echo $file_perm | cut -c4-)
+
+               # check the remainder doesn't have write permissions set
+               if [ -z "${global_perm##*w*}" ]; then
+                       echo "Error: $file has $file_perm permissions"
+                       result=1
+               fi
+       done
+       return $result
 }
 
 TARGET_DIR=$PREFIX/basic-dc
@@ -55,8 +54,8 @@ rm -rf $TARGET_DIR
 # create a dummy smb.conf - we need to use fake ACLs for the file system here
 # (but passing --option args with spaces in it proved too difficult in bash)
 SMB_CONF=$TARGET_DIR/tmp/smb.conf
-mkdir -p `dirname $SMB_CONF`
-echo "vfs objects = fake_acls xattr_tdb" > $SMB_CONF
+mkdir -p $(dirname $SMB_CONF)
+echo "vfs objects = fake_acls xattr_tdb" >$SMB_CONF
 
 # provision a basic DC
 testit "basic-provision" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --targetdir=$TARGET_DIR --configfile=$SMB_CONF