From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 6 Mar 2013 22:20:25 +0000 (-0500)
Subject: Create non xlated values too!
X-Git-Tag: release_3_0_0_beta1~814
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c6f01a35cce47142e5dadaa400f232e66c0482;p=thirdparty%2Ffreeradius-server.git

Create non xlated values too!
---

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 48e3e651c80..42ed898437e 100644
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -254,6 +254,13 @@ int sql_userparse(VALUE_PAIR **head, rlm_sql_row_t row)
 		if (pairmark_xlat(vp, value) < 0) {
 			radlog(L_ERR, "rlm_sql: Error marking pair for xlat");
 			
+			pairbasicfree(vp);
+			return -1;
+		}
+	} else {
+		if (pairparsevalue(vp, value) < 0) {
+			radlog(L_ERR, "rlm_sql: Error parsing value");
+			
 			pairbasicfree(vp);
 			return -1;
 		}
@@ -412,8 +419,9 @@ int sql_getvpdata(rlm_sql_t * inst, rlm_sql_handle_t **handle, VALUE_PAIR **pair
 	rlm_sql_row_t row;
 	int     rows = 0;
 
-	if (rlm_sql_select_query(handle, inst, query))
+	if (rlm_sql_select_query(handle, inst, query)) {
 		return -1;
+	}
 
 	while (rlm_sql_fetch_row(handle, inst) == 0) {
 		row = (*handle)->row;