Fix macro name

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index e28fe116295d99618078eaa82ae246b1004105d0..80ec6ce35cdda262e81acef1eb9d10ea223c0816 100644 (file)
--- 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 107dc4cc8e3899f1f88247147e88c5d5f609e3d0..3e0826c8f73042a75bebccfcdcbd0ae3368807d9 100644 (file)
--- 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 401911f085b2f4a69f636f63bd096bf49ea0717a..ee9be2ef377b50dfb78b6a3e40a9ccb14624df8c 100644 (file)
--- 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 7dc86593f3bba9eeadbc177e7dfc8ba86484cfae..d48e1886cb6102f6145c93918a34b88c883a6d61 100644 (file)
--- 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 0dd6181695613ba763dc499424d6eb0c00702836..151ba3d939ab02211e70609a9912afbec3bf409a 100644 (file)
--- 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__,