From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 8 Apr 2019 20:31:42 +0000 (-0400)
Subject: look in root for virtual server
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fd22318feb100c8041309e1460fc2f02e81340e;p=thirdparty%2Ffreeradius-server.git

look in root for virtual server

as virtual servers haven't been bootstrapped yet, so we can't
call virtual_server_find()
---

diff --git a/src/lib/server/client.c b/src/lib/server/client.c
index 8512a130377..5b5203b6d24 100644
--- a/src/lib/server/client.c
+++ b/src/lib/server/client.c
@@ -220,7 +220,12 @@ bool client_add(RADCLIENT_LIST *clients, RADCLIENT *client)
 			CONF_SECTION *cs;
 			CONF_SECTION *subcs;
 
-			cs = virtual_server_find(client->server);
+			if (!client->cs) {
+				ERROR("Failed to find configuration section in client.  Ignoring 'virtual_server' directive");
+				return false;
+			}
+
+			cs = cf_section_find(cf_root(client->cs), "server", client->server);
 			if (!cs) {
 				ERROR("Failed to find virtual server %s", client->server);
 				return false;