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>

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 0b7c281280b4d440632e0f91ea514123b33c0820..d9c9e27b999224d9fe26572449c5645aafbcdb96 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -954,7 +954,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,
@@ -1012,7 +1012,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 a956058c6d927cc84a02dfc16d78ae40101f40cc..74adade9a81323496eaf02d454aca84e8e10d565 100644 (file)
--- 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;
                         }
                 }