diff options
| author | Günther Deschner <gd@samba.org> | 2007-05-04 10:21:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:54 -0500 |
| commit | e468268335dd797c540dbd278541340d8c01a7d1 (patch) | |
| tree | d9bfa50f362041e3734174e27fdfc9fccd486c30 /source3/nsswitch | |
| parent | 116c1532e7e8c398a1b22253a361bd88b729fb0f (diff) | |
| download | samba-e468268335dd797c540dbd278541340d8c01a7d1.tar.gz samba-e468268335dd797c540dbd278541340d8c01a7d1.tar.bz2 samba-e468268335dd797c540dbd278541340d8c01a7d1.zip | |
r22666: Expand kerberos_kinit_password_ext() to return NTSTATUS codes and make
winbindd's kerberized pam_auth use that.
Guenther
(This used to be commit 0f436eab5b2e5891c341c27cb22db52a72bf1af7)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_cred_cache.c | 6 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c index 368090c390..2c9572d7f8 100644 --- a/source3/nsswitch/winbindd_cred_cache.c +++ b/source3/nsswitch/winbindd_cred_cache.c @@ -111,7 +111,8 @@ static void krb5_ticket_refresh_handler(struct event_context *event_ctx, entry->ccname, False, /* no PAC required anymore */ True, - WINBINDD_PAM_AUTH_KRB5_RENEW_TIME); + WINBINDD_PAM_AUTH_KRB5_RENEW_TIME, + NULL); gain_root_privilege(); if (ret) { @@ -224,7 +225,8 @@ static void krb5_ticket_gain_handler(struct event_context *event_ctx, entry->ccname, False, /* no PAC required anymore */ True, - WINBINDD_PAM_AUTH_KRB5_RENEW_TIME); + WINBINDD_PAM_AUTH_KRB5_RENEW_TIME, + NULL); gain_root_privilege(); if (ret) { diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 59bff901ce..97c1ac4b9c 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -564,12 +564,12 @@ static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain, cc, True, True, - WINBINDD_PAM_AUTH_KRB5_RENEW_TIME); + WINBINDD_PAM_AUTH_KRB5_RENEW_TIME, + &result); if (krb5_ret) { DEBUG(1,("winbindd_raw_kerberos_login: kinit failed for '%s' with: %s (%d)\n", principal_s, error_message(krb5_ret), krb5_ret)); - result = krb5_to_nt_status(krb5_ret); goto failed; } |