From: Noel Power <noel.power@suse.com>
Date: Tue, 19 Nov 2019 14:11:21 +0000 (+0000)
Subject: s3/script/tests: Prepare to split samba3.blackbox.net.misc for SMB1/SMB2
X-Git-Tag: ldb-2.1.0~449
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7c0ccbe1a004b96ccf726bda01262e5394c4d0b6;p=thirdparty%2Fsamba.git

s3/script/tests: Prepare to split samba3.blackbox.net.misc for SMB1/SMB2

modify test_net_misc.sh to accept optional protocol, no protocol
specified and it behaves more or less as before (expect this time the
client max protocol is explicitly speficied)

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/script/tests/test_net_misc.sh b/source3/script/tests/test_net_misc.sh
index 566694be74b..afd6bed2599 100755
--- a/source3/script/tests/test_net_misc.sh
+++ b/source3/script/tests/test_net_misc.sh
@@ -14,10 +14,16 @@ SERVERCONFFILE="$2"
 NET="$3"
 CONFIGURATION="$4"
 
-NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+# optional protocl, default to NT1
+if [ $# -gt 4 ]; then
+	PROTOCOL="$5"
+else
+	PROTOCOL="NT1"
+fi
 
-NETTIME="${NET} time"
-NETLOOKUP="${NET} lookup"
+NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+NETTIME="${NET}   --option=clientmaxprotocol=${PROTOCOL} time"
+NETLOOKUP="${NET} --option=clientmaxprotocol=${PROTOCOL} lookup"
 
 incdir=`dirname $0`/../../../testprogs/blackbox
 . $incdir/subunit.sh