diff options
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd_creds.c | 7 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 6 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 3 |
3 files changed, 3 insertions, 13 deletions
diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c index 174eba4f4d..b1910b62c9 100644 --- a/source3/winbindd/winbindd_creds.c +++ b/source3/winbindd/winbindd_creds.c @@ -54,7 +54,6 @@ NTSTATUS winbindd_get_creds(struct winbindd_domain *domain, NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, - TALLOC_CTX *mem_ctx, const char *user, const char *pass, struct netr_SamInfo3 *info3) @@ -128,20 +127,18 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, } NTSTATUS winbindd_update_creds_by_info3(struct winbindd_domain *domain, - TALLOC_CTX *mem_ctx, const char *user, const char *pass, struct netr_SamInfo3 *info3) { - return winbindd_store_creds(domain, mem_ctx, user, pass, info3); + return winbindd_store_creds(domain, user, pass, info3); } NTSTATUS winbindd_update_creds_by_name(struct winbindd_domain *domain, - TALLOC_CTX *mem_ctx, const char *user, const char *pass) { - return winbindd_store_creds(domain, mem_ctx, user, pass, NULL); + return winbindd_store_creds(domain, user, pass, NULL); } diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index c162cc6feb..e71e152d44 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -1004,7 +1004,6 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain, my_info3->base.bad_password_count = 0; result = winbindd_update_creds_by_info3(domain, - state->mem_ctx, state->request->data.auth.user, state->request->data.auth.pass, my_info3); @@ -1052,7 +1051,6 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain, failed: result = winbindd_update_creds_by_info3(domain, - state->mem_ctx, state->request->data.auth.user, NULL, my_info3); @@ -1615,7 +1613,6 @@ process_result: && lp_winbind_offline_logon()) { result = winbindd_store_creds(domain, - state->mem_ctx, state->request->data.auth.user, state->request->data.auth.pass, info3); @@ -1933,8 +1930,7 @@ done: if (NT_STATUS_IS_OK(result) && (state->request->flags & WBFLAG_PAM_CACHED_LOGIN)) { if (lp_winbind_offline_logon()) { result = winbindd_update_creds_by_name(contact_domain, - state->mem_ctx, user, - newpass); + user, newpass); /* Again, this happens when we login from gdm or xdm * and the password expires, *BUT* cached crendentials * doesn't exist. winbindd_update_creds_by_name() diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 60fb647c93..7d36be1e17 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -229,17 +229,14 @@ NTSTATUS winbindd_get_creds(struct winbindd_domain *domain, const uint8 *cached_nt_pass[NT_HASH_LEN], const uint8 *cred_salt[NT_HASH_LEN]); NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, - TALLOC_CTX *mem_ctx, const char *user, const char *pass, struct netr_SamInfo3 *info3); NTSTATUS winbindd_update_creds_by_info3(struct winbindd_domain *domain, - TALLOC_CTX *mem_ctx, const char *user, const char *pass, struct netr_SamInfo3 *info3); NTSTATUS winbindd_update_creds_by_name(struct winbindd_domain *domain, - TALLOC_CTX *mem_ctx, const char *user, const char *pass); |