From: Adam Bishop <adam@omega.org.uk>
Date: Mon, 19 Sep 2016 14:47:20 +0000 (+0100)
Subject: NULL the configuration item if no trust router is configured
X-Git-Tag: release_3_0_12~54^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47d53093137089be4eaa47b1f5988a9239ffc18f;p=thirdparty%2Ffreeradius-server.git

NULL the configuration item if no trust router is configured
Add a debug message so the user knows the dyanmic realm functionality is disabled
---

diff --git a/src/modules/rlm_realm/rlm_realm.c b/src/modules/rlm_realm/rlm_realm.c
index 24894ea4660..09f9f0fbdb9 100644
--- a/src/modules/rlm_realm/rlm_realm.c
+++ b/src/modules/rlm_realm/rlm_realm.c
@@ -171,8 +171,11 @@ static int check_for_realm(void *instance, REQUEST *request, REALM **returnrealm
 	/*
 	 *	Try querying for the dynamic realm.
 	 */
-	if (!realm && inst->trust_router)
+	if (!realm && inst->trust_router) {
 		realm = tr_query_realm(request, realmname, inst->default_community, inst->rp_realm, inst->trust_router, inst->tr_port);
+	} else {
+		RDEBUG2("No trust router configured, skipping dynamic realm lookup");
+	}
 #endif
 
 	if (!realm) {
@@ -384,6 +387,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 		if (!tr_init()) return -1;
 	} else {
 		rad_const_free(inst->trust_router);
+		inst->trust_router = NULL;
 	}
 #endif