s3:tests: Fix passing the configuration to Smbclient_netbios_aliases test

Signed-Off-By: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/script/tests/test_smbclient_netbios_aliases.sh b/source3/script/tests/test_smbclient_netbios_aliases.sh
index 4df5cf0dfaa165347bc31e45e24ba47f0a08e63b..47beb45a4cf104b9eee875c0e3a5ba9c71002d32 100755 (executable)
--- 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 <<EOF
-Usage: test_smbclient.sh smbclient3 SERVER USERNAME PASSWORD PREFIX <smbclient args>
+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 4b81947510e33609e9d7f88b84a80e8c2d5a09ba..4f82123c8f0d4411d2c999dc0ea522c985d40132 100755 (executable)
--- 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: