From: Stefan Metzmacher Date: Fri, 9 Jul 2021 12:58:24 +0000 (+0200) Subject: s4:torture:libsmbclient: make use of PROTOCOL_* enum values instead of of hardcoded... X-Git-Tag: samba-4.15.0rc1~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36023cb5f81e71d02bd92b8998db3890be393f58;p=thirdparty%2Fsamba.git s4:torture:libsmbclient: make use of PROTOCOL_* enum values instead of of hardcoded int values We should also test protocol versions which are not our default. Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c index 1ae7c4ee6fc..669189d7785 100644 --- a/source4/torture/libsmbclient/libsmbclient.c +++ b/source4/torture/libsmbclient/libsmbclient.c @@ -26,6 +26,7 @@ #include "torture/libsmbclient/proto.h" #include "lib/param/loadparm.h" #include "lib/param/param_global.h" +#include "libcli/smb/smb_constants.h" #include "dynconfig.h" #include "lib/util/time.h" @@ -210,10 +211,10 @@ static bool torture_libsmbclient_setConfiguration(struct torture_context *tctx) "NEW_WORKGROUP", "smbc_setConfiguration failed, " "'workgroup' not updated"); - torture_assert_int_equal(tctx, global_config->client_min_protocol, 7, + torture_assert_int_equal(tctx, global_config->client_min_protocol, PROTOCOL_NT1, "smbc_setConfiguration failed, 'client min protocol' " "not updated"); - torture_assert_int_equal(tctx, global_config->_client_max_protocol, 13, + torture_assert_int_equal(tctx, global_config->_client_max_protocol, PROTOCOL_SMB3_00, "smbc_setConfiguration failed, 'client max protocol' " "not updated"); torture_assert_int_equal(tctx, global_config->client_signing, 1, diff --git a/testdata/samba3/smb_new.conf b/testdata/samba3/smb_new.conf index 727e18ba7c9..d82c48c75af 100644 --- a/testdata/samba3/smb_new.conf +++ b/testdata/samba3/smb_new.conf @@ -1,7 +1,7 @@ [global] workgroup = NEW_WORKGROUP - client min protocol = SMB2 - client max protocol = SMB3 + client min protocol = NT1 + client max protocol = SMB3_00 client signing = 1 deadtime = 5 netbios name = BEDWYR \ No newline at end of file