From: Phil Mayers <p.mayers@imperial.ac.uk>
Date: Sat, 6 Oct 2012 13:00:47 +0000 (+0100)
Subject: fix pairmake->pairmake_xlat->pairmake recursive calls with regexps; lets regexps... 
X-Git-Tag: release_3_0_0_beta1~1662^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=119c4cc4aa5ed48471a0af5c1d0a0dec3e174e7b;p=thirdparty%2Ffreeradius-server.git

fix pairmake->pairmake_xlat->pairmake recursive calls with regexps; lets regexps work in "users" files again
---

diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
index e5f2d9d3ad1..57ace38a8c9 100644
--- a/src/lib/valuepair.c
+++ b/src/lib/valuepair.c
@@ -1645,10 +1645,10 @@ VALUE_PAIR *pairmake(const char *attribute, const char *value, int operator)
 
 #else
 		if (!value) {
-			fr_strerror_printf("No regular expression found in %s",
-					   vp->name);
-		        pairbasicfree(vp);
-			return NULL;
+			/* just return the vp - we've probably been called
+			 * by pairmake_xlat who will fill in the value for us
+			 */
+			return vp;
 		}
 
 		pairbasicfree(vp);