diff options
| author | Andreas Schneider <asn@samba.org> | 2020-12-17 12:25:15 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-04-28 03:43:34 +0000 |
| commit | fca9c56836cd28875d67eef6e33628f8a51ebd88 (patch) | |
| tree | 9fd4716f3e2faf16a1807fd980bb8ed3f9ec872e /source4 | |
| parent | 9fb88e6ee79da8912b696bbbcda76f3020662bdf (diff) | |
| download | samba-fca9c56836cd28875d67eef6e33628f8a51ebd88.tar.gz samba-fca9c56836cd28875d67eef6e33628f8a51ebd88.tar.bz2 samba-fca9c56836cd28875d67eef6e33628f8a51ebd88.zip | |
tests: Use ldbsearch '--scope instead of '-s'
We should use long options in tests to make clear what we are trying to
do.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/scripting/bin/setup_dns.sh | 2 | ||||
| -rwxr-xr-x | source4/scripting/devel/rebuild_zone.sh | 4 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_provision.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/bin/setup_dns.sh b/source4/scripting/bin/setup_dns.sh index 166a2b84351..5e9bc20c62b 100755 --- a/source4/scripting/bin/setup_dns.sh +++ b/source4/scripting/bin/setup_dns.sh @@ -16,7 +16,7 @@ RSUFFIX=$(echo $DOMAIN | sed s/[\.]/,DC=/g) PRIVATEDIR=$(bin/samba-tool testparm --section-name=global --parameter-name='private dir' --suppress-prompt 2> /dev/null) } -OBJECTGUID=$(bin/ldbsearch -s base -H "$PRIVATEDIR/sam.ldb" -b "CN=NTDS Settings,CN=$HOSTNAME,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=$RSUFFIX" objectguid|grep ^objectGUID| cut -d: -f2) +OBJECTGUID=$(bin/ldbsearch --scope=base -H "$PRIVATEDIR/sam.ldb" -b "CN=NTDS Settings,CN=$HOSTNAME,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=$RSUFFIX" objectguid|grep ^objectGUID| cut -d: -f2) samba4kinit=kinit if test -x $BINDIR/samba4kinit; then diff --git a/source4/scripting/devel/rebuild_zone.sh b/source4/scripting/devel/rebuild_zone.sh index bac64be5f0f..771a009c555 100755 --- a/source4/scripting/devel/rebuild_zone.sh +++ b/source4/scripting/devel/rebuild_zone.sh @@ -9,11 +9,11 @@ LDB="$1" ZFILE="$2" -dnshostname=$(bin/ldbsearch -H $LDB -s base -b '' dnsHostname | grep ^dns | cut -d' ' -f2) +dnshostname=$(bin/ldbsearch -H $LDB --scope=base -b '' dnsHostname | grep ^dns | cut -d' ' -f2) host=$(echo $dnshostname | cut -d. -f1) realm=$(echo $dnshostname | cut -d. -f2-) GUIDs=$(bin/ldbsearch -H $LDB objectclass=ntdsdsa objectguid --cross-ncs|grep ^objectGUID| cut -d' ' -f2) -DOMAINGUID=$(bin/ldbsearch -H $LDB -s base objectguid |grep ^objectGUID| cut -d' ' -f2) +DOMAINGUID=$(bin/ldbsearch -H $LDB --scope=base objectguid |grep ^objectGUID| cut -d' ' -f2) dcname() { GUID=$1 diff --git a/source4/setup/tests/blackbox_provision.sh b/source4/setup/tests/blackbox_provision.sh index 5dfa510dcc8..7fa206ebe82 100755 --- a/source4/setup/tests/blackbox_provision.sh +++ b/source4/setup/tests/blackbox_provision.sh @@ -50,14 +50,14 @@ check_baseschema() { ldbsearch="$BINDIR/ldbsearch" fi - base=$($ldbsearch -H $PREFIX/$1/private/sam.ldb -s base dn) + base=$($ldbsearch -H $PREFIX/$1/private/sam.ldb --scope=base dn) dom=$(echo "$base" | grep "dn: " | cut -d " " -f 2); if [ -z "$dom" ]; then echo "Unexpected ldbsearch output: $base"; fi - version=$($ldbsearch -H $PREFIX/$1/private/sam.ldb -s base \ + 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); |