Distinguish failure modes

FreeRADIUS · Apr 11, 2014 · 631bf63 · 631bf63
1 parent 6529e99
commit 631bf63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/tests/keywords/update-remove-any b/src/tests/keywords/update-remove-any
@@ -19,7 +19,7 @@ update {
 
 if (("%{Tmp-IP-Address-0[0]}" != 192.0.2.1) || ("%{Tmp-IP-Address-0[1]}" != 192.0.2.2)) {
 	update {
-		reply:Filter-Id := 'fail'
+		reply:Filter-Id := 'fail 1'
 	}
 }
 
@@ -31,20 +31,20 @@ update {
 # Non Tmp-IP-Address-0 address attributes should still be in the request list
 if ((Tmp-String-0 != 'foobarbaz') || (Tmp-Integer-0 != 123456789)) {
 	update reply {
-		reply:Filter-Id := 'fail'
+		reply:Filter-Id += 'fail 2'
 	}
 }
 
 # There should be no Tmp-IP-Address attributes in the request list
-if (("%{Tmp-IP-Address-0[0]}" != '') || ("%{Tmp-IP-Address-0[1]}" != '')) {
+if (Tmp-IP-Address-0 || ("%{Tmp-IP-Address-0[1]}" != '')) {
 	update {
-		reply:Filter-Id := 'fail'
+		reply:Filter-Id += 'fail 3'
 	}
 }
 
 # But there should still be some in the control list
-if (("%{control:Tmp-IP-Address-0[0]}" != 192.0.2.1) || ("%{control:Tmp-IP-Address-0[1]}" != 192.0.2.3)) {
+if ((control:Tmp-IP-Address-0 != 192.0.2.1) || ("%{control:Tmp-IP-Address-0[1]}" != 192.0.2.3)) {
 	update {
-		reply:Filter-Id := 'fail'
+		reply:Filter-Id += 'fail 4'
 	}
 }
diff --git a/src/tests/keywords/xlat-octets b/src/tests/keywords/xlat-octets
@@ -19,18 +19,18 @@ update request {
 
 if ("%{Tmp-Octets-0}" != '0001020304050607') {
 	update {
-		reply:Filter-Id := 'fail'
+		reply:Filter-Id := 'fail 1'
 	}
 }
 
 if ("%{Tmp-Octets-0[0]}" != '0001020304050607') {
 	update {
-		reply:Filter-Id := 'fail'
+		reply:Filter-Id += 'fail 2'
 	}
 }
 
 if ("%{Tmp-Octets-0[*]}" != '0001020304050607,0706050403020100') {
 	update {
-		reply:Filter-Id := 'fail'
+		reply:Filter-Id += 'fail 3'
 	}
 }