sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3:libsmbclient: Do not call cli_RNetShareEnum if SMB1 is disabled

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andreas Schneider 2018-09-04 16:08:58 +02:00 committed by Jeremy Allison
parent eddcbfea91
commit 50f89bcdc9
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source3/libsmb/libsmb_dir.c
View File

@ -825,6 +825,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
}
} else if (srv ||
(resolve_name(server, &rem_ss, 0x20, false))) {
int rc;
/*
* If we hadn't found the server, get one now
@ -851,24 +852,24 @@ SMBC_opendir_ctx(SMBCCTX *context,
/* List the shares ... */
if (net_share_enum_rpc(
srv->cli,
list_fn,
(void *) dir) < 0 &&
cli_RNetShareEnum(
srv->cli,
list_fn,
(void *)dir) < 0) {
errno = cli_errno(srv->cli);
if (dir) {
SAFE_FREE(dir->fname);
SAFE_FREE(dir);
}
rc = net_share_enum_rpc(srv->cli,
list_fn,
(void *)dir);
if (rc != 0 &&
lp_client_min_protocol() <= PROTOCOL_NT1) {
rc = cli_RNetShareEnum(srv->cli,
list_fn,
(void *)dir);
}
if (rc != 0) {
errno = cli_errno(srv->cli);
if (dir != NULL) {
SAFE_FREE(dir->fname);
SAFE_FREE(dir);
}
TALLOC_FREE(frame);
return NULL;
}
return NULL;
}
} else {
/* Neither the workgroup nor server exists */
errno = ECONNREFUSED;