From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 9 Jul 2015 17:26:13 +0000 (-0400)
Subject: Always recurse in pass2
X-Git-Tag: release_3_0_10~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f53b3b7e33ac2bafc85d6f103caa8e6b70e69f53;p=thirdparty%2Ffreeradius-server.git

Always recurse in pass2

even if the node is marked as PASS2_FIXUP_NONE.  So that
xlat's can be compiled to attribute references
---

diff --git a/src/main/modcall.c b/src/main/modcall.c
index 7d4f2169fe0..7b54f356d31 100644
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -3164,17 +3164,9 @@ static bool pass2_callback(void *ctx, fr_cond_t *c)
 	}
 
 	/*
-	 *	Maps have a paircompare fixup applied to them.
-	 *	Others get ignored.
+	 *	And tons of complicated checks.
 	 */
-	if (c->pass2_fixup == PASS2_FIXUP_NONE) {
-		if (c->type == COND_TYPE_MAP) {
-			map = c->data.map;
-			goto check_paircmp;
-		}
-
-		return true;
-	}
+	rad_assert(c->type == COND_TYPE_MAP);
 
 	map = c->data.map;	/* shorter */
 
@@ -3212,7 +3204,6 @@ static bool pass2_callback(void *ctx, fr_cond_t *c)
 		c->pass2_fixup = PASS2_FIXUP_NONE;
 	}
 
-check_paircmp:
 	/*
 	 *	Just in case someone adds a new fixup later.
 	 */