From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 23 Nov 2017 19:29:28 +0000 (-0500)
Subject: run "deny" section
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d60f10d5b005b22dda92c78e27e8cf42171f723c;p=thirdparty%2Ffreeradius-server.git

run "deny" section
---

diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
index bb6211a6f19..2bb6a07a806 100644
--- a/src/modules/proto_radius/proto_radius_dynamic_client.c
+++ b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -126,6 +126,7 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 			if (request->reply->code != FR_CODE_ACCESS_REJECT) {
 				RWDEBUG("Failed running 'add client', trying 'deny client'.");
 
+			deny:
 				request->reply->code = FR_CODE_ACCESS_REJECT;
 
 				unlang = cf_section_find(request->server_cs, "deny", "client");
@@ -145,15 +146,13 @@ static fr_io_final_t mod_process(REQUEST *request, fr_io_action_t action)
 			if (!vp) fr_pair_find_by_num(request->control, 0, FR_FREERADIUS_CLIENT_IPV6_PREFIX, TAG_ANY);
 			if (!vp) {
 				ERROR("The 'control' list MUST contain a FreeRADIUS-Client.. IP address attribute");
-				request->reply->code = FR_CODE_ACCESS_REJECT;
-				goto rerun_nak;
+				goto deny;
 			}
 
 			vp = fr_pair_find_by_num(request->control, 0, FR_FREERADIUS_CLIENT_SECRET, TAG_ANY);
 			if (!vp) {
 				ERROR("The 'control' list MUST contain a FreeRADIUS-Client-Secret attribute");
-				request->reply->code = FR_CODE_ACCESS_REJECT;
-				goto rerun_nak;
+				goto deny;
 			}
 
 			/*