From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 10 May 2024 04:16:58 +0000 (-0600)
Subject: Give virtual servers a meaningful name so it's less confusing debugging instance... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db44c3773f82e1c60e59268b1ee9865e2118bd2b;p=thirdparty%2Ffreeradius-server.git

Give virtual servers a meaningful name so it's less confusing debugging instance name creation
---

diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff
index 500efda08b3..4b0a28b3bb2 100644
--- a/debian/patches/radiusd-to-freeradius.diff
+++ b/debian/patches/radiusd-to-freeradius.diff
@@ -56,7 +56,7 @@ Index: freeradius-server/raddb/sites-available/control-socket
 ===================================================================
 --- freeradius-server.orig/raddb/sites-available/control-socket
 +++ freeradius-server/raddb/sites-available/control-socket
-@@ -68,7 +68,7 @@ server control {
+@@ -68,7 +68,7 @@ server control-socket-server  {
  			#
  			#  Note that the control socket cannot have uid of 0.
  			#
@@ -65,7 +65,7 @@ Index: freeradius-server/raddb/sites-available/control-socket
  
  			#
  			#  gid:: Name of group which owns the control socket.
-@@ -80,7 +80,7 @@ server control {
+@@ -80,7 +80,7 @@ server control-socket-server  {
  			#
  			#  Note that the control socket cannot have gid of 0.
  			#
diff --git a/raddb/sites-available/control-socket b/raddb/sites-available/control-socket
index 0c5001b932d..7945256095f 100644
--- a/raddb/sites-available/control-socket
+++ b/raddb/sites-available/control-socket
@@ -22,7 +22,7 @@
 #	with the server over the control socket.
 #
 ######################################################################
-server control {
+server control-socket-server  {
 	#
 	#  namespace:: Determine the current scope as a control service.
 	#
diff --git a/src/tests/performance/ack.conf b/src/tests/performance/ack.conf
index 039473a26a3..c4deccac0e3 100644
--- a/src/tests/performance/ack.conf
+++ b/src/tests/performance/ack.conf
@@ -68,7 +68,7 @@ server default {
 	}
 }
 
-server control {
+server control-socket-server  {
 	namespace = control
 	listen {
 		transport = unix
diff --git a/src/tests/performance/proxy.conf b/src/tests/performance/proxy.conf
index 9eff94dbc0f..4918a4ff926 100644
--- a/src/tests/performance/proxy.conf
+++ b/src/tests/performance/proxy.conf
@@ -76,7 +76,7 @@ server default {
 	}
 }
 
-server control {
+server control-socket-server  {
 	namespace = control
 	listen {
 		transport = unix
diff --git a/src/tests/radmin/config/control-socket.conf b/src/tests/radmin/config/control-socket.conf
index b2c873a912e..a6d1dbc672f 100644
--- a/src/tests/radmin/config/control-socket.conf
+++ b/src/tests/radmin/config/control-socket.conf
@@ -55,7 +55,7 @@ client tapioca_test_tcp_client {
 #
 #	Based on src/tests/radmin/config/control-socket.conf
 #
-server control {
+server control-socket-server {
 	namespace = control
 	listen {
 		transport = unix
diff --git a/src/tests/radmin/show-server-list.out b/src/tests/radmin/show-server-list.out
index 4731316e2ef..a08a3496c19 100644
--- a/src/tests/radmin/show-server-list.out
+++ b/src/tests/radmin/show-server-list.out
@@ -1 +1 @@
-control                       namespace = internal
+control-socket-server         namespace = internal