Split module_rlm functions out into a separate header file

diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c
index 1da278134551c3174e63d2fe46cc91c0c5a4faa3..e12c0c7104d604ba44d9b3d10edc419abb2e894a 100644 (file)
--- a/src/bin/unit_test_map.c
+++ b/src/bin/unit_test_map.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/atexit.h>
 #include <freeradius-devel/util/file.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include <freeradius-devel/util/conf.h>
 

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index e8e3c699525d5cffa439666d6567520c057f7ed7..ee59421f0bb535fd0011122356f081c03fd911db 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/map_proc.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/value.h>

diff --git a/src/lib/server/base.c b/src/lib/server/base.c
index 4a779be720dd1349ef5fb32720b44bde5b63f0c1..2ddfe40c0eedc74697d356381ad409b4ebe9d7d5 100644 (file)
--- a/src/lib/server/base.c
+++ b/src/lib/server/base.c
@@ -26,6 +26,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 /** Initialize src/lib/server/
  *

diff --git a/src/lib/server/module.h b/src/lib/server/module.h
index 83901a079f8a95daaa569cbd0bfcc2da99d75835..e4db1181b0e889e9c4a589f69dc1a1056198fa6a 100644 (file)
--- a/src/lib/server/module.h
+++ b/src/lib/server/module.h
@@ -244,58 +244,18 @@ typedef struct {
        module_method_t                 func;           //!< State function.
 } module_state_func_table_t;
 
-
-/** @name Convenience wrappers around other internal APIs to make them easier to instantiate with modules
- *
- * @{
- */
-fr_pool_t      *module_rlm_connection_pool_init(CONF_SECTION *module,
-                                            void *opaque,
-                                            fr_pool_connection_create_t c,
-                                            fr_pool_connection_alive_t a,
-                                            char const *log_prefix,
-                                            char const *trigger_prefix,
-                                            fr_pair_list_t *trigger_args);
-exfile_t       *module_rlm_exfile_init(TALLOC_CTX *ctx,
-                                   CONF_SECTION *module,
-                                   uint32_t max_entries,
-                                   fr_time_delta_t max_idle,
-                                   bool locking,
-                                   char const *trigger_prefix,
-                                   fr_pair_list_t *trigger_args);
-/** @} */
-
-/** @name Helper functions
- *
- * @{
- */
-module_method_t        module_rlm_state_str_to_method(module_state_func_table_t const *table,
-                                          char const *name, module_method_t def);
-
-char const     *module_rlm_state_method_to_str(module_state_func_table_t const *table,
-                                           module_method_t method, char const *def);
-
-bool           module_rlm_section_type_set(request_t *request, fr_dict_attr_t const *type_da, fr_dict_enum_value_t const *enumv);
-/** @} */
-
 /** @name Module and module thread lookup
  *
  * @{
  */
 module_instance_t      *module_by_name(module_instance_t const *parent, char const *asked_name);
 
-module_instance_t      *module_rlm_by_name_and_method(module_method_t *method, rlm_components_t *component,
-                                                  char const **name1, char const **name2,
-                                                  char const *asked_name);
-
 module_instance_t      *module_by_data(void const *data);
 
 module_thread_instance_t *module_thread(module_instance_t *mi);
 
 module_thread_instance_t *module_thread_by_data(void const *data);
 
-CONF_SECTION           *module_rlm_by_name_virtual(char const *asked_name);
-
 /** @} */
 
 /** @name Module and module thread initialisation and instantiation
@@ -316,8 +276,6 @@ int         modules_instantiate(CONF_SECTION *root) CC_HINT(nonnull);
 
 module_instance_t *module_bootstrap(dl_module_type_t type, module_instance_t const *parent, CONF_SECTION *cs)
                CC_HINT(nonnull(3));
-
-int            modules_rlm_bootstrap(CONF_SECTION *root) CC_HINT(nonnull);
 /** @} */
 
 #ifdef __cplusplus

