diff options
| author |  Greg Hudson <ghudson@mit.edu> | 2001-03-05 18:19:02 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2001-03-05 18:19:02 +0000 |
| commit | 83ea0641b803587eb4f4acbb85ac01694d03654e (patch) | |
| tree | 6ace3542142ed28de0fa6dd883a14fbbbc8fd2fd /server/kstuff.c | |
| parent | 8dd52e1d786de8804bbb69c66284db5b3a2a3f7f (diff) | |
Reintroduce rev 1.23.
Diffstat (limited to 'server/kstuff.c')
| -rw-r--r-- | server/kstuff.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/server/kstuff.c b/server/kstuff.c index 8090272..0848082 100644 --- a/server/kstuff.c +++ b/server/kstuff.c @@ -121,7 +121,6 @@ SendKerberosData(fd, ticket, service, host) { int rem; char p[32]; - char krb_realm[REALM_SZ]; int written; int size_to_write; @@ -195,6 +194,15 @@ ZCheckRealmAuthentication(notice, from, realm) * ticket isn't cached after a checksum failure), so don't worry * about the extra des_quad_cksum() call. */ if (checksum == notice->z_checksum) { + memcpy(__Zephyr_session, session_key, sizeof(C_Block)); + return ZAUTH_YES; + } + + /* Try again. This way we can switch to the same checksums + * that the rest of Zephyr uses at a future date, but for now + * we need to be compatible */ + checksum = compute_checksum(notice, session_key); + if (checksum == notice->z_checksum) { memcpy(__Zephyr_session, session_key, sizeof(C_Block)); return ZAUTH_YES; } @@ -214,12 +222,17 @@ ZCheckRealmAuthentication(notice, from, realm) /* Check the cryptographic checksum. */ #ifdef NOENCRYPTION - our_checksum = 0; + checksum = 0; #else checksum = compute_rlm_checksum(notice, dat.session); #endif - if (checksum != notice->z_checksum) - return ZAUTH_CKSUM_FAILED; + if (checksum != notice->z_checksum) { +#ifndef NOENCRYPTION + checksum = compute_checksum(notice, dat.session); + if (checksum != notice->z_checksum) +#endif + return ZAUTH_CKSUM_FAILED; + } /* Record the session key, expiry time, and source principal in the * hash table, so we can do a fast check next time. */ @@ -300,7 +313,7 @@ ZCheckAuthentication(notice, from) /* Check the cryptographic checksum. */ #ifdef NOENCRYPTION - our_checksum = 0; + checksum = 0; #else checksum = compute_checksum(notice, dat.session); #endif |