diff options
author | Andreas Schneider <asn@samba.org> | 2022-04-22 15:46:04 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2022-08-04 12:56:37 +0000 |
commit | 7b4e06d2255f16d42263fd42b48c153ceb6d2125 (patch) | |
tree | ec0c6a6a50af9f67bfab43c83f7790ac4dea5e68 /testprogs | |
parent | d0f27918308fca625c5cecfad205698fcdc8a8bc (diff) | |
download | samba-7b4e06d2255f16d42263fd42b48c153ceb6d2125.tar.gz |
testprogs: Reformat renamedc.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/renamedc.sh
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
Diffstat (limited to 'testprogs')
-rwxr-xr-x | testprogs/blackbox/renamedc.sh | 80 |
1 files changed, 45 insertions, 35 deletions
diff --git a/testprogs/blackbox/renamedc.sh b/testprogs/blackbox/renamedc.sh index e267d1dff5c..6e24cdfc81d 100755 --- a/testprogs/blackbox/renamedc.sh +++ b/testprogs/blackbox/renamedc.sh @@ -1,10 +1,10 @@ #!/bin/sh if [ $# -lt 1 ]; then -cat <<EOF + cat <<EOF Usage: renamedc.sh PREFIX EOF -exit 1; + exit 1 fi PREFIX="$1" @@ -16,78 +16,88 @@ if [ -x "$samba4bindir/ldbsearch" ]; then ldbsearch="$samba4bindir/ldbsearch" fi -. `dirname $0`/subunit.sh +. $(dirname $0)/subunit.sh if [ ! -d $PREFIX/renamedc_test ]; then mkdir -p $PREFIX/renamedc_test fi -testprovision() { - $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/renamedc_test" --server-role="dc" --use-ntvfs +testprovision() +{ + $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/renamedc_test" --server-role="dc" --use-ntvfs } -testrenamedc() { +testrenamedc() +{ $PYTHON $SRCDIR/source4/scripting/bin/renamedc \ --oldname="BAR" \ --newname="RAYMONBAR" \ --configfile=$PREFIX/renamedc_test/etc/smb.conf } -confirmrenamedc() { - $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,ou=domain controllers,dc=foo,dc=example,dc=com' +confirmrenamedc() +{ + $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,ou=domain controllers,dc=foo,dc=example,dc=com' } -confirmrenamedc_server() { - $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=configuration,dc=foo,dc=example,dc=com' +confirmrenamedc_server() +{ + $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=configuration,dc=foo,dc=example,dc=com' } -confirmrenamedc_sAMAccountName() { - $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,ou=domain controllers,dc=foo,dc=example,dc=com' sAMAccountName | grep 'sAMAccountName: RAYMONBAR\$' +confirmrenamedc_sAMAccountName() +{ + $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,ou=domain controllers,dc=foo,dc=example,dc=com' sAMAccountName | grep 'sAMAccountName: RAYMONBAR\$' } -confirmrenamedc_dNSHostName() { - $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,ou=domain controllers,dc=foo,dc=example,dc=com' dNSHostName | grep 'dNSHostName: RAYMONBAR.foo.example.com' +confirmrenamedc_dNSHostName() +{ + $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b 'cn=RAYMONBAR,ou=domain controllers,dc=foo,dc=example,dc=com' dNSHostName | grep 'dNSHostName: RAYMONBAR.foo.example.com' } -confirmrenamedc_rootdse_dnsHostName() { - $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b '' dNSHostName | grep 'dnsHostName: RAYMONBAR.foo.example.com' +confirmrenamedc_rootdse_dnsHostName() +{ + $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --scope=base -b '' dNSHostName | grep 'dnsHostName: RAYMONBAR.foo.example.com' } -confirmrenamedc_rootdse_dsServiceName() { - $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --show-binary --scope=base -b '' dsServiceName | grep 'dsServiceName: CN=NTDS Settings,CN=RAYMONBAR,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=foo,DC=example,DC=com' +confirmrenamedc_rootdse_dsServiceName() +{ + $ldbsearch -H $PREFIX/renamedc_test/private/sam.ldb --show-binary --scope=base -b '' dsServiceName | grep 'dsServiceName: CN=NTDS Settings,CN=RAYMONBAR,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=foo,DC=example,DC=com' } -testrenamedc2() { +testrenamedc2() +{ $PYTHON $SRCDIR/source4/scripting/bin/renamedc \ --oldname="RAYMONBAR" \ --newname="BAR" \ --configfile=$PREFIX/renamedc_test/etc/smb.conf } -dbcheck_fix() { - # Unlike most calls to dbcheck --fix, this will not trigger an error, as - # we do not flag an error count for this old DN string case. +dbcheck_fix() +{ + # Unlike most calls to dbcheck --fix, this will not trigger an error, as + # we do not flag an error count for this old DN string case. $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs --configfile=$PREFIX/renamedc_test/etc/smb.conf --fix \ --quiet --yes fix_all_old_dn_string_component_mismatch \ --attrs="fsmoRoleOwner interSiteTopologyGenerator msDS-NC-Replica-Locations" } -dbcheck() { +dbcheck() +{ $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs --configfile=$PREFIX/renamedc_test/etc/smb.conf } - -testit "renameprovision" testprovision || failed=`expr $failed + 1` -testit "renamedc" testrenamedc || failed=`expr $failed + 1` -testit "confirmrenamedc" confirmrenamedc || failed=`expr $failed + 1` -testit "confirmrenamedc_server" confirmrenamedc_server || failed=`expr $failed + 1` -testit "confirmrenamedc_sAMAccountName" confirmrenamedc_sAMAccountName || failed=`expr $failed + 1` -testit "confirmrenamedc_dNSHostName" confirmrenamedc_dNSHostName || failed=`expr $failed + 1` -testit "confirmrenamedc_rootdse_dnsHostName" confirmrenamedc_rootdse_dnsHostName || failed=`expr $failed + 1` -testit "confirmrenamedc_rootdse_dsServiceName" confirmrenamedc_rootdse_dsServiceName || failed=`expr $failed + 1` -testit "dbcheck_fix" dbcheck_fix || failed=`expr $failed + 1` -testit "dbcheck" dbcheck || failed=`expr $failed + 1` -testit "renamedc2" testrenamedc2 || failed=`expr $failed + 1` +testit "renameprovision" testprovision || failed=$(expr $failed + 1) +testit "renamedc" testrenamedc || failed=$(expr $failed + 1) +testit "confirmrenamedc" confirmrenamedc || failed=$(expr $failed + 1) +testit "confirmrenamedc_server" confirmrenamedc_server || failed=$(expr $failed + 1) +testit "confirmrenamedc_sAMAccountName" confirmrenamedc_sAMAccountName || failed=$(expr $failed + 1) +testit "confirmrenamedc_dNSHostName" confirmrenamedc_dNSHostName || failed=$(expr $failed + 1) +testit "confirmrenamedc_rootdse_dnsHostName" confirmrenamedc_rootdse_dnsHostName || failed=$(expr $failed + 1) +testit "confirmrenamedc_rootdse_dsServiceName" confirmrenamedc_rootdse_dsServiceName || failed=$(expr $failed + 1) +testit "dbcheck_fix" dbcheck_fix || failed=$(expr $failed + 1) +testit "dbcheck" dbcheck || failed=$(expr $failed + 1) +testit "renamedc2" testrenamedc2 || failed=$(expr $failed + 1) if [ $failed -eq 0 ]; then rm -rf $PREFIX/renamedc_test |