diff --git a/src/lib/server/module_rlm.h b/src/lib/server/module_rlm.h
index b4c3fce2523122bf275e6cff9a028b2264f76813..620914c94d8c12e962fd558d90b113877208fe9d 100644 (file)
--- a/src/lib/server/module_rlm.h
+++ b/src/lib/server/module_rlm.h
@@ -1,3 +1,4 @@
+#pragma once
 /*
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -28,10 +29,62 @@ RCSIDH(module_rlm_h, "$Id$")
 extern "C" {
 #endif
 
-#include <stdint.h>
+#include <freeradius-devel/server/module.h>
 
 extern char const *section_type_value[MOD_COUNT];
 
+/** @name Convenience wrappers around other internal APIs to make them easier to instantiate with modules
+ *
+ * @{
+ */
+fr_pool_t      *module_rlm_connection_pool_init(CONF_SECTION *module,
+                                                void *opaque,
+                                                fr_pool_connection_create_t c,
+                                                fr_pool_connection_alive_t a,
+                                                char const *log_prefix,
+                                                char const *trigger_prefix,
+                                                fr_pair_list_t *trigger_args);
+exfile_t       *module_rlm_exfile_init(TALLOC_CTX *ctx,
+                                       CONF_SECTION *module,
+                                       uint32_t max_entries,
+                                       fr_time_delta_t max_idle,
+                                       bool locking,
+                                       char const *trigger_prefix,
+                                       fr_pair_list_t *trigger_args);
+/** @} */
+
+/** @name Helper functions
+ *
+ * @{
+ */
+module_method_t        module_rlm_state_str_to_method(module_state_func_table_t const *table,
+                                              char const *name, module_method_t def);
+
+char const     *module_rlm_state_method_to_str(module_state_func_table_t const *table,
+                                               module_method_t method, char const *def);
+
+bool           module_rlm_section_type_set(request_t *request, fr_dict_attr_t const *type_da, fr_dict_enum_value_t const *enumv);
+/** @} */
+
+/** @name Module and module thread lookup
+ *
+ * @{
+ */
+module_instance_t      *module_rlm_by_name_and_method(module_method_t *method, rlm_components_t *component,
+                                                  char const **name1, char const **name2,
+                                                  char const *asked_name);
+
+CONF_SECTION           *module_rlm_by_name_virtual(char const *asked_name);
+
+/** @} */
+
+/** @name Module and module thread initialisation and instantiation
+ *
+ * @{
+ */
+int            modules_rlm_bootstrap(CONF_SECTION *root) CC_HINT(nonnull);
+/** @} */
+
 void   modules_rlm_free(void);
 
 int    modules_rlm_init(void);

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index 0c59068ba0f671933b927bc42a077312256228fd..003c641ffed68290f103da349a6400634a35bc31 100644 (file)
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -31,7 +31,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/internal/internal.h>
 #include <freeradius-devel/server/pair.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/unlang/function.h>
 #include <freeradius-devel/unlang/subrequest.h>
 #include <freeradius-devel/unlang/interpret.h>

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index 72a15000c54633cfb9f30c167871690cc7bfcb91..1875c55933568dff350cf31c86e7540352c1c07f 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -26,6 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include "call_priv.h"

diff --git a/src/lib/unlang/interpret_synchronous.c b/src/lib/unlang/interpret_synchronous.c
index aa3b5009f942b5b7c0b9dc4b75486af5ebed5403..fc9dc34640c693344c09959c25e6321623ed8850 100644 (file)
--- a/src/lib/unlang/interpret_synchronous.c
+++ b/src/lib/unlang/interpret_synchronous.c
@@ -24,7 +24,7 @@
  */
 
 #include "interpret_priv.h"
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 typedef struct {
        fr_heap_t               *runnable;

diff --git a/src/lib/unlang/module.h b/src/lib/unlang/module.h
index 80a5f054038f1e20b2fd3d07e9f5f31fc084b4f8..156dc55f795dc35e46dfc6e21bc010de4eca799b 100644 (file)
--- a/src/lib/unlang/module.h
+++ b/src/lib/unlang/module.h
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/rcode.h>
 #include <freeradius-devel/unlang/subrequest.h>
 #include <freeradius-devel/unlang/tmpl.h>

diff --git a/src/listen/arp/proto_arp.c b/src/listen/arp/proto_arp.c
index 5debd9326c4970d74dbd05a803433ec651f7e4b4..eff412c78b2c0d273d271dd4e0d4fb948ed4014d 100644 (file)
--- a/src/listen/arp/proto_arp.c
+++ b/src/listen/arp/proto_arp.c
@@ -22,7 +22,7 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/util/debug.h>
 #include "proto_arp.h"

diff --git a/src/listen/control/proto_control.c b/src/listen/control/proto_control.c
index ad75a3e643d3e397dfd560963d82f3f882fa92ff..2f5b2cdc045a1f92e79387a1ee0c9d4ee1bae70b 100644 (file)
--- a/src/listen/control/proto_control.c
+++ b/src/listen/control/proto_control.c
@@ -22,7 +22,7 @@
  * @copyright 2018 Alan DeKok (aland@freeradius.org)
  */
 #include <freeradius-devel/io/listen.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include "proto_control.h"
 

diff --git a/src/listen/cron/proto_cron.h b/src/listen/cron/proto_cron.h
index 71137f672cffa51a6c44b1beba081f6ba61b7521..51e41faea7bcc1e992d0fd2fac7ce7cb234f7e8a 100644 (file)
--- a/src/listen/cron/proto_cron.h
+++ b/src/listen/cron/proto_cron.h
@@ -25,7 +25,7 @@
  */
 RCSIDH(proto_cron_h, "$Id$")
 
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/io/master.h>
 
 #ifdef __cplusplus

diff --git a/src/listen/detail/proto_detail.h b/src/listen/detail/proto_detail.h
index cb44f69b111131d343c5f379ae4bf5773088b5d4..e07060d1f20385d69ab61860791d1c684c703323 100644 (file)
--- a/src/listen/detail/proto_detail.h
+++ b/src/listen/detail/proto_detail.h
@@ -25,7 +25,7 @@
  */
 RCSIDH(detail_h, "$Id$")
 
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/retry.h>
 #include <freeradius-devel/util/dlist.h>
 

diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index e3ba7ac6e8beb84f1d84928eb5404aed3de8f767..e30411bebca591515965dc183ebc64adde282952 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -25,7 +25,7 @@
 #define LOG_PREFIX "proto_dhcpv4"
 
 #include <freeradius-devel/io/listen.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include "proto_dhcpv4.h"
 

diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index ec04ef8377df8b8bfe6a59437898d796800bae8b..8f76a82c7a2c34c6143d04476e9c9dbc5ebf845a 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -24,7 +24,7 @@
 #define LOG_PREFIX "proto_dhcpv6"
 
 #include <freeradius-devel/io/listen.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include "proto_dhcpv6.h"
 

diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c
index 5adef38f77979313251e4af4516ac0bb05fa389d..7978174f8b3ad4be672e707909063ec0578bfde6 100644 (file)
--- a/src/listen/dns/proto_dns.c
+++ b/src/listen/dns/proto_dns.c
@@ -24,7 +24,7 @@
 #define LOG_PREFIX "proto_dns"
 
 #include <freeradius-devel/io/listen.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include "proto_dns.h"
 

diff --git a/src/listen/load/proto_load.h b/src/listen/load/proto_load.h
index 121d8e0fb790afdce5cb7a6554a9e22afd12dd73..2a6dcbe2b18b4ed6541e9ae04fd79c5edbc9ccb1 100644 (file)
--- a/src/listen/load/proto_load.h
+++ b/src/listen/load/proto_load.h
@@ -25,7 +25,7 @@
  */
 RCSIDH(proto_load_h, "$Id$")
 
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/io/master.h>
 
 #ifdef __cplusplus

diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index 8ebd4a96ef633d54acf085734c1fb369498a1561..425c10cf1ffe513bcf9541c8cd98c26ecc92ed0f 100644 (file)
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -24,7 +24,7 @@
  */
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include "proto_radius.h"
 
 extern fr_app_t proto_radius;

diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index afcda25dcb2e46c68b11aaf8c80130227b957471..bb87aaa4704a533f0c58d61739c1ca1d15db2ad3 100644 (file)
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -23,7 +23,7 @@
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
 #include <freeradius-devel/io/listen.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 #include <freeradius-devel/protocol/vmps/vmps.h>

diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c
index a7949d53caec152ae9a3738f58e33412439c95fe..d4af1e640d12003497f02be550b5ae6eb1ecf4f8 100644 (file)
--- a/src/modules/proto_bfd/proto_bfd.c
+++ b/src/modules/proto_bfd/proto_bfd.c
@@ -21,7 +21,7 @@
  */
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index 74690d04ee65fc05ff39aa81d702a2dbb99dab88..808d80a7758043dea35d1620794173d95b79959a 100644 (file)
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/ldap/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/unlang/call.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/main_loop.h>

diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c
index 6888dcbe64b566504d97e70900b80b0a1123f9d3..a3c47cf59bb07060324efe0e92a0c57fbb496580 100644 (file)
--- a/src/modules/rlm_always/rlm_always.c
+++ b/src/modules/rlm_always/rlm_always.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 /*
  *     The instance data for rlm_always is the list of fake values we are

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index fd5f4c65295881b6db64cb760fef1992767f35f1..64d6d8ac4abc06666cb05ebdeb894574af6944d9 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -26,15 +26,15 @@ RCSID("$Id$")
 
 #define LOG_PREFIX mctx->inst->name
 
-#include       <freeradius-devel/server/base.h>
-#include       <freeradius-devel/server/module.h>
-#include       <freeradius-devel/util/debug.h>
-#include       <freeradius-devel/server/users_file.h>
+#include <freeradius-devel/server/base.h>
+#include <freeradius-devel/server/module_rlm.h>
+#include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/server/users_file.h>
 
-#include       <sys/stat.h>
+#include <sys/stat.h>
 
-#include       <ctype.h>
-#include       <fcntl.h>
+#include <ctype.h>
+#include <fcntl.h>
 
 /*
  *     Define a structure with the module configuration, so it can

diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
index 3f5d705e83911dcd7f31a60c2a1d4539329195bb..432a846c6607e4c757cce9b8307ad75028a782aa 100644 (file)
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
@@ -27,7 +27,7 @@
 #include <libmemcached/memcached.h>
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 #include "../../rlm_cache.h"

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 559b3d55f665a586bd067772dca1e36a9e5a0399..ef093674f0e24d420a428894b9973c8f703a8634 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/dl_module.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 0e302071fa4a0a68c35208caf5448b3aadea9d93..34a1a1d06304b373e1d4f1387dd31dea0003fbfd 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/password.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/radius/radius.h>
 
 typedef struct {

diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c
index a61f68bb717e73023402b5bf42f6ba4f409e0172..347b6b6fcad878247bd0a6839bed70e5b46481c3 100644 (file)
--- a/src/modules/rlm_cipher/rlm_cipher.c
+++ b/src/modules/rlm_cipher/rlm_cipher.c
@@ -28,7 +28,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/tls/log.h>
 #include <freeradius-devel/tls/cert.h>

diff --git a/src/modules/rlm_client/rlm_client.c b/src/modules/rlm_client/rlm_client.c
index 9b736c089432410f03f8884584f11a3a85461c27..b66592729ac63930085dfbc34d5633465fe8d41f 100644 (file)
--- a/src/modules/rlm_client/rlm_client.c
+++ b/src/modules/rlm_client/rlm_client.c
@@ -26,7 +26,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index f9114d0b3bc095f05939c993fe36dd25b6afba46..8ae4ee915b4aee5577c3446876890d45e7964888 100644 (file)
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/map.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/radius/defs.h>
 
 #include <freeradius-devel/json/base.h>

diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c
index fbda4a043c59a2aa19468fdb5f3d4266367a4e36..65f6543fbbb8373e3e1cf513efa50b22b3ff299a 100644 (file)
--- a/src/modules/rlm_csv/rlm_csv.c
+++ b/src/modules/rlm_csv/rlm_csv.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/htrie.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_date/rlm_date.c b/src/modules/rlm_date/rlm_date.c
index 7a041112e1fcfb4096beb78f4d2ac559bb9427c4..6d9adf35a6071604f7466727a6da2ffe98461b6d 100644 (file)
--- a/src/modules/rlm_date/rlm_date.c
+++ b/src/modules/rlm_date/rlm_date.c
@@ -25,7 +25,7 @@
  */
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <ctype.h>
 #include <time.h>
 

diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c
index 07113917707219f85abc304ecf85244801718e6e..a4c72c384e6350d34788e63cc7fd9d3e0dde9222 100644 (file)
--- a/src/modules/rlm_delay/rlm_delay.c
+++ b/src/modules/rlm_delay/rlm_delay.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/util/time.h>

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 543898f07e735dbfe72e3b9d04f8766230d90476..2d4cd84895a68cf2262b7c31439279177d732fe3 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exfile.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/perm.h>
 

diff --git a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
index 1876bd5c271a80dde66a1ca3f1d999f069929c76..05cfd0e9b96e157eeb8de8a1006c59b7e72d6818 100644 (file)
--- a/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
+++ b/src/modules/rlm_dhcpv4/rlm_dhcpv4.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/io/pair.h>
 #include <freeradius-devel/util/udp_queue.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>

diff --git a/src/modules/rlm_dict/rlm_dict.c b/src/modules/rlm_dict/rlm_dict.c
index a95f35e7656fd046d5b5d1122078abf010b7545b..e7853739444799a8a27c2c12c57ab67f4dc802bf 100644 (file)
--- a/src/modules/rlm_dict/rlm_dict.c
+++ b/src/modules/rlm_dict/rlm_dict.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 static xlat_arg_parser_t const xlat_dict_attr_by_num_args[] = {

diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c
index f6e665363d4c75c14c404ea4c72fede5e6f43bc4..c6c7eb805ddcc4a49e54d3c2432b3bacbb58e97f 100644 (file)
--- a/src/modules/rlm_digest/rlm_digest.c
+++ b/src/modules/rlm_digest/rlm_digest.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include <freeradius-devel/util/base16.h>
 #include <freeradius-devel/util/md5.h>

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 386ee8b69f3f756277067795a9f4fd155fd3fe64..71fe286925409160d686017bb53b1d2c960b6570 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/dl_module.h>
 #include <freeradius-devel/server/dl_module.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
index feadae2fca5bdf13cf4d7a53cb7a562d36c7ec9c..4fe322cf63bfab4aebed48ee367a758cd0c43fac 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/eap_pwd.c
@@ -36,7 +36,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/tls/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include "eap_pwd.h"
 #include "const_time.h"

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index eaf5e99524fb9609dc95c4f03b3747b829392141..433c241bafdb020155f6b2df00bf678a22b3426e 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -34,7 +34,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/tls/base.h>
 
 #include "eap_pwd.h"

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
index 27ab62258ea58b411ded762a37890d7d3e3a913b..735057bf5680b2fd927aa92b64bcde43fe8b6704 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
@@ -26,7 +26,7 @@ RCSIDH(rlm_eap_tls_h, "$Id$")
 
 #include <freeradius-devel/eap/tls.h>
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 /** Cache sections to call on various protocol events
  *

diff --git a/src/modules/rlm_escape/rlm_escape.c b/src/modules/rlm_escape/rlm_escape.c
index f76f2344127c9db16c0a29ad9d8c38354ce19eda..5f9fa1dfe7721882fad12d510e93637558b76f8b 100644 (file)
--- a/src/modules/rlm_escape/rlm_escape.c
+++ b/src/modules/rlm_escape/rlm_escape.c
@@ -26,7 +26,7 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/server/base.h>
 
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 #include <ctype.h>

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 9caf02d2ee7cebfb962361e3e9903d2640aa9282..4e6c14ed4e71955ee4f94f2548c6f4aa7d0607a8 100644 (file)
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
index 92e95d654e73a68292ee561eea2e2b07ff5194a5..66f3306a76e48fc59e3ea56509c6617af9612f44 100644 (file)
--- a/src/modules/rlm_expr/rlm_expr.c
+++ b/src/modules/rlm_expr/rlm_expr.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/tmpl_dcursor.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index 8e97aec386a8ca516cbaa50bcdad92685de57a9d..36fddea4ed06d75e6b3a1a33e02294b0e405e666 100644 (file)
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/pairmove.h>
 #include <freeradius-devel/server/users_file.h>
 #include <freeradius-devel/util/htrie.h>

diff --git a/src/modules/rlm_icmp/rlm_icmp.c b/src/modules/rlm_icmp/rlm_icmp.c
index af0d7153cfc5da331b24a4316b8f7a15db1e925b..824f4514fa83eb226b84b97a722bb0949110008c 100644 (file)
--- a/src/modules/rlm_icmp/rlm_icmp.c
+++ b/src/modules/rlm_icmp/rlm_icmp.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/cap.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_idn/rlm_idn.c b/src/modules/rlm_idn/rlm_idn.c
index c450f1e711f0c3e310b172835d551898fb7e5186..42f2479ba012be4c5c5c05a2dc268c021132c15a 100644 (file)
--- a/src/modules/rlm_idn/rlm_idn.c
+++ b/src/modules/rlm_idn/rlm_idn.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include <idna.h>
 

diff --git a/src/modules/rlm_imap/rlm_imap.c b/src/modules/rlm_imap/rlm_imap.c
index b6bd245172af48d9366968581d7099a028391201..097a359ddaba01b7feb43907f45d726877999adb 100644 (file)
--- a/src/modules/rlm_imap/rlm_imap.c
+++ b/src/modules/rlm_imap/rlm_imap.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/curl/base.h>
 
 static fr_dict_t       const           *dict_radius; /*dictionary for radius protocol*/

diff --git a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
index 1ff65a235744aba99e628dc6ec5a9bdd08a1406c..69ba7cd20afbbdd593c17a15c32727ab295047b9 100644 (file)
--- a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
+++ b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index 934365c3ce79b8919397be32fec8347296d795b3..03a28c302da3ea644ca99e88f2f6e07e0527f614 100644 (file)
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -29,7 +29,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/json/base.h>

diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index 58a6ebbe1a353853b68fd3d2c95f9a76d0f2cd2b..0c0ea469bfcc76ab26d0aa47f6aa448053a3311c 100644 (file)
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 #define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include "krb5.h"
 

diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index 61c7cbcf4e4673b1076c053e3a1e61ca0f3e83c0..1a44f3cf1f2ef56d2f5c46867229f47d25a92be8 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -14,7 +14,7 @@
  * @copyright 2013-2015 The FreeRADIUS Server Project.
  */
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/ldap/base.h>
 
 typedef struct {

diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index 6ff317a13ecf79fcf29030dbd0baf96260eca4e6..014af20092c09f2e9b1a1b2ec3f0c9ef7aa1d14a 100644 (file)
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -25,7 +25,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exfile.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/tmpl_dcursor.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/perm.h>

diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c
index 7f492b24b9e34a4cf1e355b48c38c568002f5a3a..f250462bdcdae5ac012f808e40fa30090defbce6 100644 (file)
--- a/src/modules/rlm_logintime/rlm_logintime.c
+++ b/src/modules/rlm_logintime/rlm_logintime.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include <ctype.h>
 

diff --git a/src/modules/rlm_logtee/rlm_logtee.c b/src/modules/rlm_logtee/rlm_logtee.c
index 75ab8e98ad25cb86e0fc912bc2560017aa08a1ca..df624f3fe5a29e2069b13ec5d52baf932e11f837 100644 (file)
--- a/src/modules/rlm_logtee/rlm_logtee.c
+++ b/src/modules/rlm_logtee/rlm_logtee.c
@@ -26,7 +26,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/connection.h>
 

diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c
index e259b3127a0b1e11b839062e3c31441ddc7874f3..f88a9ddfb56551f8d7f4c1d1bb8573f1834a16ca 100644 (file)
--- a/src/modules/rlm_lua/rlm_lua.c
+++ b/src/modules/rlm_lua/rlm_lua.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include "lua.h"
 /*

diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c
index b58af6aabce856846eb7ec93939ab052a438920e..3ff93b904b4c2193107dba0af990e42c5559402e 100644 (file)
--- a/src/modules/rlm_mruby/rlm_mruby.c
+++ b/src/modules/rlm_mruby/rlm_mruby.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/pairmove.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_mschap/mschap.c b/src/modules/rlm_mschap/mschap.c
index 39f2ee09e11fafb86e200005639b377d7658b318..abe8c94beb4714bf64b7031a5a72c959c2ab3e5a 100644 (file)
--- a/src/modules/rlm_mschap/mschap.c
+++ b/src/modules/rlm_mschap/mschap.c
@@ -30,16 +30,16 @@
 
 RCSID("$Id$")
 
-#include       <freeradius-devel/server/base.h>
-#include       <freeradius-devel/server/module.h>
-#include       <freeradius-devel/util/debug.h>
-#include       <freeradius-devel/util/md5.h>
-#include       <freeradius-devel/util/sha1.h>
+#include <freeradius-devel/server/base.h>
+#include <freeradius-devel/server/module_rlm.h>
+#include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/md5.h>
+#include <freeradius-devel/util/sha1.h>
 
-#include       <ctype.h>
+#include <ctype.h>
 
-#include       "smbdes.h"
-#include       "mschap.h"
+#include "smbdes.h"
+#include "mschap.h"
 
 /** Converts Unicode password to 16-byte NT hash with MD4
  *

diff --git a/src/modules/rlm_mschap/opendir.c b/src/modules/rlm_mschap/opendir.c
index 3f5149e92945033165502918efacb5681bae67a8..02c05961612427e3d1ddf79bc6dff27b1b34d484 100644 (file)
--- a/src/modules/rlm_mschap/opendir.c
+++ b/src/modules/rlm_mschap/opendir.c
@@ -22,7 +22,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/md5.h>
 

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index 3ec09184a26c016f3d356deeb813cb8bcd74540e..1216a01a353713505716b151fe3d7c2bf06c78fc 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exec_legacy.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/password.h>
 #include <freeradius-devel/tls/log.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_ocsp/ocsp.c b/src/modules/rlm_ocsp/ocsp.c
index 8a181d03504240fb1eb8e868f37d4e47db3e3c11..a3b36464a947d60369099ce7425caab484015116 100644 (file)
--- a/src/modules/rlm_ocsp/ocsp.c
+++ b/src/modules/rlm_ocsp/ocsp.c
@@ -30,7 +30,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #ifdef HAVE_OPENSSL_OCSP_H
 #define LOG_PREFIX "tls - ocsp"
 
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_opendirectory/rlm_opendirectory.c b/src/modules/rlm_opendirectory/rlm_opendirectory.c
index 29ff569b9c70e95953f9026e073a15bb72b5235a..7929a35d336a1c090a6ce2e95d6b3ed902a671ab 100644 (file)
--- a/src/modules/rlm_opendirectory/rlm_opendirectory.c
+++ b/src/modules/rlm_opendirectory/rlm_opendirectory.c
@@ -30,7 +30,7 @@
  */
 USES_APPLE_DEPRECATED_API
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/perm.h>
 

diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c
index ad13dff3a380294ba6816acd450f265b8886b8d0..2da807c0ea97a727ca33921458ecee862a942f93 100644 (file)
--- a/src/modules/rlm_pam/rlm_pam.c
+++ b/src/modules/rlm_pam/rlm_pam.c
@@ -31,7 +31,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include "config.h"
 

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index b709235d4d0231d5aa5c46a7b8ef14bf1cd13650..12e40a16cb3de08d8e04fe551ca27446b7b2594e 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/password.h>
 #include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/tls/log.h>

diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index a48ba8c1b28e4026fc39fc5a039a4efc32d7acfb..df2f76bff7ce397890a6435859fd4a3381295fa7 100644 (file)
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 #define LOG_PREFIX "passwd"
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 struct mypasswd {

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 9ddbd7a513b052c6620944a2b61a36c6a8865bd3..61f8dfa28df067e34ee089dc4a346469f6b2a300 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #define LOG_PREFIX "perl"
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/radius/radius.h>
 

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index e89bf776206b1f09e832164b917bef8a26904f93..97c0e174704be6754bb85b41de6c1eae164bfc47 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/pairmove.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/lsan.h>

diff --git a/src/modules/rlm_radius/rlm_radius.h b/src/modules/rlm_radius/rlm_radius.h
index caf0a3500ae4187bb3e43f4f93908de8b1edf548..42df44d7b3992ea0a49a6d6937a1069fdd55e545 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.h
+++ b/src/modules/rlm_radius/rlm_radius.h
@@ -17,7 +17,7 @@
 #include <freeradius-devel/io/atomic_queue.h>
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/map.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/trunk.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/retry.h>

diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c
index f85ccbb9881c223ad65eb83a1f1796428c64447f..9f99bcec6afba53f7bd4eb5bf342bed4cef570f6 100644 (file)
--- a/src/modules/rlm_radutmp/rlm_radutmp.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp.c
@@ -23,13 +23,13 @@
  */
 RCSID("$Id$")
 
-#include       <freeradius-devel/server/base.h>
-#include       <freeradius-devel/server/radutmp.h>
-#include       <freeradius-devel/server/module.h>
-#include       <freeradius-devel/util/debug.h>
-#include       <freeradius-devel/radius/radius.h>
+#include <freeradius-devel/server/base.h>
+#include <freeradius-devel/server/radutmp.h>
+#include <freeradius-devel/server/module_rlm.h>
+#include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/radius/radius.h>
 
-#include       <fcntl.h>
+#include <fcntl.h>
 
 #include "config.h"
 

diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index 646e23609b1c2f8d81cc999f9a50cd4cbc2818c8..e28e63e2a5803329465e5756bda6598c1cf392db 100644 (file)
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -29,7 +29,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index 938a6d4fda7e5ad0aaedce8feb545d2085266231..e66d947d19ad59431fcec1ce331294523b999c83 100644 (file)
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -42,7 +42,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/modpriv.h>
 
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c
index 82cc3a9b16a574a295b59c306de7649835775359..e73c8148f6ec5450a0a7239ff43d972abc41ed6c 100644 (file)
--- a/src/modules/rlm_rediswho/rlm_rediswho.c
+++ b/src/modules/rlm_rediswho/rlm_rediswho.c
@@ -29,7 +29,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c
index 84cfbc1be29284219d60bc76bb38157ec024b52a..98455de1a02297027a261e45c47b22a0a8116a9d 100644 (file)
--- a/src/modules/rlm_rest/io.c
+++ b/src/modules/rlm_rest/io.c
@@ -23,7 +23,7 @@
  */
 #include "rest.h"
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 /** Handle asynchronous cancellation of a request
  *

diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index e0e18b32aa9a921371b961f4222bdba795952521..1cc70c12a0818d21bd9751cfb348e9654292103c 100644 (file)
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -25,7 +25,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/curl/base.h>
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/pairmove.h>
 #include <freeradius-devel/tls/base.h>

diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c
index 15a3e9374d06885b9056a323c990f07189125ed2..f5a635fb78e1318be5c1579b3b6e1238869be1a2 100644 (file)
--- a/src/modules/rlm_securid/rlm_securid.c
+++ b/src/modules/rlm_securid/rlm_securid.c
@@ -27,7 +27,7 @@
 #define "rlm_securid - "
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <ctype.h>
 
 #include "rlm_securid.h"

diff --git a/src/modules/rlm_securid/rlm_securid.h b/src/modules/rlm_securid/rlm_securid.h
index 820d697282f77424086164c4e92211264ebda492..f13fd50694846dbdc8b5768dcbaa55002022304f 100644 (file)
--- a/src/modules/rlm_securid/rlm_securid.h
+++ b/src/modules/rlm_securid/rlm_securid.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 #include "acexport.h"

diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c
index 6cae917d4b63f91db8cf9ecf3f0677b4c4208af5..11c221040b6ceefd3e64b2dc04754503f482bf3e 100644 (file)
--- a/src/modules/rlm_sigtran/client.c
+++ b/src/modules/rlm_sigtran/client.c
@@ -30,7 +30,7 @@
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/protocol/eap/aka-sim/dictionary.h>
 #include <freeradius-devel/protocol/eap/aka-sim/dictionary.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include "attrs.h"
 #include "sigtran.h"

diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c
index 3f0a91c7b073bec0621d2f53a9a187d3451fa710..b98b777936c45749a2a474d56d78324c88969b91 100644 (file)
--- a/src/modules/rlm_sigtran/rlm_sigtran.c
+++ b/src/modules/rlm_sigtran/rlm_sigtran.c
@@ -42,7 +42,7 @@ RCSID("$Id$")
 #include "libosmo-m3ua/include/sctp_m3ua.h"
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 #include "sigtran.h"

diff --git a/src/modules/rlm_smtp/rlm_smtp.c b/src/modules/rlm_smtp/rlm_smtp.c
index c81a85c64c8d3fb3f20f7fcce73b6a7fd0d45e18..c93b0435ce3d58b5d9b607d5802feaac6fa83cb0 100644 (file)
--- a/src/modules/rlm_smtp/rlm_smtp.c
+++ b/src/modules/rlm_smtp/rlm_smtp.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/curl/base.h>
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/cf_priv.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/tmpl_dcursor.h>
 #include <freeradius-devel/util/talloc.h>
 

diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index d930157ef41644b6cf5e9755179c2fea7c4e2627..0d5d73a0540438da370bbf7cf7c6bd0b7136089a 100644 (file)
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/soh/base.h>
 
 typedef struct {

diff --git a/src/modules/rlm_sometimes/rlm_sometimes.c b/src/modules/rlm_sometimes/rlm_sometimes.c
index bfeb99734a5e0cff671142f104c6207efa7f5d64..7ca69d91af3afa7d96696e8b8eb09c937bf25d97 100644 (file)
--- a/src/modules/rlm_sometimes/rlm_sometimes.c
+++ b/src/modules/rlm_sometimes/rlm_sometimes.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 1dbbb3379eb83e75755a7a5010cef27c8f3e588f..0b8d8fb89bed86652af927e4bb6f7c9f932fbe0d 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -33,7 +33,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exfile.h>
 #include <freeradius-devel/server/map_proc.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/pairmove.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/table.h>

diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index 450220a83ee6eddc26621e8dff992ecd4009fb77..b5140d5859300bdc95f27eb1bc3f66a230cd669a 100644 (file)
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #define LOG_PREFIX "sqlcounter"
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 #include <ctype.h>

diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c
index 040821907f986b9fbf22735d705fc6a295057d1a..97fabc2af0b51b013c57edce8c469fe2d66e1020 100644 (file)
--- a/src/modules/rlm_stats/rlm_stats.c
+++ b/src/modules/rlm_stats/rlm_stats.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index e27ecab84a6a10b43aa1d97f27a41c8fafc5e03d..ae0e48d9437f309147f32d4ffcc12c45bbdbc713 100644 (file)
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/tmpl.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/modules/rlm_totp/rlm_totp.c b/src/modules/rlm_totp/rlm_totp.c
index 500353ab17c2980c61b180074739c72292404224..5d645ba1545ce88da65c7949e1cf23ccb7b051ee 100644 (file)
--- a/src/modules/rlm_totp/rlm_totp.c
+++ b/src/modules/rlm_totp/rlm_totp.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/unlang/interpret.h>
 
 static fr_dict_t const *dict_freeradius;
@@ -132,7 +132,7 @@ static ssize_t base32_decode(uint8_t *out, size_t outlen, char const *in)
         *      Will get converted to
         *
         *      11111222 22333334 44445555 56666677 77788888
-        */     
+        */
        for (p = b = out; p < end; p += 8) {
                b[0] = p[0] << 3;
                b[0] |= p[1] >> 2;

diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c
index 57a22b582064b55047e0c9f755f5b498125aad05..f58320cafd8280970637e4a7bfc3580bd3826e23 100644 (file)
--- a/src/modules/rlm_unbound/rlm_unbound.c
+++ b/src/modules/rlm_unbound/rlm_unbound.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #define LOG_PREFIX mctx->inst->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/log.h>
 #include <fcntl.h>
 

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 56d905f0d82d04df1b3eb1a7376213b35c343ed6..fef21550ef6f6ee588289d27f32d161d08078e8f 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -34,7 +34,7 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/server/sysutmp.h>
 #include <freeradius-devel/util/perm.h>
 

diff --git a/src/modules/rlm_unpack/rlm_unpack.c b/src/modules/rlm_unpack/rlm_unpack.c
index fbce76b3772dc63f98c2263682a7533e62ab8e1e..ab9906cd9e22274ccabdff1546f656d2baeb5a34 100644 (file)
--- a/src/modules/rlm_unpack/rlm_unpack.c
+++ b/src/modules/rlm_unpack/rlm_unpack.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 #include <freeradius-devel/util/base16.h>
 

diff --git a/src/modules/rlm_utf8/rlm_utf8.c b/src/modules/rlm_utf8/rlm_utf8.c
index e1fd5bc53075b090de2af8f62472cefe990e5b9a..9538e0381f4cf26f095762f1d95a3310bada2073 100644 (file)
--- a/src/modules/rlm_utf8/rlm_utf8.c
+++ b/src/modules/rlm_utf8/rlm_utf8.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 
 /*
  *     Reject any non-UTF8 data.

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 7f50a89567998d49f82fc318b2bde435733114c2..dd5197772b4c6b2002386f50e82e9308cf17dc74 100644 (file)
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -27,7 +27,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #define LOG_PREFIX "wimax"
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/util/base16.h>
 

diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c
index 0a0e01f5e5c468cfedf50181539c30c618f6a447..f86979d38ac1afe71d715c3ce80903a5856b3793 100644 (file)
--- a/src/modules/rlm_winbind/rlm_winbind.c
+++ b/src/modules/rlm_winbind/rlm_winbind.c
@@ -28,7 +28,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <freeradius-devel/util/debug.h>
 
 #include "rlm_winbind.h"

diff --git a/src/modules/rlm_yubikey/rlm_yubikey.h b/src/modules/rlm_yubikey/rlm_yubikey.h
index 6926f7216681543c8e5c6599635b77c072c4cf34..1d32ae13b78e0d3b05f7c96f11aedeab9dcfeb92 100644 (file)
--- a/src/modules/rlm_yubikey/rlm_yubikey.h
+++ b/src/modules/rlm_yubikey/rlm_yubikey.h
@@ -15,7 +15,7 @@
  *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/server/module.h>
+#include <freeradius-devel/server/module_rlm.h>
 #include <ctype.h>
 
 #include "config.h"