s3:libsmb: make use of cli_cm_force_encryption_creds() where we already have creds
authorStefan Metzmacher <metze@samba.org>
Thu, 3 Nov 2016 16:27:49 +0000 (17:27 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Wed, 21 Dec 2016 17:35:13 +0000 (18:35 +0100)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
source3/libsmb/clidfs.c
source3/libsmb/libsmb_server.c

index fc6c30a01c4b64e235c1e5cae4c3760be6b4990a..b58d97e661a79573e94651bdb2a927577cdfbc6e 100644 (file)
@@ -299,11 +299,9 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
        }
 
        if (force_encrypt) {
-               status = cli_cm_force_encryption(c,
-                                       username,
-                                       password,
-                                       domain,
-                                       sharename);
+               status = cli_cm_force_encryption_creds(c,
+                                                      creds,
+                                                      sharename);
                if (!NT_STATUS_IS_OK(status)) {
                        cli_shutdown(c);
                        return status;
index 3f206e3fb97607f5ecbb01a76f1449c0252b4bb3..d737d2559b494df487afb9563a5fae4a90aa0900 100644 (file)
@@ -609,11 +609,9 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 
        if (context->internal->smb_encryption_level) {
                /* Attempt encryption. */
-               status = cli_cm_force_encryption(c,
-                                                username_used,
-                                                password_used,
-                                                *pp_workgroup,
-                                                share);
+               status = cli_cm_force_encryption_creds(c,
+                                                      creds,
+                                                      share);
                if (!NT_STATUS_IS_OK(status)) {
 
                        /*