From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 30 Jun 2011 14:01:56 +0000 (+0200)
Subject: Be less strict about duplicate virtual servers
X-Git-Tag: release_2_1_12~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b407ddb140fb6494e518f253315632878b1b7971;p=thirdparty%2Ffreeradius-server.git

Be less strict about duplicate virtual servers

If they share the same top-level CONF_SECTION, they're duplicates.

Otherwise, the server is reloading it's configuration, so the new
configuration should be allowed to be loaded.
---

diff --git a/src/main/modules.c b/src/main/modules.c
index c299247f318..99a8fef4e0e 100644
--- a/src/main/modules.c
+++ b/src/main/modules.c
@@ -1243,7 +1243,8 @@ int virtual_servers_load(CONF_SECTION *config)
 		if (!name2) continue; /* handled above */
 
 		server = virtual_server_find(name2);
-		if (server) {
+		if (server &&
+		    (cf_top_section(server->cs) == config)) {
 			radlog(L_ERR, "Duplicate virtual server \"%s\" in file %s:%d and file %s:%d",
 			       server->name,
 			       cf_section_filename(server->cs),