diff options
| author | Günther Deschner <gd@samba.org> | 2006-03-20 19:05:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:38 -0500 |
| commit | 485a286a65d3b37f424f5701179f73c99eb9b5b9 (patch) | |
| tree | 3447057a50073442149f12b4562396091406f0b6 /source3/nsswitch | |
| parent | 4b000b2c95ec064db18d59bff9bf9957717632c4 (diff) | |
| download | samba-485a286a65d3b37f424f5701179f73c99eb9b5b9.tar.gz samba-485a286a65d3b37f424f5701179f73c99eb9b5b9.tar.bz2 samba-485a286a65d3b37f424f5701179f73c99eb9b5b9.zip | |
r14585: Tighten argument list of kerberos_kinit_password again,
kerberos_kinit_password_ext provides access to more options.
Guenther
(This used to be commit afc519530f94b420b305fc28f83c16db671d0d7f)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd_cred_cache.c | 16 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c index 6835840a1d..4c539b9b23 100644 --- a/source3/nsswitch/winbindd_cred_cache.c +++ b/source3/nsswitch/winbindd_cred_cache.c @@ -106,14 +106,14 @@ static void krb5_ticket_refresh_handler(struct timed_event *te, seteuid(entry->uid); - ret = kerberos_kinit_password(entry->principal_name, - entry->pass, - 0, /* hm, can we do time correction here ? */ - &entry->refresh_time, - &entry->renew_until, - entry->ccname, - False, /* no PAC required anymore */ - WINBINDD_PAM_AUTH_KRB5_RENEW_TIME); + ret = kerberos_kinit_password_ext(entry->principal_name, + entry->pass, + 0, /* hm, can we do time correction here ? */ + &entry->refresh_time, + &entry->renew_until, + entry->ccname, + False, /* no PAC required anymore */ + WINBINDD_PAM_AUTH_KRB5_RENEW_TIME); seteuid(0); if (ret) { diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index a010d51caf..922a24adf0 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -482,14 +482,14 @@ static NTSTATUS winbindd_raw_kerberos_login(struct winbindd_domain *domain, DEBUG(10,("winbindd_raw_kerberos_login: uid is %d\n", uid)); } - krb5_ret = kerberos_kinit_password(principal_s, - state->request.data.auth.pass, - time_offset, - &ticket_lifetime, - &renewal_until, - cc, - True, - WINBINDD_PAM_AUTH_KRB5_RENEW_TIME); + krb5_ret = kerberos_kinit_password_ext(principal_s, + state->request.data.auth.pass, + time_offset, + &ticket_lifetime, + &renewal_until, + cc, + True, + WINBINDD_PAM_AUTH_KRB5_RENEW_TIME); if (krb5_ret) { DEBUG(1,("winbindd_raw_kerberos_login: kinit failed for '%s' with: %s (%d)\n", |