From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 16 Apr 2020 21:55:46 +0000 (-0500)
Subject: rlm_radius: Remove no_connection_fail
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c57cfadc8d76ea2bdd3cf3164a8d997d29e7afa2;p=thirdparty%2Ffreeradius-server.git

rlm_radius: Remove no_connection_fail

This is already implemented by the trunk
---

diff --git a/doc/antora/modules/raddb/pages/mods-available/radius.adoc b/doc/antora/modules/raddb/pages/mods-available/radius.adoc
index a24dd331573..eb22c33fd67 100644
--- a/doc/antora/modules/raddb/pages/mods-available/radius.adoc
+++ b/doc/antora/modules/raddb/pages/mods-available/radius.adoc
@@ -92,10 +92,6 @@ NOTE: The behavior in v3 is the same as `synchronous = yes`
 
 
 
-no_connection_fail:: If no connections are available, then
-the module will immediately return "fail".
-
-
 
 originate:: Whether or not we are creating the packet.
 
@@ -442,7 +438,6 @@ radius {
 	type = Accounting-Request
 #	replicate = no
 #	synchronous = no
-#	no_connection_fail = no
 #	originate = no
 	status_check {
 		type = Status-Server
diff --git a/raddb/mods-available/radius b/raddb/mods-available/radius
index 02122c8b729..6eeae1f3647 100644
--- a/raddb/mods-available/radius
+++ b/raddb/mods-available/radius
@@ -101,12 +101,6 @@ radius {
 	#
 #	synchronous = no
 
-	#
-	#  no_connection_fail:: If no connections are available, then
-	#  the module will immediately return "fail".
-	#
-#	no_connection_fail = no
-
 	#
 	#  originate:: Whether or not we are creating the packet.
 	#
diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index b2f6c99224c..88c0e51d131 100644
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -111,8 +111,6 @@ static CONF_PARSER const module_config[] = {
 
 	{ FR_CONF_OFFSET("synchronous", FR_TYPE_BOOL, rlm_radius_t, synchronous) },
 
-	{ FR_CONF_OFFSET("no_connection_fail", FR_TYPE_BOOL, rlm_radius_t, no_connection_fail) },
-
 	{ FR_CONF_OFFSET("originate", FR_TYPE_BOOL, rlm_radius_t, originate) },
 
 	{ FR_CONF_POINTER("status_check", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) status_check_config },
diff --git a/src/modules/rlm_radius/rlm_radius.h b/src/modules/rlm_radius/rlm_radius.h
index c1b4ca7571a..884039bffdb 100644
--- a/src/modules/rlm_radius/rlm_radius.h
+++ b/src/modules/rlm_radius/rlm_radius.h
@@ -60,7 +60,6 @@ struct rlm_radius_s {
 
 	bool			replicate;		//!< Ignore responses.
 	bool			synchronous;		//!< Retransmit when receiving a duplicate request.
-	bool			no_connection_fail;	//!< Fail immediately if there are no active connections.
 	bool			originate;  		//!< Originating packets, instead of proxying existing ones.
 							///< Controls whether Proxy-State is added to the outbound
 							///< request.
diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 4aa895c992d..635eed0425a 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -2573,17 +2573,6 @@ static rlm_rcode_t mod_enqueue(void **rctx_out, void *instance, void *thread, RE
 	fr_assert(request->packet->code > 0);
 	fr_assert(request->packet->code < FR_RADIUS_MAX_PACKET_CODE);
 
-	/*
-	 *	If configured, and we don't have any active
-	 *	connections, fail the request.  This lets "parallel"
-	 *	sections finish much more quickly than otherwise.
-	 */
-	if (inst->parent->no_connection_fail &&
-	    (fr_trunk_connection_count_by_state(t->trunk, FR_TRUNK_CONN_ACTIVE) == 0)) {
-		REDEBUG("Failing request due to 'no_connection_fail = true', and there are no active connections");
-		return RLM_MODULE_FAIL;
-	}
-
 	if (request->packet->code == FR_CODE_STATUS_SERVER) {
 		RWDEBUG("Status-Server is reserved for internal use, and cannot be sent manually.");
 		return RLM_MODULE_NOOP;