From: Alan T. DeKok Date: Tue, 21 May 2019 17:32:31 +0000 (-0400) Subject: disallow FT_TYPE_ABINARY in conf parser X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=577af4dbd5aef4c3815a30ed0e1340af45bc240e;p=thirdparty%2Ffreeradius-server.git disallow FT_TYPE_ABINARY in conf parser there are unexplained build errors after the previous commit, AND there is no reason to allow ABINARY in the config files. Nothing in the config file parser encodes strings to ABINARY, so the "builtin_choose_expr" macro would never do anything useful. --- diff --git a/src/lib/server/cf_parse.h b/src/lib/server/cf_parse.h index ff8d21e1185..91849891587 100644 --- a/src/lib/server/cf_parse.h +++ b/src/lib/server/cf_parse.h @@ -147,9 +147,9 @@ _Generic((_ct), \ (FR_BASE_TYPE(_t) == FR_TYPE_COMBO_IP_ADDR)) && \ ((_t) & FR_TYPE_MULTI), _p, (_mismatch_fripaddr_m) 0), \ size_t[32/sizeof(size_t)] : __builtin_choose_expr((FR_BASE_TYPE(_t) == FR_TYPE_ABINARY) && !((_t) & FR_TYPE_MULTI), \ - _p, (_mismatch_abinary) 0), \ + (_mismatch_abinary) 0, (_mismatch_abinary) 0), \ size_t*[32/sizeof(size_t)] : __builtin_choose_expr((FR_BASE_TYPE(_t) == FR_TYPE_ABINARY) && ((_t) & FR_TYPE_MULTI), \ - _p, (_mismatch_abinary_m) 0), \ + (_mismatch_abinary) 0, (_mismatch_abinary_m) 0), \ uint8_t const * : __builtin_choose_expr((FR_BASE_TYPE(_t) == FR_TYPE_OCTETS) && !((_t) & FR_TYPE_MULTI), \ _p, (_mismatch_uint8) 0), \ uint8_t const **: __builtin_choose_expr((FR_BASE_TYPE(_t) == FR_TYPE_OCTETS) && ((_t) & FR_TYPE_MULTI), \ diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c index 8c9bef15add..55a1ff7926a 100644 --- a/src/modules/rlm_test/rlm_test.c +++ b/src/modules/rlm_test/rlm_test.c @@ -70,9 +70,6 @@ typedef struct { time_t date; time_t *date_m; - size_t abinary[32/sizeof(size_t)]; - size_t *abinary_m[32/sizeof(size_t)]; - uint8_t const *octets; uint8_t const **octets_m; @@ -136,9 +133,6 @@ static const CONF_PARSER module_config[] = { { FR_CONF_OFFSET("date", FR_TYPE_DATE, rlm_test_t, date) }, { FR_CONF_OFFSET("date_m", FR_TYPE_DATE | FR_TYPE_MULTI, rlm_test_t, date_m) }, - { FR_CONF_OFFSET("abinary", FR_TYPE_ABINARY, rlm_test_t, abinary) }, - { FR_CONF_OFFSET("abinary_m", FR_TYPE_ABINARY | FR_TYPE_MULTI, rlm_test_t, abinary_m) }, - { FR_CONF_OFFSET("octets", FR_TYPE_OCTETS, rlm_test_t, octets) }, { FR_CONF_OFFSET("octets_m", FR_TYPE_OCTETS | FR_TYPE_MULTI, rlm_test_t, octets_m) },