From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 21 Dec 2012 15:13:11 +0000 (+0000)
Subject: Always respect Response-Packet-Type for authentication requests
X-Git-Tag: release_3_0_0_beta1~1343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb6a4ee304bff7664ad3f98a9fed7aa8826b815;p=thirdparty%2Ffreeradius-server.git

Always respect Response-Packet-Type for authentication requests
---

diff --git a/src/main/process.c b/src/main/process.c
index 663aeab8db2..6bef46a5b93 100644
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -1060,32 +1060,32 @@ STATE_MACHINE_DECL(request_finish)
 	/*
 	 *	Catch Auth-Type := Reject BEFORE proxying the packet.
 	 */
-	if ((request->packet->code == PW_AUTHENTICATION_REQUEST) &&
-	    (request->reply->code == 0)) {
-		if (((vp = pairfind(request->config_items, PW_AUTH_TYPE, 0)) != NULL) &&
-		    (vp->vp_integer == PW_AUTHTYPE_REJECT)) {
-			request->reply->code = PW_AUTHENTICATION_REJECT;
-
-		} else {
-			/*
-			 *	Check if the lack of response is
-			 *	intentional.
-			 */
-			vp = pairfind(request->config_items,
-				      PW_RESPONSE_PACKET_TYPE, 0);
-			if (!vp) {
-				RDEBUG2("There was no response configured: rejecting request");
-				request->reply->code = PW_AUTHENTICATION_REJECT;
-
-			} else if (vp->vp_integer == 256) {
+	if (request->packet->code == PW_AUTHENTICATION_REQUEST) {
+		/*
+		 *	Override the response code if a 
+		 *	control:Response-Packet-Type attribute is present.
+		 */
+		vp = pairfind(request->config_items, PW_RESPONSE_PACKET_TYPE, 0);
+		if (vp) {
+			if (vp->vp_integer == 256) {
 				RDEBUG2("Not responding to request");
 
+				request->reply->code = 0;
 			} else {
 				request->reply->code = vp->vp_integer;
 			}
+		} else if (request->reply->code == 0) {
+			vp = pairfind(request->config_items, PW_AUTH_TYPE, 0);
+			
+			if (!vp || (vp->vp_integer != PW_AUTHENTICATION_REJECT)) {
+				RDEBUG2("There was no response configured: "
+					"rejecting request");
+			}
+			
+			request->reply->code = PW_AUTHENTICATION_REJECT;
 		}
 	}
-
+	
 	/*
 	 *	Copy Proxy-State from the request to the reply.
 	 */