diff options
| author |  Karl Ramm <kcr@mit.edu> | 2007-12-25 00:56:08 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2007-12-25 00:56:08 +0000 |
| commit | 1a0e03eb19998ab496a6ea845ff2c42d9a02df0b (patch) | |
| tree | 29b47c8532e1f1678063fbb1b851ee4208134626 /lib/ZCkAuth.c | |
| parent | 3f120f880be9ae9aa1612ddc2412e9acb9a8e85e (diff) | |
applied athena-update-branch patch
Diffstat (limited to 'lib/ZCkAuth.c')
| -rw-r--r-- | lib/ZCkAuth.c | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/lib/ZCkAuth.c b/lib/ZCkAuth.c index 17fdc2b..4c83e6a 100644 --- a/lib/ZCkAuth.c +++ b/lib/ZCkAuth.c @@ -17,6 +17,10 @@ static char rcsid_ZCheckAuthentication_c[] = #include <internal.h> +#if defined(HAVE_KRB5) && !HAVE_KRB5_FREE_DATA +#define krb5_free_data(ctx, dat) free((dat)->data) +#endif + /* Check authentication of the notice. If it looks authentic but fails the Kerberos check, return -1. If it looks authentic and passes the Kerberos check, return 1. @@ -28,30 +32,49 @@ static char rcsid_ZCheckAuthentication_c[] = Code_t ZCheckAuthentication(notice, from) ZNotice_t *notice; struct sockaddr_in *from; -{ -#ifdef HAVE_KRB4 +{ +#if 0 +#if defined(HAVE_KRB4) || defined(HAVE_KRB5) int result; ZChecksum_t our_checksum; + C_Block *session; +#ifdef HAVE_KRB5 + krb5_creds *creds_out; +#else CREDENTIALS cred; - +#endif /* If the value is already known, return it. */ if (notice->z_checked_auth != ZAUTH_UNSET) return (notice->z_checked_auth); if (!notice->z_auth) return (ZAUTH_NO); - + +#ifdef HAVE_KRB5 + result = ZGetCreds(&creds_out); + if (result) + return ZAUTH_NO; + /* HOLDING: creds_out */ + + if (creds_out->keyblock.enctype != ENCTYPE_DES_CBC_CRC) + return (ZAUTH_NO); + session = (C_Block *)creds_out->keyblock.contents; + +#else if ((result = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, __Zephyr_realm, &cred)) != 0) return (ZAUTH_NO); + session = (C_Block *)cred.session; +#endif + #ifdef NOENCRYPTION our_checksum = 0; #else our_checksum = des_quad_cksum(notice->z_packet, NULL, notice->z_default_format+ strlen(notice->z_default_format)+1- - notice->z_packet, 0, cred.session); + notice->z_packet, 0, session); #endif /* if mismatched checksum, then the packet was corrupted */ return ((our_checksum == notice->z_checksum) ? ZAUTH_YES : ZAUTH_FAILED); @@ -59,4 +82,7 @@ Code_t ZCheckAuthentication(notice, from) #else return (notice->z_auth ? ZAUTH_YES : ZAUTH_NO); #endif +#else + ZCheckZcodeAuthentication(notice, from); +#endif } |