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 78eb5d0a1a86fdc26e7d18283d4c06451fd8f729..0d851d2cef893cfdae66d4ce5afbfe3c2344a98a 100644 (file)
--- 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 ed6ca2b1b9fd0d7109120dd7cae3be2edae85cbd..b55cf1e2d154f53f8795a65aff8222cf1f41b3c9 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;
                         }
                 }