diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-12-17 08:48:38 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-12-19 13:15:13 +0100 |
| commit | a601c087b06555c650e9b69e9a831b3aee1c30d8 (patch) | |
| tree | e16624292b3933e01b91e26eeef6ae2602157912 | |
| parent | 6f718ba1720d1318b08fd3fce293fb9c34a36a45 (diff) | |
| download | samba-a601c087b06555c650e9b69e9a831b3aee1c30d8.tar.gz | |
s3:winbindd: make use of rpccli_{create,setup}_netlogon_creds_with_creds()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index d396018f4c9..1a3fe69e90a 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -3118,10 +3118,6 @@ static NTSTATUS cm_connect_netlogon_transport(struct winbindd_domain *domain, struct winbindd_cm_conn *conn; NTSTATUS result; enum netr_SchannelType sec_chan_type; - const char *account_name; - const char *domain_name; - const struct samr_Password *current_nt_hash = NULL; - const struct samr_Password *previous_nt_hash = NULL; struct netlogon_creds_CredentialState *netlogon_creds = NULL; struct cli_credentials *creds = NULL; @@ -3162,20 +3158,11 @@ static NTSTATUS cm_connect_netlogon_transport(struct winbindd_domain *domain, goto no_schannel; } - account_name = cli_credentials_get_username(creds); - domain_name = cli_credentials_get_domain(creds); - current_nt_hash = cli_credentials_get_nt_hash(creds, talloc_tos()); - if (current_nt_hash == NULL) { - return NT_STATUS_NO_MEMORY; - } - - result = rpccli_create_netlogon_creds(domain->dcname, - domain_name, - account_name, - sec_chan_type, - msg_ctx, - domain, - &conn->netlogon_creds); + result = rpccli_create_netlogon_creds_with_creds(creds, + domain->dcname, + msg_ctx, + domain, + &conn->netlogon_creds); if (!NT_STATUS_IS_OK(result)) { DEBUG(1, ("rpccli_create_netlogon_creds failed for %s, " "unable to create NETLOGON credentials: %s\n", @@ -3183,11 +3170,10 @@ static NTSTATUS cm_connect_netlogon_transport(struct winbindd_domain *domain, return result; } - result = rpccli_setup_netlogon_creds(conn->cli, transport, - conn->netlogon_creds, - conn->netlogon_force_reauth, - *current_nt_hash, - previous_nt_hash); + result = rpccli_setup_netlogon_creds_with_creds(conn->cli, transport, + conn->netlogon_creds, + conn->netlogon_force_reauth, + creds); conn->netlogon_force_reauth = false; if (!NT_STATUS_IS_OK(result)) { DEBUG(1, ("rpccli_setup_netlogon_creds failed for %s, " |