s3:libsmb: get rid of cli_state_encryption_on

Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 1eaec45eabdaef4bd7ee881fe4cf073afaf55f5d..ff89dcc505013a494bf25c9ea3f4242fb3042d65 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -864,7 +864,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
                             "IPC$",
                             dfs_auth_info,
                             false,
-                            cli_state_encryption_on(rootcli),
+                            smb1cli_conn_encryption_on(rootcli->conn),
                             smbXcli_conn_protocol(rootcli->conn),
                             0,
                             0x20,
@@ -915,7 +915,7 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx,
                             share,
                             dfs_auth_info,
                             false,
-                            cli_state_encryption_on(rootcli),
+                            smb1cli_conn_encryption_on(rootcli->conn),
                             smbXcli_conn_protocol(rootcli->conn),
                             0,
                             0x20,

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index d627f7520b3e149cb9cd628b18a0ec5cdcf86f07..5d2d0389658969b8a30505d836080c86050684ba 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -287,12 +287,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
         return NULL;
 }
 
-bool cli_state_encryption_on(struct cli_state *cli)
-{
-       return smb1cli_conn_encryption_on(cli->conn);
-}
-
-
 /****************************************************************************
  Close all pipes open on this session.
 ****************************************************************************/

diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 5e2e94345d2f1e63334c150087954e44b9f06cdf..7f827727210f8e1c74ade95a62fef472d61e633a 100644 (file)
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -47,7 +47,7 @@ static size_t cli_read_max_bufsize(struct cli_state *cli)
                        return min_space;
                }
 
-               if (cli_state_encryption_on(cli)) {
+               if (smb1cli_conn_encryption_on(cli->conn)) {
                        return min_space;
                }
 
@@ -100,7 +100,7 @@ static size_t cli_write_max_bufsize(struct cli_state *cli,
                return min_space;
        }
 
-       if (cli_state_encryption_on(cli)) {
+       if (smb1cli_conn_encryption_on(cli->conn)) {
                return min_space;
        }
 

diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index a8fd2dc45ee4a0c8e95c905c5f019e9a2baba012..502bb0d16a9e7ebc6a2cebfe0ff727f3a9ebfb5b 100644 (file)
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -27,7 +27,7 @@
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "secrets.h"
-
+#include "../libcli/smb/smbXcli_base.h"
 
 /*
  * Is the logging working / configfile read ? 
@@ -468,7 +468,7 @@ smbc_option_get(SMBCCTX *context,
 
                 for (s = context->internal->servers; s; s = s->next) {
                         num_servers++;
-                        if (!cli_state_encryption_on(s->cli)) {
+                        if (!smb1cli_conn_encryption_on(s->cli->conn)) {
                                 return (void *)false;
                         }
                 }

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index f633ed1e842126d009b9d93ff8dfef282ddc5925..7b44b15688fc7ac1cfd4c73b6a689b0f17daf584 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -168,7 +168,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
                                   const char *remote_realm,
                                   int signing_state,
                                   int flags);
-bool cli_state_encryption_on(struct cli_state *cli);
 void cli_nt_pipes_close(struct cli_state *cli);
 void cli_shutdown(struct cli_state *cli);
 const char *cli_state_remote_realm(struct cli_state *cli);