diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-12-17 10:36:49 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-09-04 11:29:53 +0200 |
| commit | 105cc438c6cb3dc741e861855e3fa5a94a156ff0 (patch) | |
| tree | f8cc2306b2e0b93565aafc205e87bcaed387c817 | |
| parent | 3157ccef61bd0698207054daf060cf2986d1d110 (diff) | |
| download | samba-105cc438c6cb3dc741e861855e3fa5a94a156ff0.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>
| -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 fdcd66529c8..b8edeb665bb 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -972,7 +972,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx, "IPC$", dfs_auth_info, false, - smb1cli_conn_encryption_on(rootcli->conn), + cli_state_is_encryption_on(rootcli), smbXcli_conn_protocol(rootcli->conn), 0, 0x20, @@ -1030,7 +1030,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx, dfs_refs[count].share, dfs_auth_info, false, - 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; } } |