From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 10 Jan 2021 15:06:21 +0000 (-0500)
Subject: all tmpls have now been resolved
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=308a5baea89185c6bf7ee792f56e216be27fbea3;p=thirdparty%2Ffreeradius-server.git

all tmpls have now been resolved
---

diff --git a/src/lib/server/cond_eval.c b/src/lib/server/cond_eval.c
index 52dfece896e..67cb44a86e0 100644
--- a/src/lib/server/cond_eval.c
+++ b/src/lib/server/cond_eval.c
@@ -621,13 +621,10 @@ int cond_eval_map(request_t *request, UNUSED int depth, fr_cond_t const *c)
 
 #ifndef NDEBUG
 	/*
-	 *	Regex LHS may have an unresolved tmpl, as it's just a
-	 *	string.  Maybe we want to cast that to data?
+	 *	At this point, all tmpls MUST have been resolved.
 	 */
-	if ((c->data.map->op != T_OP_REG_EQ) && (c->data.map->op != T_OP_REG_NE)) {
-		fr_assert(!tmpl_is_unresolved(c->data.map->lhs) || (c->data.map->lhs->cast != FR_TYPE_INVALID));
-		fr_assert(!tmpl_is_unresolved(c->data.map->rhs) || (c->data.map->rhs->cast != FR_TYPE_INVALID));
-	}
+	fr_assert(!tmpl_is_unresolved(c->data.map->lhs) || (c->data.map->lhs->cast != FR_TYPE_INVALID));
+	fr_assert(!tmpl_is_unresolved(c->data.map->rhs) || (c->data.map->rhs->cast != FR_TYPE_INVALID));
 #endif
 
 	EVAL_DEBUG(">>> MAP TYPES LHS: %s, RHS: %s",