From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 29 Oct 2020 14:55:31 +0000 (-0400)
Subject: now that abinary is a pointer, treat it as such
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63e257c2be76df4fdb4b2ac02310a24dc4dbfe02;p=thirdparty%2Ffreeradius-server.git

now that abinary is a pointer, treat it as such
---

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index d9901f87c68..2b540957960 100644
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -1890,6 +1890,7 @@ static inline int fr_value_box_cast_to_octets(TALLOC_CTX *ctx, fr_value_box_t *d
 	 *	<string> (excluding terminating \0)
 	 */
 	case FR_TYPE_STRING:
+	case FR_TYPE_ABINARY:
 		if (fr_value_box_memdup(ctx, dst, dst_enumv,
 					(uint8_t const *)src->vb_strvalue, src->vb_length, src->tainted) < 0) {
 			return -1;
diff --git a/src/tests/keywords/base64 b/src/tests/keywords/base64
index d868c572e82..8957fef3183 100644
--- a/src/tests/keywords/base64
+++ b/src/tests/keywords/base64
@@ -22,7 +22,7 @@ update request {
 	&Tmp-String-1		:= "%{base64:%{Tmp-Octets-0}}"
 	&Tmp-String-2		:= "%{base64:%{Tmp-IP-Address-0}}"
 	&Tmp-String-4		:= "%{base64:%{Tmp-Integer-0}}"
-#	&Tmp-String-5		:= "%{base64:%{Tmp-Cast-Abinary}}"
+	&Tmp-String-5		:= "%{base64:%{Tmp-Cast-Abinary}}"
 	&Tmp-String-6		:= "%{base64:%{Tmp-Cast-Ifid}}"
 	&Tmp-String-7		:= "%{base64:%{Tmp-Cast-IPv6Addr}}"
 	&Tmp-String-8		:= "%{base64:%{Tmp-Cast-IPv6Prefix}}"
@@ -50,9 +50,9 @@ if (&Tmp-String-4[0] != 'OTg3NA==') {
 }
 
 # Abinary - bin 0x0101000039383735000000002000110000000714000200000000000000000000
-#if (&Tmp-String-5[0] != 'AQEAADk4NzUAAAAAIAARAAAABxQAAgAAAAAAAAAAAAA=') {
-#	test_fail
-#}
+if (&Tmp-String-5[0] != 'AQEAADk4NzUAAAAAIAARAAAABxQAAgAAAAAAAAAAAAA=') {
+	test_fail
+}
 
 # ifid - bin 0x0000000039383737
 if (&Tmp-String-6[0] != 'AAAAADk4Nzc=') {
diff --git a/src/tests/keywords/hex b/src/tests/keywords/hex
index 431d18a0d82..30155e49a17 100644
--- a/src/tests/keywords/hex
+++ b/src/tests/keywords/hex
@@ -22,7 +22,7 @@ update request {
 	&Tmp-String-1		:= "%{hex:%{Tmp-Octets-0}}"
 	&Tmp-String-2		:= "%{hex:%{Tmp-IP-Address-0}}"
 	&Tmp-String-4		:= "%{hex:%{Tmp-Integer-0}}"
-#	&Tmp-String-5		:= "%{hex:%{Tmp-Cast-Abinary}}"
+	&Tmp-String-5		:= "%{hex:%{Tmp-Cast-Abinary}}"
 	&Tmp-String-6		:= "%{hex:%{Tmp-Cast-Ifid}}"
 	&Tmp-String-7		:= "%{hex:%{Tmp-Cast-IPv6Addr}}"
 	&Tmp-String-8		:= "%{hex:%{Tmp-Cast-IPv6Prefix}}"
@@ -50,9 +50,9 @@ if (&Tmp-String-4 != '39383734') {
 }
 
 # Abinary
-#if (&Tmp-String-5 != '0101000039383735000000002000110000000714000200000000000000000000') {
-#	test_fail
-#}
+if (&Tmp-String-5 != '0101000039383735000000002000110000000714000200000000000000000000') {
+	test_fail
+}
 
 # ifid
 if (&Tmp-String-6 != '0000000039383737') {