From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 5 Dec 2022 20:43:32 +0000 (-0500)
Subject: add RPEDEBUG wehn failing assigment and update tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=749445baa2d2785c80050a130f693e421f272d9c;p=thirdparty%2Ffreeradius-server.git

add RPEDEBUG wehn failing assigment and update tests
---

diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c
index b56f0303228..7094a5129e1 100644
--- a/src/lib/unlang/edit.c
+++ b/src/lib/unlang/edit.c
@@ -651,6 +651,7 @@ static int apply_edits_to_leaf(request_t *request, unlang_frame_state_edit_t *st
 						       map->op,
 						       box) < 0) {
 		fail:
+			RPEDEBUG("Assigning value to %s failed", map->lhs->name);
 			if (pair) tmpl_dcursor_clear(&cc);
 			return -1;
 		}
diff --git a/src/tests/keywords/cast-ipaddr b/src/tests/keywords/cast-ipaddr
index 250fac36e61..3c6d1a31550 100644
--- a/src/tests/keywords/cast-ipaddr
+++ b/src/tests/keywords/cast-ipaddr
@@ -135,7 +135,7 @@ redundant {
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv6addr" failed: Invalid cast from ipv6prefix to ipv6addr.  Only /128 (not /32) prefixes may be cast to IP address types') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv6Addr failed: Invalid cast from ipv6prefix to ipv6addr.  Only /128 (not /32) prefixes may be cast to IP address types') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -152,7 +152,7 @@ redundant {
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /64) prefixes may be cast to IP address types') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /64) prefixes may be cast to IP address types') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -165,11 +165,11 @@ redundant {
 #
 redundant {
 	group {
-		&control.Tmp-Cast-Ipv4Prefix := &Tmp-Cast-IPv6Prefix[2]
+		&control.Tmp-Cast-Ipv4prefix := &Tmp-Cast-IPv6Prefix[2]
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv4prefix" failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipv4prefix failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -186,7 +186,7 @@ redundant {
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv6addr" failed: Invalid cast from ipv4prefix to ipv6addr.  Only /32 (not /24) prefixes may be cast to IP address types') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv6Addr failed: Invalid cast from ipv4prefix to ipv6addr.  Only /32 (not /24) prefixes may be cast to IP address types') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -203,7 +203,7 @@ redundant {
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv4prefix to ipaddr.  Only /32 (not 24/) prefixes may be cast to IP address types') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv4prefix to ipaddr.  Only /32 (not 24/) prefixes may be cast to IP address types') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -220,7 +220,7 @@ redundant {
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /32) prefixes may be cast to IP address types') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv6prefix to ipaddr.  Only /128 (not /32) prefixes may be cast to IP address types') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -233,11 +233,11 @@ redundant {
 #
 redundant {
 	group {
-		&control.Tmp-Cast-IPv4Prefix := &Tmp-Cast-IPv6Prefix[0]
+		&control.Tmp-Cast-IPv4prefix := &Tmp-Cast-IPv6Prefix[0]
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv4prefix" failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv4prefix failed: Invalid cast from ipv6prefix to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -254,7 +254,7 @@ redundant {
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipaddr" failed: Invalid cast from ipv6addr to ipaddr.  No IPv4-IPv6 mapping prefix') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-Ipaddr failed: Invalid cast from ipv6addr to ipaddr.  No IPv4-IPv6 mapping prefix') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]
@@ -267,11 +267,11 @@ redundant {
 #
 redundant {
 	group {
-		&control.Tmp-Cast-IPv4Prefix := &Tmp-Cast-IPv6Addr[0]
+		&control.Tmp-Cast-IPv4prefix := &Tmp-Cast-IPv6Addr[0]
 		fail
 	}
 	group {
-		if (&Module-Failure-Message != 'Assigning value to "Tmp-Cast-ipv4prefix" failed: Invalid cast from ipv6addr to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
+		if !(&Module-Failure-Message == 'Assigning value to &control.Tmp-Cast-IPv4prefix failed: Invalid cast from ipv6addr to ipv4prefix.  No IPv4-IPv6 mapping prefix') {
 			test_fail
 		}
 		&request -= &Module-Failure-Message[*]