From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 1 Jul 2020 21:29:43 +0000 (-0500)
Subject: Fix macro name
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eddfdfeb97fbe4482d426926170e24826ea3d2d8;p=thirdparty%2Ffreeradius-server.git

Fix macro name
---

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index e28fe116295..80ec6ce35cd 100644
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -230,7 +230,7 @@ ssize_t fr_struct_from_network(TALLOC_CTX *ctx, fr_cursor_t *cursor,
 			FR_PROTO_TRACE("fr_struct_from_network - unknown child type");
 			goto unknown;
 
-		case FR_TYPE_VALUES:
+		case FR_TYPE_VALUE:
 			break;
 		}
 
diff --git a/src/lib/util/types.h b/src/lib/util/types.h
index 107dc4cc8e3..3e0826c8f73 100644
--- a/src/lib/util/types.h
+++ b/src/lib/util/types.h
@@ -178,7 +178,7 @@ typedef enum {
 /** Types which do represent concrete values
  *
  */
-#define FR_TYPE_VALUES \
+#define FR_TYPE_VALUE \
 	FR_TYPE_NUMERIC: \
 	case FR_TYPE_STRING: \
 	case FR_TYPE_OCTETS: \
diff --git a/src/protocols/internal/encode.c b/src/protocols/internal/encode.c
index 401911f085b..ee9be2ef377 100644
--- a/src/protocols/internal/encode.c
+++ b/src/protocols/internal/encode.c
@@ -87,7 +87,7 @@ static ssize_t internal_encode(fr_dbuff_t *dbuff,
 	/*
 	 *	Only leaf attributes can be tainted
 	 */
-	case FR_TYPE_VALUES:
+	case FR_TYPE_VALUE:
 		if (vp->vp_tainted) enc_field[0] |= FR_INTERNAL_FLAG_TAINTED;
 		break;
 
@@ -129,7 +129,7 @@ static ssize_t internal_encode(fr_dbuff_t *dbuff,
 	value_field = dbuff->p;
 
 	switch (da->type) {
-	case FR_TYPE_VALUES:
+	case FR_TYPE_VALUE:
 	{
 		size_t need = 0;
 
diff --git a/src/protocols/radius/decode.c b/src/protocols/radius/decode.c
index 7dc86593f3b..d48e1886cb6 100644
--- a/src/protocols/radius/decode.c
+++ b/src/protocols/radius/decode.c
@@ -1183,7 +1183,7 @@ ssize_t fr_radius_decode_pair_value(TALLOC_CTX *ctx, fr_cursor_t *cursor, fr_dic
 	}
 
 	switch (parent->type) {
-	case FR_TYPE_VALUES:
+	case FR_TYPE_VALUE:
 		break;
 
 	case FR_TYPE_COMBO_IP_PREFIX:
diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c
index 0dd61816956..151ba3d939a 100644
--- a/src/protocols/radius/encode.c
+++ b/src/protocols/radius/encode.c
@@ -965,7 +965,7 @@ static ssize_t encode_rfc_hdr_internal(uint8_t *out, size_t outlen,
 		return PAIR_ENCODE_FATAL_ERROR;
 
 	case FR_TYPE_STRUCT:
-	case FR_TYPE_VALUES:
+	case FR_TYPE_VALUE:
 		if (((fr_dict_vendor_num_by_da(da_stack->da[depth]) == 0) && (da_stack->da[depth]->attr == 0)) ||
 		    (da_stack->da[depth]->attr > 255)) {
 			fr_strerror_printf("%s: Called with non-standard attribute %u", __FUNCTION__,