From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 27 Mar 2018 13:14:28 +0000 (-0400)
Subject: expand the *unescaped* string, not the raw `...` string.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73ffdf151f3d7c0afe57f10193def969ed69f4e5;p=thirdparty%2Ffreeradius-server.git

expand the *unescaped* string, not the raw `...` string.

Manual port of commit 5f8d05da
---

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index e44f23d468a..a012c771802 100644
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -159,6 +159,13 @@ int sql_fr_pair_list_afrom_str(TALLOC_CTX *ctx, REQUEST *request, VALUE_PAIR **h
 
 		token = gettoken(&value, buf, sizeof(buf), false);
 		switch (token) {
+		/*
+		 *	Mark the pair to be allocated later.
+		 */
+		case T_BACK_QUOTED_STRING:
+			do_xlat = 1;
+			/* FALL-THROUGH */
+
 		/*
 		 *	Take the unquoted string.
 		 */
@@ -167,14 +174,6 @@ int sql_fr_pair_list_afrom_str(TALLOC_CTX *ctx, REQUEST *request, VALUE_PAIR **h
 			value = buf;
 			break;
 
-		/*
-		 *	Mark the pair to be allocated later.
-		 */
-		case T_BACK_QUOTED_STRING:
-			do_xlat = 1;
-
-			/* FALL-THROUGH */
-
 		/*
 		 *	Keep the original string.
 		 */