From: Andreas Schneider Date: Fri, 22 Apr 2022 13:46:04 +0000 (+0200) Subject: testprogs: Reformat join_ldapcmp.sh X-Git-Tag: samba-4.17.0rc1~107 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65b3797352c5f158c0c9c9bd624fed712d86792f;p=thirdparty%2Fsamba.git testprogs: Reformat join_ldapcmp.sh shfmt -w -p -i 0 -fn testprogs/blackbox/join_ldapcmp.sh Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- diff --git a/testprogs/blackbox/join_ldapcmp.sh b/testprogs/blackbox/join_ldapcmp.sh index e55a71007da..3e5b264e7d7 100755 --- a/testprogs/blackbox/join_ldapcmp.sh +++ b/testprogs/blackbox/join_ldapcmp.sh @@ -1,36 +1,39 @@ #!/bin/sh # Does a join against the testenv's DC and then runs ldapcmp on the resulting DB -. `dirname $0`/subunit.sh +. $(dirname $0)/subunit.sh TARGET_DIR="$PREFIX_ABS/join_$SERVER" cleanup_output_dir() { - if [ -d $TARGET_DIR ]; then - rm -fr $TARGET_DIR - fi + if [ -d $TARGET_DIR ]; then + rm -fr $TARGET_DIR + fi } SAMBA_TOOL="$PYTHON $BINDIR/samba-tool" -join_dc() { - JOIN_ARGS="--targetdir=$TARGET_DIR --server=$SERVER -U$USERNAME%$PASSWORD" - $SAMBA_TOOL domain join $REALM dc $JOIN_ARGS --option="netbios name = TESTJOINDC" +join_dc() +{ + JOIN_ARGS="--targetdir=$TARGET_DIR --server=$SERVER -U$USERNAME%$PASSWORD" + $SAMBA_TOOL domain join $REALM dc $JOIN_ARGS --option="netbios name = TESTJOINDC" } -demote_joined_dc() { - DEMOTE_ARGS="--remove-other-dead-server=TESTJOINDC --server=$SERVER -U$USERNAME%$PASSWORD" - $SAMBA_TOOL domain demote $DEMOTE_ARGS +demote_joined_dc() +{ + DEMOTE_ARGS="--remove-other-dead-server=TESTJOINDC --server=$SERVER -U$USERNAME%$PASSWORD" + $SAMBA_TOOL domain demote $DEMOTE_ARGS } -ldapcmp_result() { - DB1_PATH="tdb://$PREFIX_ABS/$SERVER/private/sam.ldb" - DB2_PATH="tdb://$TARGET_DIR/private/sam.ldb" +ldapcmp_result() +{ + DB1_PATH="tdb://$PREFIX_ABS/$SERVER/private/sam.ldb" + DB2_PATH="tdb://$TARGET_DIR/private/sam.ldb" - # interSiteTopologyGenerator gets periodically updated. With the restored - # testenvs, it can sometimes point to the old/deleted DC object still - $SAMBA_TOOL ldapcmp $DB1_PATH $DB2_PATH --filter=interSiteTopologyGenerator + # interSiteTopologyGenerator gets periodically updated. With the restored + # testenvs, it can sometimes point to the old/deleted DC object still + $SAMBA_TOOL ldapcmp $DB1_PATH $DB2_PATH --filter=interSiteTopologyGenerator } cleanup_output_dir