diff options
| author |  Karl Ramm <kcr@1ts.org> | 2009-04-03 04:45:20 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@1ts.org> | 2009-04-03 04:45:20 +0000 |
| commit | bdd2368e5cf971d03d7b57db6f09788084c19679 (patch) | |
| tree | cb15ed2158a46678a9be5bca4980e95abe4002e0 /server/kstuff.c | |
| parent | 5fd7d4c62f9028489eede7b41e27fee96f0a3432 (diff) | |
amd64 anecdotally cares about the difference between NULL and 0 in some contexts
Diffstat (limited to 'server/kstuff.c')
| -rw-r--r-- | server/kstuff.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/server/kstuff.c b/server/kstuff.c index 4ad951d..8f283b5 100644 --- a/server/kstuff.c +++ b/server/kstuff.c @@ -320,16 +320,19 @@ ZCheckRealmAuthentication(ZNotice_t *notice, SERVER_INSTANCE, NULL); if (!result) { result = krb5_rd_req(Z_krb5_ctx, &authctx, &packet, server, - keytabid, 0, &tkt); + keytabid, NULL, &tkt); krb5_free_principal(Z_krb5_ctx, server); } krb5_kt_close(Z_krb5_ctx, keytabid); if (result) { - if (result == KRB5KRB_AP_ERR_REPEAT) - syslog(LOG_DEBUG, "ZCheckRealmAuthentication: k5 auth failed: %s", error_message(result)); - else - syslog(LOG_WARNING,"ZCheckRealmAuthentication: k5 auth failed: %s", error_message(result)); + if (result == KRB5KRB_AP_ERR_REPEAT) { + syslog(LOG_DEBUG, "ZCheckRealmAuthentication: k5 auth failed: %s", + error_message(result)); + } else { + syslog(LOG_WARNING,"ZCheckRealmAuthentication: k5 auth failed: %s", + error_message(result)); + } free(authbuf); krb5_auth_con_free(Z_krb5_ctx, authctx); return ZAUTH_FAILED; @@ -612,16 +615,18 @@ ZCheckAuthentication(ZNotice_t *notice, SERVER_INSTANCE, NULL); if (!result) { result = krb5_rd_req(Z_krb5_ctx, &authctx, &packet, server, - keytabid, 0, &tkt); + keytabid, NULL, &tkt); krb5_free_principal(Z_krb5_ctx, server); } krb5_kt_close(Z_krb5_ctx, keytabid); if (result) { if (result == KRB5KRB_AP_ERR_REPEAT) - syslog(LOG_DEBUG, "ZCheckAuthentication: k5 auth failed: %s", error_message(result)); + syslog(LOG_DEBUG, "ZCheckAuthentication: k5 auth failed: %s", + error_message(result)); else - syslog(LOG_WARNING,"ZCheckAuthentication: k5 auth failed: %s", error_message(result)); + syslog(LOG_WARNING,"ZCheckAuthentication: k5 auth failed: %s", + error_message(result)); free(authbuf); krb5_auth_con_free(Z_krb5_ctx, authctx); return ZAUTH_FAILED; |