The branch, master has been updated
via 042141efdb5 third_party: Reformat shell scripts
via bb2e0622f04 testsuite: Reformat shell scripts
via db8849ea05e testprogs: Reformat upgradeprovision-oldrelease.sh
via c1325fc1fdc testprogs: Reformat tombstones-expunge.sh
via 022f5aa77b8 testprogs: Reformat test_wintest.sh
via 1c89bdb6a90 testprogs: Reformat test_weak_disable_ntlmssp_ldap.sh
via 4973baf665f testprogs: Reformat test_weak_crypto_server.sh
via 34322c499ee testprogs: Reformat test_weak_crypto.sh
via 138e7f0505b testprogs: Reformat test_trust_utils.sh
via 8c65813c4a5 testprogs: Reformat test_trust_user_account.sh
via eced0939154 testprogs: Reformat test_trust_token.sh
via 12d67003cee testprogs: Reformat test_trust_ntlm.sh
from 854a45ca24a testprogs: Reformat test_special_group.sh
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 042141efdb56d1e8d9f0246c9dff3a6c4329b8d4
Author: Andreas Schneider <a...@samba.org>
Date: Wed Feb 23 12:11:07 2022 +0100
third_party: Reformat shell scripts
shfmt -w -p -i 0 -fn third_party/update.sh
shfmt -w -p -i 0 -fn third_party/waf/update.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 14:14:04 UTC 2022 on sn-devel-184
commit bb2e0622f04355bc3c8ac7dc8d0d6dcf7a66b107
Author: Andreas Schneider <a...@samba.org>
Date: Wed Feb 23 12:12:09 2022 +0100
testsuite: Reformat shell scripts
shfmt -f testsuite/ | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit db8849ea05ec9b5e7a6873d576b3469ddf77f8af
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:06 2022 +0200
testprogs: Reformat upgradeprovision-oldrelease.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/upgradeprovision-oldrelease.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit c1325fc1fdc2e4684c934d14f0d395ed8cfab66a
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:06 2022 +0200
testprogs: Reformat tombstones-expunge.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/tombstones-expunge.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit 022f5aa77b828c460530ae03e18fdc92ae525257
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:06 2022 +0200
testprogs: Reformat test_wintest.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_wintest.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit 1c89bdb6a900b6184f53a27d5d5ea01221969418
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:06 2022 +0200
testprogs: Reformat test_weak_disable_ntlmssp_ldap.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_weak_disable_ntlmssp_ldap.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit 4973baf665fda140fb861adc9127e7a3a0799c9b
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:06 2022 +0200
testprogs: Reformat test_weak_crypto_server.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_weak_crypto_server.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit 34322c499ee996b75e82da6a18fe6c59f2fb66b1
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:06 2022 +0200
testprogs: Reformat test_weak_crypto.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_weak_crypto.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit 138e7f0505bd6e54b26ac673356318f2dafc0f37
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:06 2022 +0200
testprogs: Reformat test_trust_utils.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_trust_utils.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit 8c65813c4a5ce2ffd1105ae93b9f339e3d570d65
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_trust_user_account.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_trust_user_account.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit eced0939154837d4bef7ff0d9e6c1b41dabe1948
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_trust_token.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_trust_token.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
commit 12d67003cee004b1b25ef187e89c76ec8335d255
Author: Andreas Schneider <a...@samba.org>
Date: Fri Apr 22 15:46:05 2022 +0200
testprogs: Reformat test_trust_ntlm.sh
shfmt -w -p -i 0 -fn testprogs/blackbox/test_trust_ntlm.sh
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Pavel Filipenský <pfilipen...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
testprogs/blackbox/test_trust_ntlm.sh | 90 +++---
testprogs/blackbox/test_trust_token.sh | 12 +-
testprogs/blackbox/test_trust_user_account.sh | 13 +-
testprogs/blackbox/test_trust_utils.sh | 132 ++++-----
testprogs/blackbox/test_weak_crypto.sh | 14 +-
testprogs/blackbox/test_weak_crypto_server.sh | 32 +-
.../blackbox/test_weak_disable_ntlmssp_ldap.sh | 14 +-
testprogs/blackbox/test_wintest.sh | 35 ++-
testprogs/blackbox/tombstones-expunge.sh | 323 +++++++++++----------
testprogs/blackbox/upgradeprovision-oldrelease.sh | 220 +++++++-------
testsuite/nsswitch/getent_r.sh | 15 +-
third_party/update.sh | 4 +-
third_party/waf/update.sh | 39 +--
13 files changed, 489 insertions(+), 454 deletions(-)
Changeset truncated at 500 lines:
diff --git a/testprogs/blackbox/test_trust_ntlm.sh
b/testprogs/blackbox/test_trust_ntlm.sh
index 101303ede26..12268916b3b 100755
--- a/testprogs/blackbox/test_trust_ntlm.sh
+++ b/testprogs/blackbox/test_trust_ntlm.sh
@@ -2,10 +2,10 @@
# Copyright (C) 2017 Stefan Metzmacher <me...@samba.org>
if [ $# -lt 12 ]; then
-cat <<EOF
+ cat <<EOF
Usage: $# test_trust_ntlm.sh SERVER USERNAME PASSWORD REALM DOMAIN
TRUST_USERNAME TRUST_PASSWORD TRUST_REALM TRUST_DOMAIN TYPE UNTRUSTED
TRUST_ERROR
EOF
-exit 1;
+ exit 1
fi
SERVER=$1
@@ -33,8 +33,8 @@ wbinfo="$samba4bindir/wbinfo"
unc="//$SERVER/tmp"
-. `dirname $0`/subunit.sh
-. `dirname $0`/common_test_fns.inc
+. $(dirname $0)/subunit.sh
+. $(dirname $0)/common_test_fns.inc
DNAME="$DOMAIN"
NAME="$DNAME\\$USERNAME"
@@ -44,12 +44,12 @@ WBCREDS="$WBNAME%$PASSWORD"
EXPCREDS="Account Name: $USERNAME, Authority Name: $DOMAIN"
EXPSID="(User: 1)"
EXPDSID="(Domain: 3)"
-test_rpcclient_grep "Test01 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
-test_smbclient "Test01 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
-testit "Test01 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test01 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=`expr
$failed + 1`
-testit "Test01 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test01 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=`expr
$failed + 1`
+test_rpcclient_grep "Test01 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=$(expr $failed + 1)
+test_smbclient "Test01 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
+testit "Test01 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test01 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=$(expr
$failed + 1)
+testit "Test01 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test01 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=$(expr
$failed + 1)
DNAME="$REALM"
NAME="$DNAME\\$USERNAME"
@@ -59,12 +59,12 @@ WBCREDS="$WBNAME%$PASSWORD"
EXPCREDS="Account Name: $USERNAME, Authority Name: $DOMAIN"
EXPSID="(User: 1)"
EXPDSID="(Domain: 3)"
-test_rpcclient_grep "Test02 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
-test_smbclient "Test02 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
-testit "Test02 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test02 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=`expr
$failed + 1`
-testit "Test02 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test02 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=`expr
$failed + 1`
+test_rpcclient_grep "Test02 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=$(expr $failed + 1)
+test_smbclient "Test02 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
+testit "Test02 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test02 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=$(expr
$failed + 1)
+testit "Test02 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test02 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=$(expr
$failed + 1)
CREDS="$USERNAME@$DOMAIN%$PASSWORD"
WBCREDS="$USERNAME@$DOMAIN%$PASSWORD"
@@ -72,14 +72,14 @@ if [ x"$TYPE" = x"member" ]; then
EXPFAIL="NT_STATUS_LOGON_FAILURE"
# rpcclient doesn't handle -Uuser@domain yet
#test_rpcclient_expect_failure_grep "Fail03 rpcclient getusername with
$CREDS" getusername "$SERVER" "$EXPFAIL" -U$CREDS && failed=`expr $failed + 1`
- test_smbclient_expect_failure "Fail03 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=`expr $failed + 1`
+ test_smbclient_expect_failure "Fail03 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit_expect_failure "Fail03 wbinfo -a with $WBCREDS" $VALGRIND
$wbinfo -a $WBCREDS && failed=`expr $failed + 1`
else
EXPCREDS="Account Name: $USERNAME, Authority Name: $DOMAIN"
# rpcclient doesn't handle -Uuser@domain yet
#test_rpcclient_grep "Test03 rpcclient getusername with $CREDS"
getusername "$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
- test_smbclient "Test03 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
+ test_smbclient "Test03 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit "Test03 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS
|| failed=`expr $failed + 1`
fi
@@ -90,14 +90,14 @@ if [ x"$TYPE" = x"member" ]; then
EXPFAIL="NT_STATUS_LOGON_FAILURE"
# rpcclient doesn't handle -Uuser@domain yet
#test_rpcclient_expect_failure_grep "Fail04 rpcclient getusername with
$CREDS" getusername "$SERVER" "$EXPFAIL" -U$CREDS && failed=`expr $failed + 1`
- test_smbclient_expect_failure "Fail04 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=`expr $failed + 1`
+ test_smbclient_expect_failure "Fail04 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit_expect_failure "Fail04 wbinfo -a with $WBCREDS" $VALGRIND
$wbinfo -a $WBCREDS && failed=`expr $failed + 1`
else
EXPCREDS="Account Name: $USERNAME, Authority Name: $DOMAIN"
# rpcclient doesn't handle -Uuser@domain yet
#test_rpcclient_grep "Test04 rpcclient getusername with $CREDS"
getusername "$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
- test_smbclient "Test04 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
+ test_smbclient "Test04 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit "Test04 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS
|| failed=`expr $failed + 1`
fi
@@ -110,19 +110,19 @@ WBCREDS="$WBNAME%$PASSWORD"
EXPCREDS="Account Name: $USERNAME, Authority Name: $DOMAIN"
EXPSID="NT_STATUS_NONE_MAPPED"
EXPDSID="NT_STATUS_NONE_MAPPED"
-test_rpcclient_grep "Test05 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
-test_smbclient "Test05 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
-testit_expect_failure "Fail05 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a
$WBCREDS || failed=`expr $failed + 1`
-test_rpcclient_expect_failure_grep "Test05 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=`expr
$failed + 1`
-testit_expect_failure "Test05 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n
"$WBNAME" || failed=`expr $failed + 1`
-test_rpcclient_expect_failure_grep "Test05 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=`expr
$failed + 1`
+test_rpcclient_grep "Test05 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=$(expr $failed + 1)
+test_smbclient "Test05 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
+testit_expect_failure "Fail05 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a
$WBCREDS || failed=$(expr $failed + 1)
+test_rpcclient_expect_failure_grep "Test05 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=$(expr
$failed + 1)
+testit_expect_failure "Test05 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n
"$WBNAME" || failed=$(expr $failed + 1)
+test_rpcclient_expect_failure_grep "Test05 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=$(expr
$failed + 1)
CREDS="$TRUST_DOMAIN\\$USERNAME%$PASSWORD"
WBCREDS="$TRUST_DOMAIN/$USERNAME%$PASSWORD"
EXPFAIL="$TRUST_ERROR"
-test_rpcclient_expect_failure_grep "Fail06 rpcclient getusername with $CREDS"
getusername "$SERVER" "$EXPFAIL" -U$CREDS && failed=`expr $failed + 1`
-test_smbclient_expect_failure "Fail06 smbclient with $CREDS" 'ls' "$unc"
-U$CREDS && failed=`expr $failed + 1`
-testit_expect_failure "Fail06 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a
$WBCREDS && failed=`expr $failed + 1`
+test_rpcclient_expect_failure_grep "Fail06 rpcclient getusername with $CREDS"
getusername "$SERVER" "$EXPFAIL" -U$CREDS && failed=$(expr $failed + 1)
+test_smbclient_expect_failure "Fail06 smbclient with $CREDS" 'ls' "$unc"
-U$CREDS && failed=$(expr $failed + 1)
+testit_expect_failure "Fail06 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a
$WBCREDS && failed=$(expr $failed + 1)
DNAME="$TRUST_DOMAIN"
NAME="$DNAME\\$TRUST_USERNAME"
@@ -132,12 +132,12 @@ WBCREDS="$WBNAME%$TRUST_PASSWORD"
EXPCREDS="Account Name: $TRUST_USERNAME, Authority Name: $TRUST_DOMAIN"
EXPSID="(User: 1)"
EXPDSID="(Domain: 3)"
-test_rpcclient_grep "Test07 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
-test_smbclient "Test07 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
-testit "Test07 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test07 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=`expr
$failed + 1`
-testit "Test07 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test07 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=`expr
$failed + 1`
+test_rpcclient_grep "Test07 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=$(expr $failed + 1)
+test_smbclient "Test07 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
+testit "Test07 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test07 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=$(expr
$failed + 1)
+testit "Test07 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test07 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=$(expr
$failed + 1)
DNAME="$TRUST_REALM"
NAME="$DNAME\\$TRUST_USERNAME"
@@ -147,12 +147,12 @@ WBCREDS="$WBNAME%$TRUST_PASSWORD"
EXPCREDS="Account Name: $TRUST_USERNAME, Authority Name: $TRUST_DOMAIN"
EXPSID="(User: 1)"
EXPDSID="(Domain: 3)"
-test_rpcclient_grep "Test08 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
-test_smbclient "Test08 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
-testit "Test08 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test08 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=`expr
$failed + 1`
-testit "Test08 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=`expr $failed + 1`
-test_rpcclient_grep "Test08 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=`expr
$failed + 1`
+test_rpcclient_grep "Test08 rpcclient getusername with $CREDS" getusername
"$SERVER" "$EXPCREDS" -U$CREDS || failed=$(expr $failed + 1)
+test_smbclient "Test08 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
+testit "Test08 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test08 rpcclient lookupnames with $NAME"
"lookupnames_level 1 '$NAME'" "$SERVER" "$EXPSID" -U$CREDS || failed=$(expr
$failed + 1)
+testit "Test08 wbinfo -n with $WBNAME" $VALGRIND $wbinfo -n "$WBNAME" ||
failed=$(expr $failed + 1)
+test_rpcclient_grep "Test08 rpcclient lookupnames with $DNAME"
"lookupnames_level 1 '$DNAME'" "$SERVER" "$EXPDSID" -U$CREDS || failed=$(expr
$failed + 1)
CREDS="$TRUST_USERNAME@$TRUST_DOMAIN%$TRUST_PASSWORD"
WBCREDS="$TRUST_USERNAME@$TRUST_DOMAIN%$TRUST_PASSWORD"
@@ -161,14 +161,14 @@ if [ x"$TRUST_REALM" = x"$TRUST_DOMAIN" ]; then
EXPFAIL="NT_STATUS_LOGON_FAILURE"
# rpcclient doesn't handle -Uuser@domain yet
#test_rpcclient_expect_failure_grep "Fail09 rpcclient getusername with
$CREDS" getusername "$SERVER" "$EXPFAIL" -U$CREDS && failed=`expr $failed + 1`
- test_smbclient_expect_failure "Fail09 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=`expr $failed + 1`
+ test_smbclient_expect_failure "Fail09 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit_expect_failure "Fail09 wbinfo -a with $WBCREDS" $VALGRIND
$wbinfo -a $WBCREDS && failed=`expr $failed + 1`
else
EXPCREDS="Account Name: $TRUST_USERNAME, Authority Name: $TRUST_DOMAIN"
# rpcclient doesn't handle -Uuser@domain yet
#test_rpcclient_grep "Test09 rpcclient getusername with $CREDS"
getusername "$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
- test_smbclient "Test09 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
+ test_smbclient "Test09 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit "Test09 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS
|| failed=`expr $failed + 1`
fi
@@ -180,14 +180,14 @@ if [ x"$TRUST_REALM" = x"$TRUST_DOMAIN" ]; then
EXPFAIL="NT_STATUS_LOGON_FAILURE"
# rpcclient doesn't handle -Uuser@domain yet
#test_rpcclient_expect_failure_grep "Fail10 rpcclient getusername with
$CREDS" getusername "$SERVER" "$EXPFAIL" -U$CREDS && failed=`expr $failed + 1`
- test_smbclient_expect_failure "Fail10 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=`expr $failed + 1`
+ test_smbclient_expect_failure "Fail10 smbclient with $CREDS" 'ls'
"$unc" -U$CREDS && failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit_expect_failure "Fail10 wbinfo -a with $WBCREDS" $VALGRIND
$wbinfo -a $WBCREDS && failed=`expr $failed + 1`
else
EXPCREDS="Account Name: $TRUST_USERNAME, Authority Name: $TRUST_DOMAIN"
# rpcclient doesn't handle -Uuser@domain yet, maybe smbclient for now?
#test_rpcclient_grep "Test10 rpcclient getusername with $CREDS"
getusername "$SERVER" "$EXPCREDS" -U$CREDS || failed=`expr $failed + 1`
- test_smbclient "Test10 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=`expr $failed + 1`
+ test_smbclient "Test10 smbclient with $CREDS" 'ls' "$unc" -U$CREDS ||
failed=$(expr $failed + 1)
# winbindd doesn't handle user@domain yet
#testit "Test10 wbinfo -a with $WBCREDS" $VALGRIND $wbinfo -a $WBCREDS
|| failed=`expr $failed + 1`
fi
diff --git a/testprogs/blackbox/test_trust_token.sh
b/testprogs/blackbox/test_trust_token.sh
index 21de2244c1b..7a41f11faaa 100755
--- a/testprogs/blackbox/test_trust_token.sh
+++ b/testprogs/blackbox/test_trust_token.sh
@@ -2,10 +2,10 @@
# Copyright (C) 2017 Stefan Metzmacher <me...@samba.org>
if [ $# -lt 12 ]; then
-cat <<EOF
+ cat <<EOF
Usage: $# test_trust_token.sh SERVER USERNAME PASSWORD REALM DOMAIN DOMSID
TRUST_USERNAME TRUST_PASSWORD TRUST_REALM TRUST_DOMAIN TRUST_DOMSID TYPE
EOF
-exit 1;
+ exit 1
fi
SERVER=$1
@@ -30,8 +30,8 @@ samba4bindir="$BINDIR"
ldbsearch="$samba4bindir/ldbsearch"
-. `dirname $0`/subunit.sh
-. `dirname $0`/common_test_fns.inc
+. $(dirname $0)/subunit.sh
+. $(dirname $0)/common_test_fns.inc
test_token()
{
@@ -86,8 +86,8 @@ test_token()
return 0
}
-testit "Test token with kerberos" test_token "yes" "" || failed=`expr $failed
+ 1`
+testit "Test token with kerberos" test_token "yes" "" || failed=$(expr $failed
+ 1)
# Check that SID_NT_NTLM_AUTHENTICATION(S-1-5-64-10) is added for NTLMSSP
-testit "Test token with NTLMSSP" test_token "no" "S-1-5-64-10" || failed=`expr
$failed + 1`
+testit "Test token with NTLMSSP" test_token "no" "S-1-5-64-10" ||
failed=$(expr $failed + 1)
exit $failed
diff --git a/testprogs/blackbox/test_trust_user_account.sh
b/testprogs/blackbox/test_trust_user_account.sh
index 63024a9b158..94a3aa3e9ba 100755
--- a/testprogs/blackbox/test_trust_user_account.sh
+++ b/testprogs/blackbox/test_trust_user_account.sh
@@ -1,10 +1,10 @@
#!/bin/sh
if [ $# -lt 1 ]; then
-cat <<EOF
+ cat <<EOF
Usage: test_trust_user_account.sh PREFIX OUR_REALM OUR_FLAT REMOTE_REALM
REMOTE_FLAT
EOF
-exit 1;
+ exit 1
fi
PREFIX="$1"
@@ -14,8 +14,7 @@ REMOTE_REALM="$4"
REMOTE_FLAT="$5"
shift 5
-. `dirname $0`/subunit.sh
-
+. $(dirname $0)/subunit.sh
samba_tool="$BINDIR/samba-tool"
samba4bindir="$BINDIR"
@@ -30,7 +29,7 @@ KEYTAB="$PREFIX/tmptda.keytab"
KRB5_TRACE=/dev/stderr
export KRB5_TRACE
-testit "retrieve keytab for TDA of $REMOTE_REALM" $PYTHON $samba_tool domain
exportkeytab $KEYTAB $CONFIGURATION --principal "$REMOTE_FLAT\$@$OUR_REALM" ||
failed=`expr $failed + 1`
+testit "retrieve keytab for TDA of $REMOTE_REALM" $PYTHON $samba_tool domain
exportkeytab $KEYTAB $CONFIGURATION --principal "$REMOTE_FLAT\$@$OUR_REALM" ||
failed=$(expr $failed + 1)
KRB5CCNAME="$PREFIX/tmptda.ccache"
samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
@@ -50,9 +49,9 @@ EXPECTED_SALT="${OUR_REALM}krbtgt${REMOTE_FLAT}"
# "^virtualKerberosSalt: ${EXPECTED_SALT}\\\$\$"
#
EXPECTED_GREP="^virtualKerberosSalt: ${EXPECTED_SALT}\$"
-testit_grep "get virtualKerberosSalt for TDA of $REMOTE_FLAT\$"
"$EXPECTED_GREP" $PYTHON $samba_tool user getpassword "$REMOTE_FLAT\$"
$CONFIGURATION --attributes=virtualKerberosSalt || failed=`expr $failed + 1`
+testit_grep "get virtualKerberosSalt for TDA of $REMOTE_FLAT\$"
"$EXPECTED_GREP" $PYTHON $samba_tool user getpassword "$REMOTE_FLAT\$"
$CONFIGURATION --attributes=virtualKerberosSalt || failed=$(expr $failed + 1)
-testit "kinit with keytab for TDA of $REMOTE_REALM" $samba4kinit -t $KEYTAB
"$REMOTE_FLAT\$@$OUR_REALM" || failed=`expr $failed + 1`
+testit "kinit with keytab for TDA of $REMOTE_REALM" $samba4kinit -t $KEYTAB
"$REMOTE_FLAT\$@$OUR_REALM" || failed=$(expr $failed + 1)
rm -f $KRB5CCNAME $KEYTAB
diff --git a/testprogs/blackbox/test_trust_utils.sh
b/testprogs/blackbox/test_trust_utils.sh
index 7da1e05598f..3bd375a1fbc 100755
--- a/testprogs/blackbox/test_trust_utils.sh
+++ b/testprogs/blackbox/test_trust_utils.sh
@@ -2,10 +2,10 @@
# Copyright (C) 2015 Stefan Metzmacher <me...@samba.org>
if [ $# -lt 12 ]; then
-cat <<EOF
+ cat <<EOF
Usage: $# test_trust_utils.sh SERVER USERNAME PASSWORD REALM DOMAIN
TRUST_USERNAME TRUST_PASSWORD TRUST_REALM TRUST_DOMAIN PREFIX TYPE
EOF
-exit 1;
+ exit 1
fi
SERVER=$1
@@ -29,7 +29,7 @@ samba4bindir="$BINDIR"
samba_tool="$samba4bindir/samba-tool"
-. `dirname $0`/subunit.sh
+. $(dirname $0)/subunit.sh
CREDS="${DOMAIN}\\${USERNAME}%${PASSWORD}"
TRUST_CREDS_DOMAIN="${TRUST_DOMAIN}\\${TRUST_USERNAME}%${TRUST_PASSWORD}"
@@ -39,106 +39,106 @@
TRUST_CREDS_REALM="${TRUST_REALM}\\${TRUST_USERNAME}%${TRUST_PASSWORD}"
TRUST_SERVER_CREDS_REALM_ARGS="--local-dc-ipaddress ${TRUST_SERVER}
--local-dc-username ${TRUST_CREDS_REALM}"
list="$VALGRIND $PYTHON $samba_tool domain trust list"
-testit "list domains default" $list || failed=`expr $failed + 1`
+testit "list domains default" $list || failed=$(expr $failed + 1)
# Show that the domain name and realm work
-testit "list domains reverse (DOMAIN)" $list ${TRUST_SERVER_CREDS_DOMAIN_ARGS}
|| failed=`expr $failed + 1`
-testit "list domains reverse (REALM)" $list ${TRUST_SERVER_CREDS_REALM_ARGS}
|| failed=`expr $failed + 1`
+testit "list domains reverse (DOMAIN)" $list ${TRUST_SERVER_CREDS_DOMAIN_ARGS}
|| failed=$(expr $failed + 1)
+testit "list domains reverse (REALM)" $list ${TRUST_SERVER_CREDS_REALM_ARGS}
|| failed=$(expr $failed + 1)
show="$VALGRIND $PYTHON $samba_tool domain trust show"
-testit "show domains default realm" $show ${TRUST_REALM} || failed=`expr
$failed + 1`
-testit "show domains reverse realm" $show ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=`expr $failed + 1`
-testit "show domains default netbios" $show ${TRUST_DOMAIN} || failed=`expr
$failed + 1`
-testit "show domains reverse netbios" $show ${DOMAIN}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=`expr $failed + 1`
+testit "show domains default realm" $show ${TRUST_REALM} || failed=$(expr
$failed + 1)
+testit "show domains reverse realm" $show ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=$(expr $failed + 1)
+testit "show domains default netbios" $show ${TRUST_DOMAIN} || failed=$(expr
$failed + 1)
+testit "show domains reverse netbios" $show ${DOMAIN}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=$(expr $failed + 1)
validate="$VALGRIND $PYTHON $samba_tool domain trust validate"
-testit "validate trust default both" $validate ${TRUST_REALM}
-U${TRUST_CREDS_DOMAIN}|| failed=`expr $failed + 1`
-testit "validate trust default local" $validate ${TRUST_REALM}
--validate-location=local || failed=`expr $failed + 1`
-testit "validate trust reverse both" $validate ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} -U${CREDS} || failed=`expr $failed + 1`
-testit "validate trust reverse local" $validate ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --validate-location=local || failed=`expr
$failed + 1`
+testit "validate trust default both" $validate ${TRUST_REALM}
-U${TRUST_CREDS_DOMAIN} || failed=$(expr $failed + 1)
+testit "validate trust default local" $validate ${TRUST_REALM}
--validate-location=local || failed=$(expr $failed + 1)
+testit "validate trust reverse both" $validate ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} -U${CREDS} || failed=$(expr $failed + 1)
+testit "validate trust reverse local" $validate ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --validate-location=local || failed=$(expr
$failed + 1)
namespaces="$VALGRIND $PYTHON $samba_tool domain trust namespaces"
-testit "namespaces own default" $namespaces || failed=`expr $failed + 1`
-testit "namespaces own reverse" $namespaces ${TRUST_SERVER_CREDS_DOMAIN_ARGS}
|| failed=`expr $failed + 1`
+testit "namespaces own default" $namespaces || failed=$(expr $failed + 1)
+testit "namespaces own reverse" $namespaces ${TRUST_SERVER_CREDS_DOMAIN_ARGS}
|| failed=$(expr $failed + 1)
-DOMSID=`$namespaces | grep LocalDomain | sed -e 's!.*SID\[\(.*\)\].*!\1!'`
+DOMSID=$($namespaces | grep LocalDomain | sed -e 's!.*SID\[\(.*\)\].*!\1!')
#testit_expect_failure "namespaces domsid default" echo ${DOMSID} ||
failed=`expr $failed + 1`
-TRUST_DOMSID=`$namespaces ${TRUST_SERVER_CREDS_DOMAIN_ARGS} | grep LocalDomain
| sed -e 's!.*SID\[\(.*\)\].*!\1!'`
+TRUST_DOMSID=$($namespaces ${TRUST_SERVER_CREDS_DOMAIN_ARGS} | grep
LocalDomain | sed -e 's!.*SID\[\(.*\)\].*!\1!')
#testit_expect_failure "namespaces domsid reverse" echo ${TRUST_DOMSID} ||
failed=`expr $failed + 1`
if test x$TYPE = x"forest"; then
- testit "namespaces trust default realm 1" $namespaces ${TRUST_REALM} ||
failed=`expr $failed + 1`
- testit "namespaces trust reverse realm 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=`expr $failed + 1`
+ testit "namespaces trust default realm 1" $namespaces ${TRUST_REALM} ||
failed=$(expr $failed + 1)
+ testit "namespaces trust reverse realm 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=$(expr $failed + 1)
- testit "namespaces trust default domain 1" $namespaces ${TRUST_DOMAIN}
|| failed=`expr $failed + 1`
- testit "namespaces trust reverse domain 1" $namespaces ${DOMAIN}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=`expr $failed + 1`
+ testit "namespaces trust default domain 1" $namespaces ${TRUST_DOMAIN}
|| failed=$(expr $failed + 1)
+ testit "namespaces trust reverse domain 1" $namespaces ${DOMAIN}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=$(expr $failed + 1)
- testit "namespaces own default add-upn-suffix 1" $namespaces
--add-upn-suffix=default.test_trust_utils.example.com || failed=`expr $failed +
1`
- testit "namespaces own reverse add-upn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--add-upn-suffix=reverse.test_trust_utils.example.com || failed=`expr $failed +
1`
+ testit "namespaces own default add-upn-suffix 1" $namespaces
--add-upn-suffix=default.test_trust_utils.example.com || failed=$(expr $failed
+ 1)
+ testit "namespaces own reverse add-upn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--add-upn-suffix=reverse.test_trust_utils.example.com || failed=$(expr $failed
+ 1)
- testit "namespaces own default add-upn-suffix 2" $namespaces
--add-upn-suffix=${TRUST_REALM} || failed=`expr $failed + 1`
- testit "namespaces own reverse add-upn-suffix 2" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --add-upn-suffix=${REALM} || failed=`expr
$failed + 1`
+ testit "namespaces own default add-upn-suffix 2" $namespaces
--add-upn-suffix=${TRUST_REALM} || failed=$(expr $failed + 1)
+ testit "namespaces own reverse add-upn-suffix 2" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --add-upn-suffix=${REALM} || failed=$(expr
$failed + 1)
- testit "namespaces own default add-spn-suffix 1" $namespaces
--add-spn-suffix=spn.test_trust_utils.example.com || failed=`expr $failed + 1`
- testit "namespaces own reverse add-spn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--add-spn-suffix=spn.test_trust_utils.example.com || failed=`expr $failed + 1`
+ testit "namespaces own default add-spn-suffix 1" $namespaces
--add-spn-suffix=spn.test_trust_utils.example.com || failed=$(expr $failed + 1)
+ testit "namespaces own reverse add-spn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--add-spn-suffix=spn.test_trust_utils.example.com || failed=$(expr $failed + 1)
- testit "namespaces trust default check 1" $namespaces ${TRUST_REALM}
--refresh=check || failed=`expr $failed + 1`
- testit "namespaces trust reverse check 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --refresh=check || failed=`expr $failed + 1`
+ testit "namespaces trust default check 1" $namespaces ${TRUST_REALM}
--refresh=check || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse check 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --refresh=check || failed=$(expr $failed + 1)
- testit "namespaces trust default store 1" $namespaces ${TRUST_REALM}
--refresh=store || failed=`expr $failed + 1`
- testit "namespaces trust reverse store 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --refresh=store || failed=`expr $failed + 1`
+ testit "namespaces trust default store 1" $namespaces ${TRUST_REALM}
--refresh=store || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse store 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --refresh=store || failed=$(expr $failed + 1)
- testit "namespaces trust default enable-tln 1" $namespaces
${TRUST_REALM} --enable-tln=reverse.test_trust_utils.example.com ||
failed=`expr $failed + 1`
- testit "namespaces trust reverse enable-tln 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--enable-tln=default.test_trust_utils.example.com || failed=`expr $failed + 1`
+ testit "namespaces trust default enable-tln 1" $namespaces
${TRUST_REALM} --enable-tln=reverse.test_trust_utils.example.com ||
failed=$(expr $failed + 1)
+ testit "namespaces trust reverse enable-tln 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--enable-tln=default.test_trust_utils.example.com || failed=$(expr $failed + 1)
- testit "namespaces trust default enable-tln 2" $namespaces
${TRUST_REALM} --enable-tln=spn.test_trust_utils.example.com || failed=`expr
$failed + 1`
- testit "namespaces trust reverse enable-tln 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-tln=spn.test_trust_utils.example.com
|| failed=`expr $failed + 1`
+ testit "namespaces trust default enable-tln 2" $namespaces
${TRUST_REALM} --enable-tln=spn.test_trust_utils.example.com || failed=$(expr
$failed + 1)
+ testit "namespaces trust reverse enable-tln 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-tln=spn.test_trust_utils.example.com
|| failed=$(expr $failed + 1)
- testit "namespaces trust default enable-tln 3" $namespaces
${TRUST_REALM} --enable-tln=${TRUST_REALM} || failed=`expr $failed + 1`
- testit "namespaces trust reverse enable-tln 3" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-tln=${REALM} || failed=`expr $failed
+ 1`
+ testit "namespaces trust default enable-tln 3" $namespaces
${TRUST_REALM} --enable-tln=${TRUST_REALM} || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse enable-tln 3" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-tln=${REALM} || failed=$(expr
$failed + 1)
- testit "namespaces trust default disable-nb 1" $namespaces
${TRUST_REALM} --disable-nb=${TRUST_DOMAIN} || failed=`expr $failed + 1`
- testit "namespaces trust reverse disable-nb 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --disable-nb=${DOMAIN} || failed=`expr
$failed + 1`
+ testit "namespaces trust default disable-nb 1" $namespaces
${TRUST_REALM} --disable-nb=${TRUST_DOMAIN} || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse disable-nb 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --disable-nb=${DOMAIN} || failed=$(expr
$failed + 1)
- testit "namespaces trust default disable-sid 1" $namespaces
${TRUST_REALM} --disable-sid=${TRUST_DOMSID} || failed=`expr $failed + 1`
- testit "namespaces trust reverse disable-sid 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --disable-sid=${DOMSID} || failed=`expr
$failed + 1`
+ testit "namespaces trust default disable-sid 1" $namespaces
${TRUST_REALM} --disable-sid=${TRUST_DOMSID} || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse disable-sid 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --disable-sid=${DOMSID} || failed=$(expr
$failed + 1)
- testit "namespaces trust default disable-tln 1" $namespaces
${TRUST_REALM} --disable-tln=reverse.test_trust_utils.example.com ||
failed=`expr $failed + 1`
- testit "namespaces trust reverse disable-tln 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--disable-tln=default.test_trust_utils.example.com || failed=`expr $failed + 1`
+ testit "namespaces trust default disable-tln 1" $namespaces
${TRUST_REALM} --disable-tln=reverse.test_trust_utils.example.com ||
failed=$(expr $failed + 1)
+ testit "namespaces trust reverse disable-tln 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--disable-tln=default.test_trust_utils.example.com || failed=$(expr $failed + 1)
- testit "namespaces trust default add-tln-ex 1" $namespaces
${TRUST_REALM} --add-tln-ex=exclude.${TRUST_REALM} || failed=`expr $failed + 1`
- testit "namespaces trust reverse add-tln-ex 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --add-tln-ex=exclude.${REALM} || failed=`expr
$failed + 1`
+ testit "namespaces trust default add-tln-ex 1" $namespaces
${TRUST_REALM} --add-tln-ex=exclude.${TRUST_REALM} || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse add-tln-ex 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --add-tln-ex=exclude.${REALM} ||
failed=$(expr $failed + 1)
- testit "namespaces trust default add-tln-ex 2" $namespaces
${TRUST_REALM} --add-tln-ex=sub.exclude.${TRUST_REALM} || failed=`expr $failed
+ 1`
- testit "namespaces trust reverse add-tln-ex 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --add-tln-ex=sub.exclude.${REALM} ||
failed=`expr $failed + 1`
+ testit "namespaces trust default add-tln-ex 2" $namespaces
${TRUST_REALM} --add-tln-ex=sub.exclude.${TRUST_REALM} || failed=$(expr $failed
+ 1)
+ testit "namespaces trust reverse add-tln-ex 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --add-tln-ex=sub.exclude.${REALM} ||
failed=$(expr $failed + 1)
- testit "namespaces trust default realm 2" $namespaces ${TRUST_REALM} ||
failed=`expr $failed + 1`
- testit "namespaces trust reverse realm 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=`expr $failed + 1`
+ testit "namespaces trust default realm 2" $namespaces ${TRUST_REALM} ||
failed=$(expr $failed + 1)
+ testit "namespaces trust reverse realm 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} || failed=$(expr $failed + 1)
- testit "namespaces trust default delete-tln-ex 1" $namespaces
${TRUST_REALM} --delete-tln-ex=exclude.${TRUST_REALM} || failed=`expr $failed +
1`
- testit "namespaces trust reverse delete-tln-ex 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --delete-tln-ex=exclude.${REALM} ||
failed=`expr $failed + 1`
+ testit "namespaces trust default delete-tln-ex 1" $namespaces
${TRUST_REALM} --delete-tln-ex=exclude.${TRUST_REALM} || failed=$(expr $failed
+ 1)
+ testit "namespaces trust reverse delete-tln-ex 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --delete-tln-ex=exclude.${REALM} ||
failed=$(expr $failed + 1)
- testit "namespaces trust default delete-tln-ex 2" $namespaces
${TRUST_REALM} --delete-tln-ex=sub.exclude.${TRUST_REALM} || failed=`expr
$failed + 1`
- testit "namespaces trust reverse delete-tln-ex 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --delete-tln-ex=sub.exclude.${REALM} ||
failed=`expr $failed + 1`
+ testit "namespaces trust default delete-tln-ex 2" $namespaces
${TRUST_REALM} --delete-tln-ex=sub.exclude.${TRUST_REALM} || failed=$(expr
$failed + 1)
+ testit "namespaces trust reverse delete-tln-ex 2" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --delete-tln-ex=sub.exclude.${REALM} ||
failed=$(expr $failed + 1)
- testit "namespaces own default delete-upn-suffix 1" $namespaces
--delete-upn-suffix=default.test_trust_utils.example.com || failed=`expr
$failed + 1`
- testit "namespaces own reverse delete-upn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--delete-upn-suffix=reverse.test_trust_utils.example.com || failed=`expr
$failed + 1`
+ testit "namespaces own default delete-upn-suffix 1" $namespaces
--delete-upn-suffix=default.test_trust_utils.example.com || failed=$(expr
$failed + 1)
+ testit "namespaces own reverse delete-upn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--delete-upn-suffix=reverse.test_trust_utils.example.com || failed=$(expr
$failed + 1)
- testit "namespaces own default delete-upn-suffix 2" $namespaces
--delete-upn-suffix=${TRUST_REALM} || failed=`expr $failed + 1`
- testit "namespaces own reverse delete-upn-suffix 2" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --delete-upn-suffix=${REALM} || failed=`expr
$failed + 1`
+ testit "namespaces own default delete-upn-suffix 2" $namespaces
--delete-upn-suffix=${TRUST_REALM} || failed=$(expr $failed + 1)
+ testit "namespaces own reverse delete-upn-suffix 2" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --delete-upn-suffix=${REALM} || failed=$(expr
$failed + 1)
- testit "namespaces own default delete-spn-suffix 1" $namespaces
--delete-spn-suffix=spn.test_trust_utils.example.com || failed=`expr $failed +
1`
- testit "namespaces own reverse delete-spn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--delete-spn-suffix=spn.test_trust_utils.example.com || failed=`expr $failed +
1`
+ testit "namespaces own default delete-spn-suffix 1" $namespaces
--delete-spn-suffix=spn.test_trust_utils.example.com || failed=$(expr $failed +
1)
+ testit "namespaces own reverse delete-spn-suffix 1" $namespaces
${TRUST_SERVER_CREDS_DOMAIN_ARGS}
--delete-spn-suffix=spn.test_trust_utils.example.com || failed=$(expr $failed +
1)
- testit "namespaces trust default enable-nb 1" $namespaces
${TRUST_REALM} --enable-nb=${TRUST_DOMAIN} || failed=`expr $failed + 1`
- testit "namespaces trust reverse enable-nb 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-nb=${DOMAIN} || failed=`expr $failed
+ 1`
+ testit "namespaces trust default enable-nb 1" $namespaces
${TRUST_REALM} --enable-nb=${TRUST_DOMAIN} || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse enable-nb 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-nb=${DOMAIN} || failed=$(expr
$failed + 1)
- testit "namespaces trust default enable-sid 1" $namespaces
${TRUST_REALM} --enable-sid=${TRUST_DOMSID} || failed=`expr $failed + 1`
- testit "namespaces trust reverse enable-sid 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-sid=${DOMSID} || failed=`expr
$failed + 1`
+ testit "namespaces trust default enable-sid 1" $namespaces
${TRUST_REALM} --enable-sid=${TRUST_DOMSID} || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse enable-sid 1" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --enable-sid=${DOMSID} || failed=$(expr
$failed + 1)
- testit "namespaces trust default reset final" $namespaces
${TRUST_REALM} --refresh=store --enable-all || failed=`expr $failed + 1`
- testit "namespaces trust reverse reset final" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --refresh=store --enable-all || failed=`expr
$failed + 1`
+ testit "namespaces trust default reset final" $namespaces
${TRUST_REALM} --refresh=store --enable-all || failed=$(expr $failed + 1)
+ testit "namespaces trust reverse reset final" $namespaces ${REALM}
${TRUST_SERVER_CREDS_DOMAIN_ARGS} --refresh=store --enable-all || failed=$(expr
$failed + 1)
fi
exit $failed
diff --git a/testprogs/blackbox/test_weak_crypto.sh
b/testprogs/blackbox/test_weak_crypto.sh
index e2cdfa71fca..22dcdc518a9 100755
--- a/testprogs/blackbox/test_weak_crypto.sh
+++ b/testprogs/blackbox/test_weak_crypto.sh
@@ -6,10 +6,10 @@
#
if [ $# -lt 6 ]; then
-cat <<EOF
+ cat <<EOF
Usage: $0 SERVER USERNAME PASSWORD REALM DOMAIN PREFIX
EOF
-exit 1;
+ exit 1
fi
--
Samba Shared Repository
