From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 3 Mar 2013 16:45:04 +0000 (-0500)
Subject: Added 0x... for numbers
X-Git-Tag: release_3_0_0_beta1~846
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5754507a9829fc2dd1930d2016c5c947f36465a;p=thirdparty%2Ffreeradius-server.git

Added 0x... for numbers
---

diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
index 801a0effe42..5ddaea62f3d 100644
--- a/src/modules/rlm_expr/rlm_expr.c
+++ b/src/modules/rlm_expr/rlm_expr.c
@@ -158,6 +158,15 @@ static int get_number(REQUEST *request, const char **string, int64_t *answer)
 			 *
 			 *  If it isn't, then we die.
 			 */
+			if ((*p == '0') && (p[1] == 'x')) {
+				char *end;
+
+				x = strtoul(p, &end, 16);
+				p = end;
+				goto calc;
+			}
+
+
 			if ((*p < '0') || (*p > '9')) {
 				RDEBUG2("Not a number at \"%s\"", p);
 				return -1;
@@ -175,6 +184,7 @@ static int get_number(REQUEST *request, const char **string, int64_t *answer)
 			}
 		}
 
+	calc:
 		switch (this) {
 		default:
 		case TOKEN_NONE: