From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 15 Jan 2021 15:19:49 +0000 (-0500)
Subject: tests for paircmp() against strings and attributes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f06087aca76a6dcb648e5f027b0e8b8052d174fd;p=thirdparty%2Ffreeradius-server.git

tests for paircmp() against strings and attributes
---

diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index edb11e2435e..50b55f147de 100644
--- a/src/lib/server/cond_tokenize.c
+++ b/src/lib/server/cond_tokenize.c
@@ -301,7 +301,7 @@ int fr_cond_promote_types(fr_cond_t *c, fr_sbuff_t *in, fr_sbuff_marker_t *m_lhs
 	 *	for attributes.
 	 */
 	if (tmpl_is_attr(c->data.map->rhs) &&
-	    !tmpl_is_attr(c->data.map->lhs)) {
+	    !tmpl_contains_attr(c->data.map->lhs)) { /* also unresolved attributes! */
 		tmpl_t *tmp;
 		fr_sbuff_marker_t *m_tmp;
 
diff --git a/src/tests/keywords/paircmp b/src/tests/keywords/paircmp
new file mode 100644
index 00000000000..c4a1f9c34e8
--- /dev/null
+++ b/src/tests/keywords/paircmp
@@ -0,0 +1,28 @@
+#
+#  PRE: if update
+#
+update request {
+	&NAS-Identifier = "yes"
+}
+
+#
+#  test raw values
+#
+if (&Test-Paircmp == 'yes') {
+	success
+
+}
+else {
+	test_fail
+}
+
+#
+#  test inter-attribute comparisons
+#
+if (&Test-Paircmp == &NAS-Identifier) {
+	success
+
+}
+else {
+	test_fail
+}