From e1d362c48d15d1b26992ba49069b1226fb35921d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 10 Jun 2021 12:28:44 +0000 Subject: [PATCH] s3:tests: Fix passing the configuration to Smbclient_netbios_aliases test Signed-Off-By: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/script/tests/test_smbclient_netbios_aliases.sh | 9 +++++---- source3/selftest/tests.py | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source3/script/tests/test_smbclient_netbios_aliases.sh b/source3/script/tests/test_smbclient_netbios_aliases.sh index 4df5cf0dfaa..47beb45a4cf 100755 --- a/source3/script/tests/test_smbclient_netbios_aliases.sh +++ b/source3/script/tests/test_smbclient_netbios_aliases.sh @@ -1,8 +1,8 @@ #!/bin/sh -if [ $# -lt 1 ]; then +if [ $# -lt 6 ]; then cat < +Usage: test_smbclient.sh smbclient3 SERVER USERNAME PASSWORD PREFIX CONFIGURATION EOF exit 1; fi @@ -12,8 +12,9 @@ SERVER=$2 USERNAME=$3 PASSWORD=$4 PREFIX=$5 -shift 5 -ADDARGS="$*" +CONFIGURATION=$6 +shift 6 +ADDADS="$@" samba_bindir="$BINDIR" samba_srcdir="$SRCDIR/source4" diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 4b81947510e..4f82123c8f0 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -1176,7 +1176,8 @@ for options in options_list: for alias in ["foo", "bar"]: plantestsuite("samba3.blackbox.smbclient_netbios_aliases [%s]" % alias, "ad_member:local", [os.path.join(samba3srcdir, "script/tests/test_smbclient_netbios_aliases.sh"), - smbclient3, alias, "$DC_USERNAME", "$DC_PASSWORD", "$PREFIX", options, configuration]) + smbclient3, alias, "$DC_USERNAME", "$DC_PASSWORD", "$PREFIX", + configuration]) for e in endianness_options: for a in auth_options: