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

diff --git a/debian/patches/radiusd-to-freeradius.diff b/debian/patches/radiusd-to-freeradius.diff
index 500efda08b36b8b77bbf90cfe5654381a6c4d8a5..4b0a28b3bb2400a9e8f700a3194abf228b3cdf30 100644 (file)
--- 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 0c5001b932d08c77e6e25a1c5f1b84fec446b2ed..7945256095fd863624e05ec4e6dc1e430e70bc8b 100644 (file)
--- 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 039473a26a3599fe5713d460a2af4efab6417ba7..c4deccac0e3fb2d1444ed2413be65dd84954b7e6 100644 (file)
--- 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 9eff94dbc0f3370baaa0de5289a195de21fc9f1b..4918a4ff926b7e5a8051ac3cc0f84f5c852cd949 100644 (file)
--- 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 b2c873a912efcd68270d854f8b72a2a37b15d873..a6d1dbc672f207cf29bd0561ceaa4cb3c99c2679 100644 (file)
--- 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 4731316e2efdf889d6fbc2b2f6df8ea78076e08a..a08a3496c19dfbf11957b5a5399040e147440f73 100644 (file)
--- 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