The branch, master has been updated via 854a45ca24a testprogs: Reformat test_special_group.sh via 2d64eafa8be testprogs: Reformat test_smbtorture_test_names.sh via dae369f483c testprogs: Reformat test_samba_upgradedns.sh via eff28db8d6a testprogs: Reformat test_samba-tool_ntacl.sh via f1ebc2d78f7 testprogs: Reformat test_s4u_heimdal.sh via 4627320e940 testprogs: Reformat test_rpcclient_schannel.sh via ef9dc7277e4 testprogs: Reformat test_primary_group.sh via 6e300ccd192 testprogs: Reformat test_pkinit_simple.sh via c253c99d529 testprogs: Reformat test_pkinit_pac.sh via 9d1a255232d testprogs: Reformat test_pdbtest.sh via 8490449f60f testprogs: Reformat test_password_settings.sh via c7d01342047 testprogs: Reformat test_old_enctypes.sh via 0a4eb5d8922 testprogs: Reformat test_offline_logon.sh via 7403de7eaf7 testprogs: Reformat test_net_rpc_user.sh via a43a7e78f9b testprogs: Reformat test_net_offline.sh via 8a4a8b7a3a3 testprogs: Reformat test_net_ads_fips.sh via 865531f9c68 testprogs: Reformat test_net_ads_dns.sh via 81f1694995d testprogs: Reformat test_net_ads.sh via c44289ce1c8 testprogs: Reformat test_ldb_simple.sh via 19f73f19f4d testprogs: Reformat test_ldb.sh from 4d015b4b6db smbstatus: Fix the 32-bit build on FreeBSD
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 854a45ca24a8841a53fc5bcb46663f1204d6c24c Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_special_group.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_special_group.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> Autobuild-User(master): Pavel Filipensky <pfilipen...@samba.org> Autobuild-Date(master): Wed Aug 10 10:21:48 UTC 2022 on sn-devel-184 commit 2d64eafa8be952e4a6b25359ced51422ed00060b Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_smbtorture_test_names.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_smbtorture_test_names.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit dae369f483c1076de1edc209fde93a41d6091d16 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_samba_upgradedns.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_samba_upgradedns.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit eff28db8d6ae68f93a2a1ea0522ec4ac466b06a8 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_samba-tool_ntacl.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_samba-tool_ntacl.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit f1ebc2d78f7f9c54556931f0ed2aeb30103c2b81 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_s4u_heimdal.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_s4u_heimdal.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 4627320e94037972cd6f4a8f763ac0aa12146620 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_rpcclient_schannel.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_rpcclient_schannel.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit ef9dc7277e4c5937711de61f7efc945b33eca124 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_primary_group.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_primary_group.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 6e300ccd19253b507d19d408f177db163fb6105f Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_pkinit_simple.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_pkinit_simple.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit c253c99d5299a0787fc0de64c489f5394c2b4167 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_pkinit_pac.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_pkinit_pac.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 9d1a255232deba5ae352853e0d66afe6ecdbab09 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_pdbtest.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_pdbtest.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 8490449f60feeaf1686640bfeefe2083d40cdc4c Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_password_settings.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_password_settings.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit c7d013420472406032b227ead3c939984fb357a6 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_old_enctypes.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_old_enctypes.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 0a4eb5d8922ef5a464a869572efbb05a7fd78bcc Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_offline_logon.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_offline_logon.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 7403de7eaf752c97411cf9ecfb19ef5d6a9ae77a Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_net_rpc_user.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_net_rpc_user.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit a43a7e78f9b51eabc33da2275ecabc9a23c0be46 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_net_offline.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_net_offline.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 8a4a8b7a3a35b9445dd77794d9d04efed451cf37 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_net_ads_fips.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_net_ads_fips.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 865531f9c687f023f0f1708743da21cce12a1c64 Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_net_ads_dns.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_net_ads_dns.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 81f1694995df68a300bd74d12659c8059fc5b85c Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_net_ads.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_net_ads.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit c44289ce1c826a35057b3815745be338555a47ce Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_ldb_simple.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_ldb_simple.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 19f73f19f4d2d0fb488c1feeedca0bce4d174b8a Author: Andreas Schneider <a...@samba.org> Date: Fri Apr 22 15:46:05 2022 +0200 testprogs: Reformat test_ldb.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_ldb.sh Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> ----------------------------------------------------------------------- Summary of changes: testprogs/blackbox/test_ldb.sh | 142 +++++++-------- testprogs/blackbox/test_ldb_simple.sh | 14 +- testprogs/blackbox/test_net_ads.sh | 211 +++++++++++------------ testprogs/blackbox/test_net_ads_dns.sh | 36 ++-- testprogs/blackbox/test_net_ads_fips.sh | 22 +-- testprogs/blackbox/test_net_offline.sh | 33 ++-- testprogs/blackbox/test_net_rpc_user.sh | 8 +- testprogs/blackbox/test_offline_logon.sh | 20 +-- testprogs/blackbox/test_old_enctypes.sh | 22 +-- testprogs/blackbox/test_password_settings.sh | 81 ++++----- testprogs/blackbox/test_pdbtest.sh | 50 +++--- testprogs/blackbox/test_pkinit_pac.sh | 2 +- testprogs/blackbox/test_pkinit_simple.sh | 66 +++---- testprogs/blackbox/test_primary_group.sh | 44 ++--- testprogs/blackbox/test_rpcclient_schannel.sh | 96 +++++------ testprogs/blackbox/test_s4u_heimdal.sh | 66 ++++--- testprogs/blackbox/test_samba-tool_ntacl.sh | 32 ++-- testprogs/blackbox/test_samba_upgradedns.sh | 18 +- testprogs/blackbox/test_smbtorture_test_names.sh | 40 ++--- testprogs/blackbox/test_special_group.sh | 28 +-- 20 files changed, 513 insertions(+), 518 deletions(-) Changeset truncated at 500 lines: diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh index d9485d7c45e..0f1f60071f6 100755 --- a/testprogs/blackbox/test_ldb.sh +++ b/testprogs/blackbox/test_ldb.sh @@ -1,22 +1,22 @@ #!/bin/sh if [ $# -lt 2 ]; then -cat <<EOF + cat <<EOF Usage: test_ldb.sh PROTOCOL SERVER [OPTIONS] EOF -exit 1; + exit 1 fi - p=$1 SERVER=$2 PREFIX=$3 shift 2 options="$*" -. `dirname $0`/subunit.sh +. $(dirname $0)/subunit.sh -check() { +check() +{ name="$1" shift cmdline="$*" @@ -27,7 +27,7 @@ check() { echo "success: $name" else echo "failure: $name" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi return $status } @@ -36,94 +36,94 @@ export PATH="$BINDIR:$PATH" ldbsearch="$VALGRIND ldbsearch" -check "RootDSE" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr $failed + 1` -check "RootDSE (full)" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base '(objectClass=*)' || failed=`expr $failed + 1` -check "RootDSE (extended)" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base '(objectClass=*)' --extended-dn || failed=`expr $failed + 1` +check "RootDSE" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base DUMMY=x dnsHostName highestCommittedUSN || failed=$(expr $failed + 1) +check "RootDSE (full)" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base '(objectClass=*)' || failed=$(expr $failed + 1) +check "RootDSE (extended)" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base '(objectClass=*)' --extended-dn || failed=$(expr $failed + 1) if [ x$p = x"ldaps" ]; then - testit_expect_failure "RootDSE over SSLv3 should fail" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base DUMMY=x dnsHostName highestCommittedUSN --option='tlspriority=NONE:+VERS-SSL3.0:+MAC-ALL:+CIPHER-ALL:+RSA:+SIGN-ALL:+COMP-NULL' && failed=`expr $failed + 1` + testit_expect_failure "RootDSE over SSLv3 should fail" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base DUMMY=x dnsHostName highestCommittedUSN --option='tlspriority=NONE:+VERS-SSL3.0:+MAC-ALL:+CIPHER-ALL:+RSA:+SIGN-ALL:+COMP-NULL' && failed=$(expr $failed + 1) fi echo "Getting defaultNamingContext" -BASEDN=`$ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base DUMMY=x defaultNamingContext | grep defaultNamingContext | awk '{print $2}'` +BASEDN=$($ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base DUMMY=x defaultNamingContext | grep defaultNamingContext | awk '{print $2}') echo "BASEDN is $BASEDN" -check "Listing Users" $ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectclass=user)' sAMAccountName || failed=`expr $failed + 1` +check "Listing Users" $ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectclass=user)' sAMAccountName || failed=$(expr $failed + 1) -check "Listing Users (sorted)" $ldbsearch -S $options $CONFIGURATION -H $p://$SERVER '(objectclass=user)' sAMAccountName || failed=`expr $failed + 1` +check "Listing Users (sorted)" $ldbsearch -S $options $CONFIGURATION -H $p://$SERVER '(objectclass=user)' sAMAccountName || failed=$(expr $failed + 1) -check "Listing Groups" $ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectclass=group)' sAMAccountName || failed=`expr $failed + 1` +check "Listing Groups" $ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectclass=group)' sAMAccountName || failed=$(expr $failed + 1) -nentries=`$ldbsearch $options -H $p://$SERVER $CONFIGURATION '(|(|(&(!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10))(samAccountType=805306368))(samAccountType=805306369))' sAMAccountName | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options -H $p://$SERVER $CONFIGURATION '(|(|(&(!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10))(samAccountType=805306368))(samAccountType=805306369))' sAMAccountName | grep sAMAccountName | wc -l) echo "Found $nentries entries" if [ $nentries -lt 10 ]; then -echo "Should have found at least 10 entries" -failed=`expr $failed + 1` + echo "Should have found at least 10 entries" + failed=$(expr $failed + 1) fi echo "Check rootDSE for Controls" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --scope=base -b "" '(objectclass=*)' | grep -i supportedControl | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --scope=base -b "" '(objectclass=*)' | grep -i supportedControl | wc -l) if [ $nentries -lt 4 ]; then -echo "Should have found at least 4 entries" -failed=`expr $failed + 1` + echo "Should have found at least 4 entries" + failed=$(expr $failed + 1) fi echo "Test Paged Results Control" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=paged_results:1:5 '(objectclass=user)' | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=paged_results:1:5 '(objectclass=user)' | grep sAMAccountName | wc -l) if [ $nentries -lt 1 ]; then -echo "Paged Results Control test returned 0 items" -failed=`expr $failed + 1` + echo "Paged Results Control test returned 0 items" + failed=$(expr $failed + 1) fi echo "Test Server Sort Control" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=server_sort:1:0:sAMAccountName '(objectclass=user)' | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=server_sort:1:0:sAMAccountName '(objectclass=user)' | grep sAMAccountName | wc -l) if [ $nentries -lt 1 ]; then -echo "Server Sort Control test returned 0 items" -failed=`expr $failed + 1` + echo "Server Sort Control test returned 0 items" + failed=$(expr $failed + 1) fi echo "Test Extended DN Control" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=extended_dn:1 '(objectclass=user)' | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=extended_dn:1 '(objectclass=user)' | grep sAMAccountName | wc -l) if [ $nentries -lt 1 ]; then -echo "Extended DN Control test returned 0 items" -failed=`expr $failed + 1` + echo "Extended DN Control test returned 0 items" + failed=$(expr $failed + 1) fi -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=extended_dn:1:0 '(objectclass=user)' | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=extended_dn:1:0 '(objectclass=user)' | grep sAMAccountName | wc -l) if [ $nentries -lt 1 ]; then -echo "Extended DN Control test returned 0 items" -failed=`expr $failed + 1` + echo "Extended DN Control test returned 0 items" + failed=$(expr $failed + 1) fi -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=extended_dn:1:1 '(objectclass=user)' | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=extended_dn:1:1 '(objectclass=user)' | grep sAMAccountName | wc -l) if [ $nentries -lt 1 ]; then -echo "Extended DN Control test returned 0 items" -failed=`expr $failed + 1` + echo "Extended DN Control test returned 0 items" + failed=$(expr $failed + 1) fi echo "Test Domain scope Control" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=domain_scope:1 '(objectclass=user)' | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=domain_scope:1 '(objectclass=user)' | grep sAMAccountName | wc -l) if [ $nentries -lt 1 ]; then -echo "Extended Domain scope Control test returned 0 items" -failed=`expr $failed + 1` + echo "Extended Domain scope Control test returned 0 items" + failed=$(expr $failed + 1) fi echo "Test Attribute Scope Query Control" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=asq:1:member --scope=base -b "CN=Administrators,CN=Builtin,$BASEDN" | grep sAMAccountName | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=asq:1:member --scope=base -b "CN=Administrators,CN=Builtin,$BASEDN" | grep sAMAccountName | wc -l) if [ $nentries -lt 1 ]; then -echo "Attribute Scope Query test returned 0 items" -failed=`expr $failed + 1` + echo "Attribute Scope Query test returned 0 items" + failed=$(expr $failed + 1) fi echo "Test Search Options Control" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=search_options:1:2 '(objectclass=crossRef)' | grep crossRef | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=search_options:1:2 '(objectclass=crossRef)' | grep crossRef | wc -l) if [ $nentries -lt 1 ]; then -echo "Search Options Control Query test returned 0 items" -failed=`expr $failed + 1` + echo "Search Options Control Query test returned 0 items" + failed=$(expr $failed + 1) fi echo "Test Search Options Control with Domain Scope Control" -nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=search_options:1:2,domain_scope:1 '(objectclass=crossRef)' | grep crossRef | wc -l` +nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --controls=search_options:1:2,domain_scope:1 '(objectclass=crossRef)' | grep crossRef | wc -l) if [ $nentries -lt 1 ]; then -echo "Search Options Control Query test returned 0 items" -failed=`expr $failed + 1` + echo "Search Options Control Query test returned 0 items" + failed=$(expr $failed + 1) fi wellknown_object_test() @@ -135,18 +135,18 @@ wellknown_object_test() basedns="<WKGUID=${guid},${BASEDN}> <wkGuId=${guid},${BASEDN}>" for dn in ${basedns}; do echo "Test ${dn} => ${object}" - r=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectClass=*)' -b "${dn}" | grep 'dn: '` - n=`echo "${r}" | grep 'dn: ' | wc -l` - c=`echo "${r}" | grep "${object}" | wc -l` + r=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectClass=*)' -b "${dn}" | grep 'dn: ') + n=$(echo "${r}" | grep 'dn: ' | wc -l) + c=$(echo "${r}" | grep "${object}" | wc -l) if [ $n -lt 1 ]; then echo "Object not found by WKGUID" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) continue fi if [ $c -lt 1 ]; then echo "Wrong object found by WKGUID: [${r}]" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) continue fi done @@ -157,75 +157,75 @@ wellknown_object_test() wellknown_object_test 22B70C67D56E4EFB91E9300FCA3DC1AA ForeignSecurityPrincipals st=$? if [ x"$st" != x"0" ]; then - failed=`expr $failed + $st` + failed=$(expr $failed + $st) fi wellknown_object_test 2FBAC1870ADE11D297C400C04FD8D5CD Infrastructure st=$? if [ x"$st" != x"0" ]; then - failed=`expr $failed + $st` + failed=$(expr $failed + $st) fi wellknown_object_test AB1D30F3768811D1ADED00C04FD8D5CD System st=$? if [ x"$st" != x"0" ]; then - failed=`expr $failed + $st` + failed=$(expr $failed + $st) fi wellknown_object_test A361B2FFFFD211D1AA4B00C04FD7D83A Domain Controllers st=$? if [ x"$st" != x"0" ]; then - failed=`expr $failed + $st` + failed=$(expr $failed + $st) fi wellknown_object_test AA312825768811D1ADED00C04FD8D5CD Computers st=$? if [ x"$st" != x"0" ]; then - failed=`expr $failed + $st` + failed=$(expr $failed + $st) fi wellknown_object_test A9D1CA15768811D1ADED00C04FD8D5CD Users st=$? if [ x"$st" != x"0" ]; then - failed=`expr $failed + $st` + failed=$(expr $failed + $st) fi echo "Getting HEX GUID/SID of $BASEDN" -HEXDN=`$ldbsearch $CONFIGURATION $options -b "$BASEDN" -H $p://$SERVER --scope=base "(objectClass=*)" --controls=extended_dn:1:0 distinguishedName | grep 'distinguishedName: ' | cut -d ' ' -f2-` -HEXGUID=`echo "$HEXDN" | cut -d ';' -f1` +HEXDN=$($ldbsearch $CONFIGURATION $options -b "$BASEDN" -H $p://$SERVER --scope=base "(objectClass=*)" --controls=extended_dn:1:0 distinguishedName | grep 'distinguishedName: ' | cut -d ' ' -f2-) +HEXGUID=$(echo "$HEXDN" | cut -d ';' -f1) echo "HEXGUID[$HEXGUID]" echo "Getting STR GUID/SID of $BASEDN" -STRDN=`$ldbsearch $CONFIGURATION $options -b "$BASEDN" -H $p://$SERVER --scope=base "(objectClass=*)" --controls=extended_dn:1:1 distinguishedName | grep 'distinguishedName: ' | cut -d ' ' -f2-` +STRDN=$($ldbsearch $CONFIGURATION $options -b "$BASEDN" -H $p://$SERVER --scope=base "(objectClass=*)" --controls=extended_dn:1:1 distinguishedName | grep 'distinguishedName: ' | cut -d ' ' -f2-) echo "STRDN: $STRDN" -STRGUID=`echo "$STRDN" | cut -d ';' -f1` +STRGUID=$(echo "$STRDN" | cut -d ';' -f1) echo "STRGUID[$STRGUID]" echo "Getting STR GUID/SID of $BASEDN" -STRDN=`$ldbsearch $CONFIGURATION $options -b "$BASEDN" -H $p://$SERVER --scope=base "(objectClass=*)" --controls=extended_dn:1:1 | grep 'dn: ' | cut -d ' ' -f2-` +STRDN=$($ldbsearch $CONFIGURATION $options -b "$BASEDN" -H $p://$SERVER --scope=base "(objectClass=*)" --controls=extended_dn:1:1 | grep 'dn: ' | cut -d ' ' -f2-) echo "STRDN: $STRDN" -STRSID=`echo "$STRDN" | cut -d ';' -f2` +STRSID=$(echo "$STRDN" | cut -d ';' -f2) echo "STRSID[$STRSID]" SPECIALDNS="$HEXGUID $STRGUID $STRSID" for SPDN in $SPECIALDNS; do echo "Search for $SPDN" - nentries=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER --scope=base -b "$SPDN" '(objectClass=*)' | grep "dn: $BASEDN" | wc -l` + nentries=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER --scope=base -b "$SPDN" '(objectClass=*)' | grep "dn: $BASEDN" | wc -l) if [ $nentries -lt 1 ]; then echo "Special search returned 0 items" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi done echo "Search using OIDs instead of names" -nentries1=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectClass=user)' name | grep "^name: " | wc -l` -nentries2=`$ldbsearch $options $CONFIGURATION -H $p://$SERVER '(2.5.4.0=1.2.840.113556.1.5.9)' name | grep "^name: " | wc -l` +nentries1=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectClass=user)' name | grep "^name: " | wc -l) +nentries2=$($ldbsearch $options $CONFIGURATION -H $p://$SERVER '(2.5.4.0=1.2.840.113556.1.5.9)' name | grep "^name: " | wc -l) if [ $nentries1 -lt 1 ]; then echo "Error: Searching user via (objectClass=user): '$nentries1' < 1" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi if [ $nentries2 -lt 1 ]; then echo "Error: Searching user via (2.5.4.0=1.2.840.113556.1.5.9) '$nentries2' < 1" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi if [ x"$nentries1" != x"$nentries2" ]; then echo "Error: Searching user with OIDS[$nentries1] doesn't return the same as STRINGS[$nentries2]" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi exit $failed diff --git a/testprogs/blackbox/test_ldb_simple.sh b/testprogs/blackbox/test_ldb_simple.sh index 604c4a6d53b..433bacdaf5c 100755 --- a/testprogs/blackbox/test_ldb_simple.sh +++ b/testprogs/blackbox/test_ldb_simple.sh @@ -1,22 +1,22 @@ #!/bin/sh if [ $# -lt 2 ]; then -cat <<EOF + cat <<EOF Usage: test_ldb_simple.sh PROTOCOL SERVER [OPTIONS] EOF -exit 1; + exit 1 fi - p=$1 SERVER=$2 PREFIX=$3 shift 2 options="$*" -. `dirname $0`/subunit.sh +. $(dirname $0)/subunit.sh -check() { +check() +{ name="$1" shift cmdline="$*" @@ -27,7 +27,7 @@ check() { echo "success: $name" else echo "failure: $name" - failed=`expr $failed + 1` + failed=$(expr $failed + 1) fi return $status } @@ -36,6 +36,6 @@ export PATH="$BINDIR:$PATH" ldbsearch="$VALGRIND ldbsearch" -check "currentTime" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base currentTime || failed=`expr $failed + 1` +check "currentTime" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER --scope=base currentTime || failed=$(expr $failed + 1) exit $failed diff --git a/testprogs/blackbox/test_net_ads.sh b/testprogs/blackbox/test_net_ads.sh index cfafb945b62..7b83cc7c381 100755 --- a/testprogs/blackbox/test_net_ads.sh +++ b/testprogs/blackbox/test_net_ads.sh @@ -1,8 +1,8 @@ if [ $# -lt 4 ]; then -cat <<EOF + cat <<EOF Usage: test_net.sh DC_SERVER DC_USERNAME DC_PASSWORD PREFIX_ABS EOF -exit 1; + exit 1 fi DC_SERVER=$1 @@ -10,12 +10,12 @@ DC_USERNAME=$2 DC_PASSWORD=$3 BASEDIR=$4 -HOSTNAME=`dd if=/dev/urandom bs=1 count=32 2>/dev/null | sha1sum | cut -b 1-10` +HOSTNAME=$(dd if=/dev/urandom bs=1 count=32 2>/dev/null | sha1sum | cut -b 1-10) -RUNDIR=`pwd` +RUNDIR=$(pwd) cd $BASEDIR -WORKDIR=`mktemp -d -p .` -WORKDIR=`basename $WORKDIR` +WORKDIR=$(mktemp -d -p .) +WORKDIR=$(basename $WORKDIR) cp -a client/* $WORKDIR/ sed -ri "s@(dir|directory) = (.*)/client/@\1 = \2/$WORKDIR/@" $WORKDIR/client.conf sed -ri "s/netbios name = .*/netbios name = $HOSTNAME/" $WORKDIR/client.conf @@ -47,9 +47,9 @@ if [ -x "$BINDIR/ldbmodify" ]; then fi # Load test functions -. `dirname $0`/subunit.sh +. $(dirname $0)/subunit.sh -testit "join" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +testit "join" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1) workgroup=$(awk '/workgroup =/ { print $NR }' "${BASEDIR}/${WORKDIR}/client.conf") testit "local krb5.conf created" \ @@ -57,37 +57,37 @@ testit "local krb5.conf created" \ "${BASEDIR}/${WORKDIR}/lockdir/smb_krb5/krb5.conf.${workgroup}" || failed=$((failed + 1)) -testit "testjoin" $VALGRIND $net_tool ads testjoin -P --use-kerberos=required || failed=`expr $failed + 1` +testit "testjoin" $VALGRIND $net_tool ads testjoin -P --use-kerberos=required || failed=$(expr $failed + 1) netbios=$(grep "netbios name" $BASEDIR/$WORKDIR/client.conf | cut -f2 -d= | awk '{$1=$1};1') -testit "test setspn list $netbios" $VALGRIND $net_tool ads setspn list $netbios -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +testit "test setspn list $netbios" $VALGRIND $net_tool ads setspn list $netbios -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1) spn="foo" -testit_expect_failure "test setspn add illegal windows spn ($spn)" $VALGRIND $net_tool ads setspn add $spn -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +testit_expect_failure "test setspn add illegal windows spn ($spn)" $VALGRIND $net_tool ads setspn add $spn -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1) spn="foo/somehost.domain.com" -testit "test setspn add ($spn)" $VALGRIND $net_tool ads setspn add $spn -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +testit "test setspn add ($spn)" $VALGRIND $net_tool ads setspn add $spn -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1) found=$($net_tool ads setspn list -U$DC_USERNAME%$DC_PASSWORD | grep $spn | wc -l) -testit "test setspn list shows the newly added spn ($spn)" test $found -eq 1 || failed=`expr $failed + 1` +testit "test setspn list shows the newly added spn ($spn)" test $found -eq 1 || failed=$(expr $failed + 1) up_spn=$(echo $spn | tr '[:lower:]' '[:upper:]') -testit_expect_failure "test setspn add existing (case-insensitive) spn ($spn)" $VALGRIND $net_tool ads setspn add $up_spn -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +testit_expect_failure "test setspn add existing (case-insensitive) spn ($spn)" $VALGRIND $net_tool ads setspn add $up_spn -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1) -testit "test setspn delete existing (case-insensitive) ($spn)" $VALGRIND $net_tool ads setspn delete $spn -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +testit "test setspn delete existing (case-insensitive) ($spn)" $VALGRIND $net_tool ads setspn delete $spn -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1) -found=$($net_tool ads setspn list -U$DC_USERNAME%$DC_PASSWORD | grep $spn | wc -l) -testit "test setspn list shows the newly deleted spn ($spn) is gone" test $found -eq 0 || failed=`expr $failed + 1` +found=$($net_tool ads setspn list -U$DC_USERNAME%$DC_PASSWORD | grep $spn | wc -l) +testit "test setspn list shows the newly deleted spn ($spn) is gone" test $found -eq 0 || failed=$(expr $failed + 1) -testit "changetrustpw" $VALGRIND $net_tool ads changetrustpw || failed=`expr $failed + 1` +testit "changetrustpw" $VALGRIND $net_tool ads changetrustpw || failed=$(expr $failed + 1) -testit "leave" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=`expr $failed + 1` +testit "leave" $VALGRIND $net_tool ads leave -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1) # Test with kerberos method = secrets and keytab dedicated_keytab_file="$PREFIX_ABS/test_net_ads_dedicated_krb5.keytab" -testit "join (dedicated keytab)" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` +testit "join (dedicated keytab)" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=$(expr $failed + 1) -testit "testjoin (dedicated keytab)" $VALGRIND $net_tool ads testjoin -P --use-kerberos=required || failed=`expr $failed + 1` +testit "testjoin (dedicated keytab)" $VALGRIND $net_tool ads testjoin -P --use-kerberos=required || failed=$(expr $failed + 1) netbios=$(grep "netbios name" $BASEDIR/$WORKDIR/client.conf | cut -f2 -d= | awk '{$1=$1};1') uc_netbios=$(echo $netbios | tr '[:lower:]' '[:upper:]') @@ -95,181 +95,180 @@ lc_realm=$(echo $REALM | tr '[:upper:]' '[:lower:]') fqdn="$netbios.$lc_realm" krb_princ="primary/instance@$REALM" -testit "test (dedicated keytab) add a fully qualified krb5 principal" $VALGRIND $net_tool ads keytab add $krb_princ -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` +testit "test (dedicated keytab) add a fully qualified krb5 principal" $VALGRIND $net_tool ads keytab add $krb_princ -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=$(expr $failed + 1) -found=`$net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $krb_princ | wc -l` +found=$($net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $krb_princ | wc -l) -testit "test (dedicated keytab) at least one fully qualified krb5 principal that was added is present in keytab" test $found -gt 1 || failed=`expr $failed + 1` +testit "test (dedicated keytab) at least one fully qualified krb5 principal that was added is present in keytab" test $found -gt 1 || failed=$(expr $failed + 1) machinename="machine123" -testit "test (dedicated keytab) add a kerberos prinicple created from machinename to keytab" $VALGRIND $net_tool ads keytab add $machinename'$' -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` +testit "test (dedicated keytab) add a kerberos prinicple created from machinename to keytab" $VALGRIND $net_tool ads keytab add $machinename'$' -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=$(expr $failed + 1) search_str="$machinename\$@$REALM" -found=`$net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l` -testit "test (dedicated keytab) at least one krb5 principal created from $machinename added is present in keytab" test $found -gt 1 || failed=`expr $failed + 1` +found=$($net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l) +testit "test (dedicated keytab) at least one krb5 principal created from $machinename added is present in keytab" test $found -gt 1 || failed=$(expr $failed + 1) service="nfs" -testit "test (dedicated keytab) add a $service service to keytab" $VALGRIND $net_tool ads keytab add $service -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` +testit "test (dedicated keytab) add a $service service to keytab" $VALGRIND $net_tool ads keytab add $service -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=$(expr $failed + 1) search_str="$service/$fqdn@$REALM" -found=`$net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l` -testit "test (dedicated keytab) at least one (long form) krb5 principal created from service added is present in keytab" test $found -gt 1 || failed=`expr $failed + 1` +found=$($net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l) +testit "test (dedicated keytab) at least one (long form) krb5 principal created from service added is present in keytab" test $found -gt 1 || failed=$(expr $failed + 1) search_str="$service/$uc_netbios@$REALM" -found=`$net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l` -testit "test (dedicated keytab) at least one (shorter form) krb5 principal created from service added is present in keytab" test $found -gt 1 || failed=`expr $failed + 1` +found=$($net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l) +testit "test (dedicated keytab) at least one (shorter form) krb5 principal created from service added is present in keytab" test $found -gt 1 || failed=$(expr $failed + 1) spn_service="random_srv" spn_host="somehost.subdomain.domain" spn_port="12345" windows_spn="$spn_service/$spn_host" -testit "test (dedicated keytab) add a $windows_spn windows style SPN to keytab" $VALGRIND $net_tool ads keytab add $windows_spn -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` +testit "test (dedicated keytab) add a $windows_spn windows style SPN to keytab" $VALGRIND $net_tool ads keytab add $windows_spn -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=$(expr $failed + 1) search_str="$spn_service/$spn_host@$REALM" -found=`$net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l` -testit "test (dedicated keytab) at least one krb5 principal created from windown SPN added is present in keytab" test $found -gt 1 || failed=`expr $failed + 1` +found=$($net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l) +testit "test (dedicated keytab) at least one krb5 principal created from windown SPN added is present in keytab" test $found -gt 1 || failed=$(expr $failed + 1) windows_spn="$spn_service/$spn_host:$spn_port" -testit "test (dedicated keytab) add a $windows_spn windows style SPN to keytab" $VALGRIND $net_tool ads keytab add $windows_spn -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=`expr $failed + 1` +testit "test (dedicated keytab) add a $windows_spn windows style SPN to keytab" $VALGRIND $net_tool ads keytab add $windows_spn -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" || failed=$(expr $failed + 1) search_str="$spn_service/$spn_host@$REALM" -found=`$net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l` -testit "test (dedicated keytab) at least one krb5 principal created from windown SPN (with port) added is present in keytab" test $found -gt 1 || failed=`expr $failed + 1` +found=$($net_tool ads keytab list -U$DC_USERNAME%$DC_PASSWORD --option="kerberosmethod=dedicatedkeytab" --option="dedicatedkeytabfile=$dedicated_keytab_file" | grep $search_str | wc -l) -- Samba Shared Repository