diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-12-17 10:36:49 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-09-20 12:00:34 +0200 |
| commit | ecb3cfd8982a6d6b610f98ca80362d3db4178b50 (patch) | |
| tree | 6f83cd92eb72de9739cee3bde71f2f8e45c8c48c /source3/libsmb | |
| parent | c38e3a7086164b1c58e003dd627b207ffcbe856e (diff) | |
| download | samba-ecb3cfd8982a6d6b610f98ca80362d3db4178b50.tar.gz | |
CVE-2017-12151: s3:libsmb: make use of cli_state_is_encryption_on()
This will keep enforced encryption across dfs referrals.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12996
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clidfs.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_context.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index 78eb5d0a1a8..0d851d2cef8 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -970,7 +970,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx, smbXcli_conn_remote_name(rootcli->conn), "IPC$", dfs_auth_info, - smb1cli_conn_encryption_on(rootcli->conn), + cli_state_is_encryption_on(rootcli), smbXcli_conn_protocol(rootcli->conn), 0, 0x20, @@ -1027,7 +1027,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx, dfs_refs[count].server, dfs_refs[count].share, dfs_auth_info, - smb1cli_conn_encryption_on(rootcli->conn), + cli_state_is_encryption_on(rootcli), smbXcli_conn_protocol(rootcli->conn), 0, 0x20, diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index ed6ca2b1b9f..b55cf1e2d15 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -486,7 +486,7 @@ smbc_option_get(SMBCCTX *context, for (s = context->internal->servers; s; s = s->next) { num_servers++; - if (!smb1cli_conn_encryption_on(s->cli->conn)) { + if (!cli_state_is_encryption_on(s->cli)) { return (void *)false; } } |