diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-11-04 12:25:34 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2016-12-21 18:35:13 +0100 |
| commit | f595031cb8203d4184b81976c22644e86a30cabe (patch) | |
| tree | 2d280a39de9892bb55caa275fb9c576ae87d2e6f | |
| parent | c19232b4bcfe80e7501c5600bbbec2b27832c1ce (diff) | |
| download | samba-f595031cb8203d4184b81976c22644e86a30cabe.tar.gz | |
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>
| -rw-r--r-- | source3/libsmb/clidfs.c | 15 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_server.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/proto.h | 4 |
3 files changed, 5 insertions, 18 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index b58d97e661a..c477d7c6a46 100644 --- 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 d737d2559b4..b0e5926fa65 100644 --- 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 62720fd54cd..764f3fc1b12 100644 --- 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 */ |