diff options
| author | des <des@FreeBSD.org> | 2003-02-03 09:45:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-02-03 09:45:41 +0000 |
| commit | 2f3f171cbe1c151b0e4713cf0cb986c6cdfe87fb (patch) | |
| tree | ab8aa5f47e3a600c0db9bc0d6aebe67bcaa2051b /lib | |
| parent | 4e2d7720df86ea1591c8c8adb46d9b8303b5127a (diff) | |
| download | FreeBSD-src-2f3f171cbe1c151b0e4713cf0cb986c6cdfe87fb.zip FreeBSD-src-2f3f171cbe1c151b0e4713cf0cb986c6cdfe87fb.tar.gz | |
In pam_sm_acct_mgmt(), retrieve the cached credentials before trying to
initialize the context. This way, a failure to initialize the context is
not fatal unless we actually have work to do - because if we don't, we
return PAM_SUCCESS without even trying to initialize the context.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpam/modules/pam_krb5/pam_krb5.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index de7adb8..eac8c74 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -617,6 +617,12 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got user: %s", user); + retval = pam_get_data(pamh, "ccache", (const void **)&ccache_name); + if (retval != PAM_SUCCESS) + return (PAM_SUCCESS); + + PAM_LOG("Got credentials"); + krbret = krb5_init_context(&pam_context); if (krbret != 0) { PAM_LOG("Error krb5_init_context() failed"); @@ -625,9 +631,6 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Context initialised"); - retval = pam_get_data(pamh, "ccache", (const void **)&ccache_name); - if (retval != PAM_SUCCESS) - return (PAM_SUCCESS); krbret = krb5_cc_resolve(pam_context, ccache_name, &ccache); if (krbret != 0) { PAM_LOG("Error krb5_cc_resolve(\"%s\"): %s", ccache_name, |
