From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 3 Jan 2021 14:24:43 +0000 (-0500)
Subject: TMPL_TYPE_UNRESOLVED should never occur
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccfa868975e99083fc58c3ae75157ec07c9c0219;p=thirdparty%2Ffreeradius-server.git

TMPL_TYPE_UNRESOLVED should never occur
---

diff --git a/src/lib/server/cond_eval.c b/src/lib/server/cond_eval.c
index 8eeb8641ab4..813189b3631 100644
--- a/src/lib/server/cond_eval.c
+++ b/src/lib/server/cond_eval.c
@@ -134,15 +134,6 @@ void cond_debug(fr_cond_t const *cond)
 int cond_eval_tmpl(request_t *request, UNUSED int depth, tmpl_t const *vpt)
 {
 	switch (vpt->type) {
-	case TMPL_TYPE_UNRESOLVED:
-		/*
-		 *	Empty string is false, non-empty string
-		 *	is true.
-		 *
-		 *	@todo: Maybe also check for digits?
-		 */
-		return (*vpt->data.unescaped != '\0');
-
 	case TMPL_TYPE_ATTR:
 	case TMPL_TYPE_LIST:
 		if (tmpl_find_vp(NULL, request, vpt) == 0) {
@@ -170,6 +161,7 @@ int cond_eval_tmpl(request_t *request, UNUSED int depth, tmpl_t const *vpt)
 	/*
 	 *	Can't have a bare ... (/foo/) ...
 	 */
+	case TMPL_TYPE_UNRESOLVED:
 	case TMPL_TYPE_REGEX:
 	case TMPL_TYPE_REGEX_UNCOMPILED:
 	case TMPL_TYPE_REGEX_XLAT: