remove instances of .variadic = false

diff --git a/src/lib/eap_aka_sim/xlat.c b/src/lib/eap_aka_sim/xlat.c
index 7b39271b2cd629109427042311ef01a87edce1f3..8807a46d2f7e4fdbf64e06279e17f67265e3b293 100644 (file)
--- a/src/lib/eap_aka_sim/xlat.c
+++ b/src/lib/eap_aka_sim/xlat.c
@@ -181,11 +181,11 @@ static xlat_action_t aka_sim_id_3gpp_temporary_id_key_index_xlat(TALLOC_CTX *ctx
 
 extern xlat_arg_parser_t aka_sim_3gpp_temporary_id_decrypt_xlat_args[];
 xlat_arg_parser_t aka_sim_3gpp_temporary_id_decrypt_xlat_args[] = {
-       { .required = true, .concat = true, .single = false, .variadic = false, .type = FR_TYPE_STRING,
+       { .required = true, .concat = true, .single = false, .type = FR_TYPE_STRING,
          .func = NULL, .uctx = NULL },
-       { .required = true, .concat = true, .single = false, .variadic = false, .type = FR_TYPE_OCTETS,
+       { .required = true, .concat = true, .single = false, .type = FR_TYPE_OCTETS,
          .func = NULL, .uctx = NULL },
-       { .required = false, .concat = false, .single = true, .variadic = false, .type = FR_TYPE_BOOL,
+       { .required = false, .concat = false, .single = true, .type = FR_TYPE_BOOL,
          .func = NULL, .uctx = NULL },
        XLAT_ARG_PARSER_TERMINATOR
 };
@@ -327,10 +327,10 @@ static xlat_action_t aka_sim_3gpp_temporary_id_decrypt_xlat(TALLOC_CTX *ctx, fr_
 
 extern xlat_arg_parser_t aka_sim_3gpp_temporary_id_encrypt_xlat_args[];
 xlat_arg_parser_t aka_sim_3gpp_temporary_id_encrypt_xlat_args[] = {
-       { .required = true, .concat = true, .single = false, .variadic = false, .type = FR_TYPE_STRING  },
-       { .required = true, .concat = true, .single = false, .variadic = false, .type = FR_TYPE_OCTETS  },
-       { .required = true, .concat = false, .single = true, .variadic = false, .type = FR_TYPE_UINT8   },
-       { .required = false, .concat = false, .single = true, .variadic = false, .type = FR_TYPE_STRING },
+       { .required = true, .concat = true, .single = false, .type = FR_TYPE_STRING     },
+       { .required = true, .concat = true, .single = false, .type = FR_TYPE_OCTETS     },
+       { .required = true, .concat = false, .single = true, .type = FR_TYPE_UINT8      },
+       { .required = false, .concat = false, .single = true, .type = FR_TYPE_STRING    },
        XLAT_ARG_PARSER_TERMINATOR
 };
 

diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c
index d1d5c96cc3dd7cd513bc5825213414e3bdca4cc8..799fddd2bd1a57541dcb068ed6d1f6ad0cfa2a1b 100644 (file)
--- a/src/modules/rlm_cipher/rlm_cipher.c
+++ b/src/modules/rlm_cipher/rlm_cipher.c
@@ -763,10 +763,9 @@ static xlat_action_t cipher_rsa_decrypt_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 }
 
 static xlat_arg_parser_t const cipher_rsa_verify_xlat_arg[] = {
-       { .required = true, .concat = false, .single = true, .variadic = false, .type = FR_TYPE_VOID,
-         .func = NULL, .uctx = NULL },
        { .required = true, .concat = true, .single = false, .variadic = true, .type = FR_TYPE_STRING,
          .func = NULL, .uctx = NULL },
+       { .required = true, .concat = false, .single = true, .type = FR_TYPE_VOID },
        XLAT_ARG_PARSER_TERMINATOR
 };
 
@@ -880,8 +879,8 @@ static xlat_action_t cipher_rsa_verify_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 }
 
 static xlat_arg_parser_t const cipher_certificate_xlat_args[] = {
-       { .required = true, .concat = false, .single = true, .variadic = false, .type = FR_TYPE_STRING },
-       { .required = false, .concat = false, .single = true, .variadic = false, .type = FR_TYPE_STRING }, /* Optional hash for fingerprint mode */
+       { .required = true, .concat = false, .single = true, .type = FR_TYPE_STRING },
+       { .required = false, .concat = false, .single = true, .type = FR_TYPE_STRING }, /* Optional hash for fingerprint mode */
        XLAT_ARG_PARSER_TERMINATOR
 };