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 e44f23d468a2ae9dc8cdbc2b31e5dd6beadec0d3..a012c771802848db43386bf17bcc5ff463411139 100644 (file)
--- 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.
                 */