sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s3:libsmb: get rid of cli_state_encryption_on

Browse Source 
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Luk Claes
2012-05-19 18:39:44 +02:00
committed by Stefan Metzmacher
parent 6c18a66f3e
commit ab052c7ff0
5 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source3/libsmb/clidfs.c
View File

@ -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,

6
source3/libsmb/clientgen.c
View File

@ -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.
****************************************************************************/

4
source3/libsmb/clireadwrite.c
View File

@ -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;
}

4
source3/libsmb/libsmb_context.c
View File

@ -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;
}
}

1
source3/libsmb/proto.h
View File

@ -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);