summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/libsmb/clidfs.c4
-rw-r--r--source3/libsmb/clientgen.c6
-rw-r--r--source3/libsmb/clireadwrite.c4
-rw-r--r--source3/libsmb/libsmb_context.c4
-rw-r--r--source3/libsmb/proto.h1
5 files changed, 6 insertions, 13 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 1eaec45eab..ff89dcc505 100644
--- 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 d627f7520b..5d2d038965 100644
--- 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 5e2e94345d..7f82772721 100644
--- 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 a8fd2dc45e..502bb0d16a 100644
--- 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 f633ed1e84..7b44b15688 100644
--- 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);