Change ! to ~, as that's what it really is.

FreeRADIUS · Oct 6, 2014 · 7d873b6 · 7d873b6
1 parent d80591c
commit 7d873b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/raddb/mods-available/expr b/raddb/mods-available/expr
@@ -29,7 +29,7 @@
 #  precedence.
 #
 #  It also allows unary negation:	-1
-#  And logical invert:			!1
+#  And twos complement:			~1
 #
 #  All calculations are done on signed 63-bit integers.
 #  e.g. int64_t.  This should be sufficient for all normal

diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
@@ -129,9 +129,9 @@ static bool get_number(REQUEST *request, char const **string, int64_t *answer)
 	while (isspace((int) *p)) p++;
 
 	/*
-	 *	!1 == 0xff...ffe
+	 *	~1 == 0xff...ffe
 	 */
-	if (*p == '!') {
+	if (*p == '~') {
 		invert = true;
 		p++;
 	}

diff --git a/src/tests/keywords/expr b/src/tests/keywords/expr
@@ -54,13 +54,13 @@ if ("%{expr: 1 + 2 * (&Tmp-Integer-1 + &Tmp-Integer-2)}" != 15) {
 	}
 }
 
-if ("%{expr: 1 & !1}" != 0) {
+if ("%{expr: 1 & ~1}" != 0) {
 	update reply {
 		Filter-Id := "fail-6"
 	}
 }
 
-if ("%{expr: 1 & !2}" != 1) {
+if ("%{expr: 1 & ~2}" != 1) {
 	update reply {
 		Filter-Id := "fail-7"
 	}