From d27e237cf37fb254646d94827935d9c302c379ff Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 27 Aug 2020 15:26:39 +0200 Subject: [PATCH] s3:libsmb: Remove force_encrypt from cli_cm_connect() Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- source3/libsmb/clidfs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index 4825b8f3fae..b0032005398 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -287,7 +287,6 @@ static NTSTATUS cli_cm_connect(TALLOC_CTX *ctx, const char *server, const char *share, const struct user_auth_info *auth_info, - bool force_encrypt, int max_protocol, const struct sockaddr_storage *dest_ss, int port, @@ -296,6 +295,8 @@ static NTSTATUS cli_cm_connect(TALLOC_CTX *ctx, { struct cli_state *cli = NULL; NTSTATUS status; + bool force_encrypt = + get_cmdline_auth_info_smb_encrypt(auth_info); status = do_connect(ctx, server, share, auth_info, @@ -392,8 +393,6 @@ NTSTATUS cli_cm_open(TALLOC_CTX *ctx, /* Try to reuse an existing connection in this list. */ struct cli_state *c = cli_cm_find(referring_cli, server, share); NTSTATUS status; - bool force_encrypt = - get_cmdline_auth_info_smb_encrypt(auth_info); if (c) { *pcli = c; @@ -414,7 +413,6 @@ NTSTATUS cli_cm_open(TALLOC_CTX *ctx, server, share, auth_info, - force_encrypt, max_protocol, dest_ss, port, @@ -1020,7 +1018,6 @@ NTSTATUS cli_resolve_path(TALLOC_CTX *ctx, dfs_refs[count].server, dfs_refs[count].share, dfs_auth_info, - cli_state_is_encryption_on(rootcli), smbXcli_conn_protocol(rootcli->conn), NULL, /* dest_ss */ 0, /* port */ -- 2.47.3