From: Jeremy Allison <jra@samba.org>
Date: Tue, 29 Oct 2019 19:11:01 +0000 (-0700)
Subject: s3: libsmb: Ensure we don't call cli_RNetShareEnum() on an SMB1 connection.
X-Git-Tag: talloc-2.3.1~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cfcad6283da855d3e97237a7a6fd6f4d2436ee2;p=thirdparty%2Fsamba.git

s3: libsmb: Ensure we don't call cli_RNetShareEnum() on an SMB1 connection.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14174

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index df606c4adfe..ab20a127c49 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -856,7 +856,12 @@ SMBC_opendir_ctx(SMBCCTX *context,
 							list_fn,
 							(void *)dir);
 				if (rc != 0 &&
-				    lp_client_min_protocol() <= PROTOCOL_NT1) {
+				    smbXcli_conn_protocol(srv->cli->conn) <=
+						PROTOCOL_NT1) {
+					/*
+					 * Only call cli_RNetShareEnum()
+					 * on SMB1 connections, not SMB2+.
+					 */
 					rc = cli_RNetShareEnum(srv->cli,
 							       list_fn,
 							       (void *)dir);