commit 197e10aaae6194bb37d3c128fd8ea60964994ece
author Willy Tarreau <w@1wt.eu> Mon Apr 23 19:18:42 2012 +0200
committer Willy Tarreau <w@1wt.eu> Tue May 08 20:57:15 2012 +0200
tree 2e648fe8abd43232591aa29890e603cdf4f0e099
parent f853c46bc3fb3a14629157c545dc31ca55636c3c

MEDIUM: acl: get rid of the SET_RES flags

We now simply rely on a boolean result from a fetch to declare a match.
Booleans are not compared against patterns, they fix the result.

src/acl.c

diff --git a/src/acl.c b/src/acl.c
index 91a9754..9c4ce0c 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -69,7 +69,7 @@
                struct acl_expr *expr, struct sample *smp)
 {
 	smp->type = SMP_T_BOOL;
-	smp->flags |= SMP_F_SET_RES_PASS;
+	smp->data.uint = 1;
 	return 1;
 }
 
@@ -85,7 +85,7 @@
 		return 0;
 	}
 	smp->type = SMP_T_BOOL;
-	smp->flags |= SMP_F_SET_RES_PASS;
+	smp->data.uint = 1;
 	return 1;
 }
 
@@ -95,7 +95,7 @@
                 struct acl_expr *expr, struct sample *smp)
 {
 	smp->type = SMP_T_BOOL;
-	smp->flags |= SMP_F_SET_RES_FAIL;
+	smp->data.uint = 0;
 	return 1;
 }
 
@@ -1870,8 +1870,8 @@
 					continue;
 				}
 
-				if (smp.flags & SMP_F_RES_SET) {
-					if (smp.flags & SMP_F_RES_PASS)
+				if (smp.type == SMP_T_BOOL) {
+					if (smp.data.uint)
 						acl_res |= ACL_PAT_PASS;
 					else
 						acl_res |= ACL_PAT_FAIL;