From eecd8e0de206c16b5b895f193f5b795926efd159 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Sat, 8 Mar 2025 12:32:15 -0500 Subject: [PATCH] remove & from default values for module configurations --- .../drivers/rlm_cache_redis/rlm_cache_redis.c | 4 ++-- .../types/rlm_eap_mschapv2/rlm_eap_mschapv2.c | 2 +- src/modules/rlm_ldap/rlm_ldap.c | 2 +- src/modules/rlm_redis_ippool/rlm_redis_ippool.c | 2 +- src/modules/rlm_rest/rlm_rest.c | 6 +++--- src/modules/rlm_totp/rlm_totp.c | 12 ++++++------ src/modules/rlm_winbind/rlm_winbind.c | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c index b0d471f162..75e73937bd 100644 --- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c +++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c @@ -87,12 +87,12 @@ static int mod_instantiate(module_inst_ctx_t const *mctx) /* * These never change, so do it once on instantiation */ - if (tmpl_afrom_attr_str(driver, NULL, &driver->created_attr, "&Cache-Created", NULL) <= 0) { + if (tmpl_afrom_attr_str(driver, NULL, &driver->created_attr, "Cache-Created", NULL) <= 0) { ERROR("Cache-Created attribute not defined"); return -1; } - if (tmpl_afrom_attr_str(driver, NULL, &driver->expires_attr, "&Cache-Expires", NULL) <= 0) { + if (tmpl_afrom_attr_str(driver, NULL, &driver->expires_attr, "Cache-Expires", NULL) <= 0) { ERROR("Cache-Expires attribute not defined"); return -1; } diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index df329a4d3e..0c7f867ef4 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -490,7 +490,7 @@ failure: } RDEBUG2("Adding stored attributes to parent"); - log_request_pair_list(L_DBG_LVL_2, request, NULL, &data->mppe_keys, "&parent.reply."); + log_request_pair_list(L_DBG_LVL_2, request, NULL, &data->mppe_keys, "parent.reply."); MEM(fr_pair_list_copy(ms, &ms->vp_group, &data->mppe_keys) >= 0); } else { RDEBUG2("No stored attributes to copy to parent"); diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index 26a1871627..4566767464 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -195,7 +195,7 @@ static const call_env_method_t authenticate_method_env = { { FR_CALL_ENV_PARSE_OFFSET("password_attribute", FR_TYPE_STRING, CALL_ENV_FLAG_ATTRIBUTE | CALL_ENV_FLAG_REQUIRED | CALL_ENV_FLAG_NULLABLE | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, ldap_auth_call_env_t, password, password_tmpl), - .pair.dflt = "&User-Password", .pair.dflt_quote = T_BARE_WORD }, + .pair.dflt = "User-Password", .pair.dflt_quote = T_BARE_WORD }, { FR_CALL_ENV_SUBSECTION("sasl", NULL, CALL_ENV_FLAG_NONE, sasl_call_env) }, CALL_ENV_TERMINATOR })) }, diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c index 1a0f89663b..e5d0b5c747 100644 --- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c +++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c @@ -196,7 +196,7 @@ static const call_env_method_t redis_ippool_alloc_method_env = { .pair.dflt = "%{%{Requested-IP-Address} || %{Net.Src.IP}}", .pair.dflt_quote = T_DOUBLE_QUOTED_STRING }, { FR_CALL_ENV_PARSE_ONLY_OFFSET("allocated_address_attr", FR_TYPE_VOID, CALL_ENV_FLAG_ATTRIBUTE | CALL_ENV_FLAG_REQUIRED, redis_ippool_alloc_call_env_t, allocated_address_attr) }, { FR_CALL_ENV_PARSE_ONLY_OFFSET("range_attr", FR_TYPE_VOID, CALL_ENV_FLAG_ATTRIBUTE | CALL_ENV_FLAG_REQUIRED, redis_ippool_alloc_call_env_t, range_attr), - .pair.dflt = "&reply.IP-Pool.Range", .pair.dflt_quote = T_BARE_WORD }, + .pair.dflt = "reply.IP-Pool.Range", .pair.dflt_quote = T_BARE_WORD }, { FR_CALL_ENV_PARSE_ONLY_OFFSET("expiry_attr", FR_TYPE_VOID, CALL_ENV_FLAG_ATTRIBUTE, redis_ippool_alloc_call_env_t, expiry_attr) }, CALL_ENV_TERMINATOR } diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c index cb61216dd8..2963984c91 100644 --- a/src/modules/rlm_rest/rlm_rest.c +++ b/src/modules/rlm_rest/rlm_rest.c @@ -188,9 +188,9 @@ static const conf_parser_t module_config[] = { #define REST_CALL_ENV_REQUEST_COMMON(_dflt_username, _dflt_password) \ { FR_CALL_ENV_OFFSET("header", FR_TYPE_STRING, CALL_ENV_FLAG_MULTI, rlm_rest_call_env_t, request.header) }, \ { FR_CALL_ENV_OFFSET("data", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, rlm_rest_call_env_t, request.data) }, \ - { FR_CALL_ENV_OFFSET("username", FR_TYPE_STRING, CALL_ENV_FLAG_SINGLE | CALL_ENV_FLAG_NULLABLE, \ + { FR_CALL_ENV_OFFSET("username", FR_TYPE_STRING, CALL_ENV_FLAG_SINGLE | CALL_ENV_FLAG_NULLABLE | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, \ rlm_rest_call_env_t, request.username), .pair.dflt_quote = T_BARE_WORD, _dflt_username }, \ - { FR_CALL_ENV_OFFSET("password", FR_TYPE_STRING, CALL_ENV_FLAG_SINGLE | CALL_ENV_FLAG_NULLABLE | CALL_ENV_FLAG_SECRET, \ + { FR_CALL_ENV_OFFSET("password", FR_TYPE_STRING, CALL_ENV_FLAG_SINGLE | CALL_ENV_FLAG_NULLABLE | CALL_ENV_FLAG_SECRET | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, \ rlm_rest_call_env_t, request.password), .pair.dflt_quote = T_BARE_WORD, _dflt_password }, \ #define REST_CALL_ENV_RESPONSE_COMMON \ @@ -234,7 +234,7 @@ static const call_env_method_t _var = { \ } REST_CALL_ENV_SECTION(rest_call_env_authorize, "authorize",,); -REST_CALL_ENV_SECTION(rest_call_env_authenticate, "authenticate", .pair.dflt = "&User-Name", .pair.dflt = "&User-Password"); +REST_CALL_ENV_SECTION(rest_call_env_authenticate, "authenticate", .pair.dflt = "User-Name", .pair.dflt = "User-Password"); REST_CALL_ENV_SECTION(rest_call_env_post_auth, "post-auth",,); REST_CALL_ENV_SECTION(rest_call_env_accounting, "accounting",,); diff --git a/src/modules/rlm_totp/rlm_totp.c b/src/modules/rlm_totp/rlm_totp.c index 9e6800ec4b..1425a08b25 100644 --- a/src/modules/rlm_totp/rlm_totp.c +++ b/src/modules/rlm_totp/rlm_totp.c @@ -42,14 +42,14 @@ typedef struct { static const call_env_method_t method_env = { FR_CALL_ENV_METHOD_OUT(rlm_totp_call_env_t), .env = (call_env_parser_t[]) { - { FR_CALL_ENV_OFFSET("secret", FR_TYPE_STRING, CALL_ENV_FLAG_NULLABLE, rlm_totp_call_env_t, secret), - .pair.dflt = "&control.TOTP.Secret", .pair.dflt_quote = T_BARE_WORD }, + { FR_CALL_ENV_OFFSET("secret", FR_TYPE_STRING, CALL_ENV_FLAG_NULLABLE | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, rlm_totp_call_env_t, secret), + .pair.dflt = "control.TOTP.Secret", .pair.dflt_quote = T_BARE_WORD }, - { FR_CALL_ENV_OFFSET("key", FR_TYPE_STRING, CALL_ENV_FLAG_NULLABLE, rlm_totp_call_env_t, key), - .pair.dflt = "&control.TOTP.key", .pair.dflt_quote = T_BARE_WORD }, + { FR_CALL_ENV_OFFSET("key", FR_TYPE_STRING, CALL_ENV_FLAG_NULLABLE | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, rlm_totp_call_env_t, key), + .pair.dflt = "control.TOTP.key", .pair.dflt_quote = T_BARE_WORD }, - { FR_CALL_ENV_OFFSET("user_password", FR_TYPE_STRING, CALL_ENV_FLAG_NULLABLE, rlm_totp_call_env_t, user_password), - .pair.dflt = "&request.TOTP.From-User", .pair.dflt_quote = T_BARE_WORD }, + { FR_CALL_ENV_OFFSET("user_password", FR_TYPE_STRING, CALL_ENV_FLAG_NULLABLE | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, rlm_totp_call_env_t, user_password), + .pair.dflt = "request.TOTP.From-User", .pair.dflt_quote = T_BARE_WORD }, CALL_ENV_TERMINATOR } diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c index e0c6c6700d..4c323e8f3a 100644 --- a/src/modules/rlm_winbind/rlm_winbind.c +++ b/src/modules/rlm_winbind/rlm_winbind.c @@ -474,8 +474,8 @@ static const call_env_method_t winbind_auth_method_env = { { FR_CALL_ENV_OFFSET("username", FR_TYPE_STRING, CALL_ENV_FLAG_REQUIRED, winbind_auth_call_env_t, username) }, { FR_CALL_ENV_OFFSET("domain", FR_TYPE_STRING, CALL_ENV_FLAG_NONE, winbind_auth_call_env_t, domain), .pair.dflt = "", .pair.dflt_quote = T_SINGLE_QUOTED_STRING, .pair.func = domain_call_env_parse }, - { FR_CALL_ENV_OFFSET("password", FR_TYPE_STRING, CALL_ENV_FLAG_SECRET, winbind_auth_call_env_t, password), - .pair.dflt = "&User-Password", .pair.dflt_quote = T_BARE_WORD }, + { FR_CALL_ENV_OFFSET("password", FR_TYPE_STRING, CALL_ENV_FLAG_SECRET | CALL_ENV_FLAG_BARE_WORD_ATTRIBUTE, winbind_auth_call_env_t, password), + .pair.dflt = "User-Password", .pair.dflt_quote = T_BARE_WORD }, CALL_ENV_TERMINATOR } }; -- 2.47.2