s3:libsmb: pass cli_credentials to cli_check_msdfs_proxy()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index b58d97e661a79573e94651bdb2a927577cdfbc6e..c477d7c6a46c5cb1d6c95485c04b1b49a961fcbc 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -278,10 +278,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
        if (smbXcli_conn_dfs_supported(c->conn) &&
                        cli_check_msdfs_proxy(ctx, c, sharename,
                                &newserver, &newshare,
-                               force_encrypt,
-                               username,
-                               password,
-                               domain)) {
+                               force_encrypt, creds)) {
                cli_shutdown(c);
                return do_connect(ctx, newserver,
                                newshare, auth_info, false,
@@ -1201,9 +1198,7 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
                                char **pp_newserver,
                                char **pp_newshare,
                                bool force_encrypt,
-                               const char *username,
-                               const char *password,
-                               const char *domain)
+                               struct cli_credentials *creds)
 {
        struct client_dfs_referral *refs = NULL;
        size_t num_refs = 0;
@@ -1242,11 +1237,7 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
        }
 
        if (force_encrypt) {
-               status = cli_cm_force_encryption(cli,
-                                       username,
-                                       password,
-                                       domain,
-                                       "IPC$");
+               status = cli_cm_force_encryption_creds(cli, creds, "IPC$");
                if (!NT_STATUS_IS_OK(status)) {
                        return false;
                }

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index d737d2559b494df487afb9563a5fae4a90aa0900..b0e5926fa65613c7fc461be0967d82f42d4e371b 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -548,9 +548,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
                                   not support smbc_smb_encrypt_level type */
                                context->internal->smb_encryption_level ?
                                        true : false,
-                               *pp_username,
-                               *pp_password,
-                               *pp_workgroup)) {
+                               creds)) {
                cli_shutdown(c);
                srv = SMBC_server_internal(ctx, context, connect_if_not_found,
                                newserver, port, newshare, pp_workgroup,

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 62720fd54cd7e0fdf7e098aaffb223fef442fb8a..764f3fc1b12d68b88d0ec33356173fc975e6767a 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -174,9 +174,7 @@ bool cli_check_msdfs_proxy(TALLOC_CTX *ctx,
                        char **pp_newserver,
                        char **pp_newshare,
                        bool force_encrypt,
-                       const char *username,
-                       const char *password,
-                       const char *domain);
+                       struct cli_credentials *creds);
 
 /* The following definitions come from libsmb/clientgen.c  */