s3:libsmb: Remove force_encrypt from clidfs do_connect()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index b0032005398024ca96d509a4385f2a1bd3442024..5503506de97f0ba4d1264be65507383ed9cc2be1 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -107,7 +107,6 @@ static NTSTATUS do_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,
@@ -123,6 +122,8 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
        enum protocol_types protocol = PROTOCOL_NONE;
        int signing_state = get_cmdline_auth_info_signing_state(auth_info);
        struct cli_credentials *creds = NULL;
+       bool force_encrypt =
+               get_cmdline_auth_info_smb_encrypt(auth_info);
 
        if (force_encrypt) {
                signing_state = SMB_SIGNING_REQUIRED;
@@ -233,7 +234,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
                cli_shutdown(c);
                return do_connect(ctx, newserver,
                                newshare, auth_info,
-                               force_encrypt, max_protocol,
+                               max_protocol,
                                NULL, port, name_type, pcli);
        }
 
@@ -295,12 +296,10 @@ 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,
-                               force_encrypt, max_protocol,
+                               max_protocol,
                                dest_ss, port, name_type, &cli);
 
        if (!NT_STATUS_IS_OK(status)) {