svn rev #22192: trunk/src/lib/krb5/krb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22192
Commit By: ghudson
Log Message:
Simplify the coupling of problem to response code in recvauth_common,
eliminating a big switch statement with a dead-code default block.



Changed Files:
U   trunk/src/lib/krb5/krb/recvauth.c
Modified: trunk/src/lib/krb5/krb/recvauth.c
===================================================================
--- trunk/src/lib/krb5/krb/recvauth.c	2009-04-10 19:54:35 UTC (rev 22191)
+++ trunk/src/lib/krb5/krb/recvauth.c	2009-04-10 20:17:38 UTC (rev 22192)
@@ -67,6 +67,7 @@
 	 * and exit.
 	 */
 	problem = 0;
+	response = 0;
 
 	if (!(flags & KRB5_RECVAUTH_SKIP_VERSION)) {
 	    /*
@@ -76,11 +77,14 @@
 		return(retval);
 	    if (strcmp(inbuf.data, sendauth_version)) {
 		problem = KRB5_SENDAUTH_BADAUTHVERS;
+		response = 1;
 	    }
 	    free(inbuf.data);
 	}
-	if (flags & KRB5_RECVAUTH_BADAUTHVERS)
+	if (flags & KRB5_RECVAUTH_BADAUTHVERS) {
 	    problem = KRB5_SENDAUTH_BADAUTHVERS;
+	    response = 1;
+	}
 	
 	/*
 	 * Do the same thing for the application version string.
@@ -88,41 +92,17 @@
 	if ((retval = krb5_read_message(context, fd, &inbuf)))
 		return(retval);
 	if (appl_version && strcmp(inbuf.data, appl_version)) {
-		if (!problem)
+		if (!problem) {
 			problem = KRB5_SENDAUTH_BADAPPLVERS;
+			response = 2;
+		}
 	}
 	if (version && !problem)
 	    *version = inbuf;
 	else
 	    free(inbuf.data);
+
 	/*
-	 * OK, now check the problem variable.  If it's zero, we're
-	 * fine and we can continue.  Otherwise, we have to signal an
-	 * error to the client side and bail out.
-	 */
-	switch (problem) {
-	case 0:
-		response = 0;
-		break;
-	case KRB5_SENDAUTH_BADAUTHVERS:
-		response = 1;
-		break;
-	case KRB5_SENDAUTH_BADAPPLVERS:
-		response = 2;
-		break;
-	default:
-		/*
-		 * Should never happen!
-		 */
-		response = 255;
-#ifdef SENDAUTH_DEBUG
-		fprintf(stderr, "Programming botch in recvauth!  problem = %d",
-			problem);
-		abort();
-#endif
-		break;
-	}
-	/*
 	 * Now we actually write the response.  If the response is non-zero,
 	 * exit with a return value of problem
 	 */