remove Packet-* from module configuration

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 0757e30e4f256537ebfea2579addaed1144059dc..0490b485527522c60c41a3a520984f3d8a6398eb 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -74,7 +74,7 @@ int detail_group_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent,
                       CONF_ITEM *ci, CONF_PARSER const *rule);
 
 static const CONF_PARSER module_config[] = {
-       { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_XLAT, rlm_detail_t, filename), .dflt = "%A/%{Packet-Src-IP-Address}/detail" },
+       { FR_CONF_OFFSET("filename", FR_TYPE_FILE_OUTPUT | FR_TYPE_XLAT, rlm_detail_t, filename), .dflt = "%A/%{Net.Src.IP}/detail" },
        { FR_CONF_OFFSET("header", FR_TYPE_TMPL | FR_TYPE_XLAT, rlm_detail_t, header),
          .dflt = "%t", .quote = T_DOUBLE_QUOTED_STRING },
        { FR_CONF_OFFSET("permissions", FR_TYPE_UINT32, rlm_detail_t, perm), .dflt = "0600" },

diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index c54875d4f97eae912ad0a12ff1c7e323b97cb7e8..705343173ba4e42fa89fbd4770473bd013fffc40 100644 (file)
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -191,7 +191,7 @@ static const call_env_t redis_ippool_alloc_call_env[] = {
        { FR_CALL_ENV_OFFSET("lease_time", FR_TYPE_UINT32, redis_ippool_alloc_call_env_t, lease_time,
                             NULL, T_INVALID, true, false, false) },
        { FR_CALL_ENV_OFFSET("requested_address", FR_TYPE_STRING, redis_ippool_alloc_call_env_t, requested_address,
-                            "%{%{Requested-IP-Address}:-%{Packet-Src-IP-Address}}", T_DOUBLE_QUOTED_STRING,
+                            "%{%{Requested-IP-Address}:-%{Net.Src.IP}}", T_DOUBLE_QUOTED_STRING,
                             true, true, false) },
        { FR_CALL_ENV_TMPL_ONLY_OFFSET("allocated_address_attr", FR_TYPE_ATTRIBUTE, redis_ippool_alloc_call_env_t,
                                       allocated_address_attr, NULL, T_INVALID, true ) },
@@ -212,7 +212,7 @@ static const call_env_t redis_ippool_update_call_env[] = {
        { FR_CALL_ENV_OFFSET("lease_time", FR_TYPE_UINT32, redis_ippool_update_call_env_t, lease_time,
                             NULL, T_INVALID, true, false, false) },
        { FR_CALL_ENV_OFFSET("requested_address", FR_TYPE_STRING, redis_ippool_update_call_env_t, requested_address,
-                            "%{%{Requested-IP-Address}:-%{Packet-Src-IP-Address}}", T_DOUBLE_QUOTED_STRING,
+                            "%{%{Requested-IP-Address}:-%{Net.Src.IP}}", T_DOUBLE_QUOTED_STRING,
                             true, true, false) },
        { FR_CALL_ENV_TMPL_ONLY_OFFSET("allocated_address_attr", FR_TYPE_ATTRIBUTE, redis_ippool_update_call_env_t,
                                       allocated_address_attr, NULL, T_INVALID, true ) },
@@ -231,7 +231,7 @@ static const call_env_t redis_ippool_release_call_env[] = {
        { FR_CALL_ENV_OFFSET("gateway", FR_TYPE_STRING, redis_ippool_release_call_env_t, gateway_id,
                             "", T_SINGLE_QUOTED_STRING, false, true, true ) },
        { FR_CALL_ENV_OFFSET("requested_address", FR_TYPE_STRING, redis_ippool_release_call_env_t, requested_address,
-                            "%{%{Requested-IP-Address}:-%{Packet-Src-IP-Address}}", T_DOUBLE_QUOTED_STRING,
+                            "%{%{Requested-IP-Address}:-%{Net.Src.IP}}", T_DOUBLE_QUOTED_STRING,
                             true, true, false) },
        CALL_ENV_TERMINATOR
 };

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 8dfd75f194ee957b1156c74862ede86040a0e897..65a162e0a1bc32f6760ab3200480b14a91849edc 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -847,7 +847,7 @@ static xlat_action_t sql_group_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 /*
  *     Simplified version of the old paircmp()
  *
- *     It does not support virtual attributes like Packet-Src-IP-Address, etc.  That limitation will be
+ *     It does not support xlat expansions on the RHS of check items.  That limitation will be
  *     removed when this code is rewritten to support maps (for assignment) and xlat expressions (for
  *     conditions).
  */