Rename FR_CONF_SUBSECTION_MULTI to FR_CONF_SUBSECTION_ALLOC

FR_CONF_SUBSECTION_ALLOC is the macro for specifying subsections which should be alloced, and are not directly nested in the instance data.

diff --git a/src/include/conf_file.h b/src/include/conf_file.h
index efcaedb45b120e0849276b3bc5847606f147e882..ca07fd6a3dee5b9ce6edfdd536dd14c6412bd0c6 100644 (file)
--- a/src/include/conf_file.h
+++ b/src/include/conf_file.h
@@ -222,7 +222,7 @@ _Generic((_ct), \
  * @param _f   field in instance data struct.
  * @param _sub CONF_PARSER array to use to parse subsection data.
  */
-#  define FR_CONF_SUBSECTION_MULTI(_n, _t, _s, _f, _sub) \
+#  define FR_CONF_SUBSECTION_ALLOC(_n, _t, _s, _f, _sub) \
        .name = _n, \
        .type = (_t), \
        .offset = FR_CONF_TYPE_CHECK((_t), &(((_s *)NULL)->_f), offsetof(_s, _f)), \
@@ -259,7 +259,7 @@ _Generic((_ct), \
  * @param _f   field in instance data struct.
  * @param _sub CONF_PARSER array to use to parse subsection data.
  */
-#  define FR_CONF_SUBSECTION_MULTI(_n, _t, _s, _f, _sub) \
+#  define FR_CONF_SUBSECTION_ALLOC(_n, _t, _s, _f, _sub) \
        .name = _n, \
        .type = _t, \
        .offset = offsetof(_s, _f), \

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index 1f7558e38056c796bc1ce183621a11b53e1c126e..aa3ae24f7034f0914df4dfae86d9f4f701a7dde6 100644 (file)
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -181,7 +181,7 @@ static const CONF_PARSER module_config[] = {
        /*
         *      Areas of the DIT to listen on
         */
-       { FR_CONF_SUBSECTION_MULTI("sync", FR_TYPE_SUBSECTION | FR_TYPE_MULTI | FR_TYPE_REQUIRED, proto_ldap_inst_t, sync_config, ldap_sync_search_config) },
+       { FR_CONF_SUBSECTION_ALLOC("sync", FR_TYPE_SUBSECTION | FR_TYPE_MULTI | FR_TYPE_REQUIRED, proto_ldap_inst_t, sync_config, ldap_sync_search_config) },
 
        /*
         *      Extra configuration items