Reintroduce checksum enforcement changes.

2 files changed, 13 insertions, 30 deletions

diff --git a/server/dispatch.c b/server/dispatch.c
index f762926..493fcd4 100644
--- a/server/dispatch.c
+++ b/server/dispatch.c
@@ -257,20 +257,7 @@ dispatch(notice, auth, who, from_server)
     char dbg_buf[BUFSIZ];
 #endif
 
-    /* Set "authflag" to 1 or 0 for handler functions.  Treat
-     * ZAUTH_CKSUM_FAILED as authentic except for sendit(), which is
-     * handled below. */
-    switch (auth) {
-      case ZAUTH_YES:
-      case ZAUTH_CKSUM_FAILED:
-	authflag = 1;
-	break;
-      case ZAUTH_FAILED:
-      case ZAUTH_NO:
-      default:
-	authflag = 0;
-	break;
-    }
+    authflag = (auth == ZAUTH_YES);
 
     if ((int) notice->z_kind < (int) UNSAFE ||
 	(int) notice->z_kind > (int) CLIENTACK) {
@@ -324,8 +311,6 @@ dispatch(notice, auth, who, from_server)
 	admin_notices.val++;
 	status = server_adispatch(notice, authflag, who, me_server);
     } else {
-	if (auth == ZAUTH_CKSUM_FAILED)
-	    authflag = 0;
 	if (!realm_bound_for_realm(ZGetRealm(), notice->z_recipient)) {
 	    cp = strchr(notice->z_recipient, '@');
 	    if (!cp ||
diff --git a/server/kstuff.c b/server/kstuff.c
index 0848082..ca9f055 100644
--- a/server/kstuff.c
+++ b/server/kstuff.c
@@ -8,7 +8,8 @@
  *	"mit-copyright.h". 
  */
 /*
- *	$Id$
+ *	$Source$
+ *	$Header$
  */
 
 #include "zserver.h"
@@ -188,13 +189,12 @@ ZCheckRealmAuthentication(notice, from, realm)
             return ZAUTH_FAILED;
         checksum = compute_rlm_checksum(notice, session_key);
 
-        /* If checksum matches, packet is authentic.  Otherwise, check
-         * the authenticator as if we didn't have the session key cached
-         * and return ZAUTH_CKSUM_FAILED.  This is a rare case (since the
-         * ticket isn't cached after a checksum failure), so don't worry
-         * about the extra des_quad_cksum() call. */
+        /* If checksum matches, packet is authentic.  If not, we might
+         * have an outdated session key, so keep going the slow way.
+         */
         if (checksum == notice->z_checksum) {
-          memcpy(__Zephyr_session, session_key, sizeof(C_Block)); 
+          (void) memcpy((char *)__Zephyr_session, (char *)session_key, 
+                        sizeof(C_Block)); /* For control_dispatch() */
           return ZAUTH_YES;
         }
 
@@ -231,7 +231,7 @@ ZCheckRealmAuthentication(notice, from, realm)
       checksum = compute_checksum(notice, dat.session);
       if (checksum != notice->z_checksum)
 #endif
-         return ZAUTH_CKSUM_FAILED;
+        return ZAUTH_FAILED;
     }
 
     /* Record the session key, expiry time, and source principal in the
@@ -287,11 +287,9 @@ ZCheckAuthentication(notice, from)
 	    return ZAUTH_FAILED;
 	checksum = compute_checksum(notice, session_key);
 
-	/* If the checksum matches, the packet is authentic.  Otherwise,
-	 * check authenticator as if we didn't have the session key cached
-	 * and return ZAUTH_CKSUM_FAILED.  This is a rare case (since the
-	 * ticket isn't cached after a checksum failure), so don't worry
-	 * about the extra des_quad_cksum() call. */
+        /* If checksum matches, packet is authentic.  If not, we might
+	 * have an outdated session key, so keep going the slow way.
+	 */
 	if (checksum == notice->z_checksum) {
 	    memcpy(__Zephyr_session, session_key, sizeof(C_Block));
 	    return ZAUTH_YES;
@@ -318,7 +316,7 @@ ZCheckAuthentication(notice, from)
     checksum = compute_checksum(notice, dat.session);
 #endif
     if (checksum != notice->z_checksum)
-	return ZAUTH_CKSUM_FAILED;
+	return ZAUTH_FAILED;
 
     /* Record the session key, expiry time, and source principal in the
      * hash table, so we can do a fast check next time. */