From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 8 May 2025 13:40:21 +0000 (+0100)
Subject: Remove config options which controlled use of packet-authenticator in dedup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=953f2c53d2df896d6c1244c2ebcdeed1d8c5fa57;p=thirdparty%2Ffreeradius-server.git

Remove config options which controlled use of packet-authenticator in dedup
---

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index a63b1199fc7..3695ace0db0 100644
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -419,7 +419,6 @@ static fr_client_t *radclient_clone(TALLOC_CTX *ctx, fr_client_t const *parent)
 	COPY_FIELD(cs);
 	COPY_FIELD(proto);
 	COPY_FIELD(active);
-	COPY_FIELD(dedup_authenticator);
 
 	COPY_FIELD(use_connected);
 
@@ -2590,7 +2589,6 @@ static ssize_t mod_write(fr_listen_t *li, void *packet_ctx, fr_time_t request_ti
 	COPY_FIELD(client, limit_proxy_state);
 	COPY_FIELD(client, limit_proxy_state_is_set);
 	COPY_FIELD(client, use_connected);
-	COPY_FIELD(client, dedup_authenticator);
 	COPY_FIELD(client, cs);
 
 	// @todo - fill in other fields?
diff --git a/src/lib/server/client.c b/src/lib/server/client.c
index 9658e3f51eb..17b467337dc 100644
--- a/src/lib/server/client.c
+++ b/src/lib/server/client.c
@@ -448,8 +448,6 @@ static const conf_parser_t client_config[] = {
 	  .uctx = &(cf_table_parse_ctx_t){ .table = fr_radius_limit_proxy_state_table, .len = &fr_radius_limit_proxy_state_table_len },
 	  .dflt = "auto" },
 
-	{ FR_CONF_OFFSET("dedup_authenticator", fr_client_t, dedup_authenticator), .dflt = "yes" },
-
 	{ FR_CONF_OFFSET("response_window", fr_client_t, response_window) },
 
 	{ FR_CONF_POINTER("proto", FR_TYPE_STRING, 0, &hs_proto) },
diff --git a/src/lib/server/client.h b/src/lib/server/client.h
index 19753d8f945..bcc21fd2ceb 100644
--- a/src/lib/server/client.h
+++ b/src/lib/server/client.h
@@ -118,7 +118,6 @@ struct fr_client_s {
 	bool			dynamic;		//!< Whether the client was dynamically defined.
 	bool			active;			//!< for dynamic clients
 	bool			use_connected;		//!< do we use connected sockets for this client
-	bool			dedup_authenticator;	//!< more RADIUS stuff
 
 #ifdef WITH_TLS
 	bool			tls_required;		//!< whether TLS encryption is required.
diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index abace378443..599d54de727 100644
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -60,7 +60,6 @@ typedef struct {
 
 	bool				recv_buff_is_set;	//!< Whether we were provided with a recv_buff
 	bool				dynamic_clients;	//!< whether we have dynamic clients
-	bool				dedup_authenticator;	//!< dedup using the request authenticator
 
 	fr_client_list_t			*clients;		//!< local clients
 
@@ -90,7 +89,6 @@ static const conf_parser_t tcp_listen_config[] = {
 	{ FR_CONF_OFFSET_IS_SET("recv_buff", FR_TYPE_UINT32, 0, proto_radius_tcp_t, recv_buff) },
 
 	{ FR_CONF_OFFSET("dynamic_clients", proto_radius_tcp_t, dynamic_clients) } ,
-	{ FR_CONF_OFFSET("accept_conflicting_packets", proto_radius_tcp_t, dedup_authenticator) } ,
 	{ FR_CONF_POINTER("networks", 0, CONF_FLAG_SUBSECTION, NULL), .subcs = (void const *) networks_config },
 
 	{ FR_CONF_OFFSET("max_packet_size", proto_radius_tcp_t, max_packet_size), .dflt = "4096" } ,
diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index 04119865ad3..58b5421633e 100644
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -68,7 +68,6 @@ typedef struct {
 	bool				recv_buff_is_set;	//!< Whether we were provided with a recv_buff
 	bool				send_buff_is_set;	//!< Whether we were provided with a send_buff
 	bool				dynamic_clients;	//!< whether we have dynamic clients
-	bool				dedup_authenticator;	//!< dedup using the request authenticator
 
 	fr_client_list_t		*clients;		//!< local clients
 
@@ -101,7 +100,6 @@ static const conf_parser_t udp_listen_config[] = {
 	{ FR_CONF_OFFSET_IS_SET("recv_buff", FR_TYPE_UINT32, 0, proto_radius_udp_t, recv_buff) },
 	{ FR_CONF_OFFSET_IS_SET("send_buff", FR_TYPE_UINT32, 0, proto_radius_udp_t, send_buff) },
 
-	{ FR_CONF_OFFSET("accept_conflicting_packets", proto_radius_udp_t, dedup_authenticator) } ,
 	{ FR_CONF_OFFSET("dynamic_clients", proto_radius_udp_t, dynamic_clients) } ,
 	{ FR_CONF_POINTER("networks", 0, CONF_FLAG_SUBSECTION, NULL), .subcs = (void const *) networks_config },