Rename main header files

diff --git a/src/bin/radiusd.c b/src/bin/radiusd.c
index 16ceb91dac89b18ea33d2660dfbd841891010936..6c2a9e5819f4acb83c36684f0bb78172b922cf5e 100644 (file)
--- a/src/bin/radiusd.c
+++ b/src/bin/radiusd.c
@@ -31,10 +31,10 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/map_proc.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/server/radmin.h>
 #include <freeradius-devel/server/rad_assert.h>
 

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index bfead7fb173a20e8e1d5e807c253e86e53eab4d4..72f92a637301bd710b57638d5b148fdbd3653d8b 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -27,11 +27,11 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>

diff --git a/src/lib/all.mk b/src/lib/all.mk
index 0fe0cf8f26edac6377dfa8530e3117a2c78d6c78..c914a295f569165224545bdddb5fadbc77b3073f 100644 (file)
--- a/src/lib/all.mk
+++ b/src/lib/all.mk
@@ -21,7 +21,7 @@ src/include/${1}:
        $${Q}[ -e $$@ ] || ln -sf $${top_srcdir}/src/lib/${1} $$@
        @echo LN-SF src/lib/${1} $$@
 
-install.src.include: $(addprefix ${SRC_INCLUDE_DIR}/,${1}/${1}.h)
+install.src.include: $(addprefix ${SRC_INCLUDE_DIR}/,${1}/base.h)
 endef
 
 

diff --git a/src/lib/io/application.h b/src/lib/io/application.h
index 09a087b63cae980cf0077b511939f6dff9d1a081..60d1f4d58ad0e8332ac2f81173672ff3686e5c26 100644 (file)
--- a/src/lib/io/application.h
+++ b/src/lib/io/application.h
@@ -25,7 +25,7 @@
  */
 #include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/dl.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 
 /*
  *     src/lib/io/schedule.h

diff --git a/src/lib/io/io.h b/src/lib/io/base.h
similarity index 100%
rename from src/lib/io/io.h
rename to src/lib/io/base.h

diff --git a/src/lib/io/channel.h b/src/lib/io/channel.h
index 35d881db21d531da0a86208e507a8f2f5fae6ce2..83d999122e0d3fd94158ca2acdc72d3d5c90c687 100644 (file)
--- a/src/lib/io/channel.h
+++ b/src/lib/io/channel.h
@@ -27,7 +27,7 @@ RCSIDH(channel_h, "$Id$")
 
 #include <freeradius-devel/io/message.h>
 #include <freeradius-devel/io/control.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/util/dlist.h>
 
 #include <sys/types.h>

diff --git a/src/lib/io/listen.h b/src/lib/io/listen.h
index 69ab49c3186134024e5e7c44e5295b3e512ec97d..7bbc426defbdd82c5c5ebdcce53709df56c80b86 100644 (file)
--- a/src/lib/io/listen.h
+++ b/src/lib/io/listen.h
@@ -14,7 +14,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 
 

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index e312a4f8dbc165e44d682a3fdc290f4d49ff0e90..49a0310ec0ef57ca436a88e7f38c5ef1f70049cc 100644 (file)
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/io/master.h>
 #include <freeradius-devel/server/rad_assert.h>
 

diff --git a/src/lib/io/worker.h b/src/lib/io/worker.h
index 88b962c458f6be5eff603083e07639c718ee8c9e..bdd021941300cf50eb4979eaaf2e1777526eae1f 100644 (file)
--- a/src/lib/io/worker.h
+++ b/src/lib/io/worker.h
@@ -31,7 +31,7 @@ RCSIDH(worker_h, "$Id$")
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/fr_log.h>
 
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/lib/json/json.h b/src/lib/json/base.h
similarity index 99%
rename from src/lib/json/json.h
rename to src/lib/json/base.h
index add111fba3d097e6b8654ce266e490e5b00dc387..42a5b5440170a355bdbdbe07d7b3015d973ec70e 100644 (file)
--- a/src/lib/json/json.h
+++ b/src/lib/json/base.h
@@ -17,7 +17,7 @@
 
 /**
  * $Id$
- * @file jpath.c
+ * @file lib/json/base.h
  * @brief Implements the evaluation and parsing functions for the FreeRADIUS version of jpath.
  *
  * @author Arran Cudbard-Bell

diff --git a/src/lib/json/jpath.c b/src/lib/json/jpath.c
index a93d7d7cbd61262f4215cc0eb499c3380f950bac..0a911bd83fda592efbefe459f95aeba899762870 100644 (file)
--- a/src/lib/json/jpath.c
+++ b/src/lib/json/jpath.c
@@ -26,7 +26,7 @@
  * @copyright 2015  The FreeRADIUS Server Project
  */
 #include <freeradius-devel/server/rad_assert.h>
-#include "json.h"
+#include "base.h"
 
 #define        SELECTOR_INDEX_UNSET                    INT32_MAX
 

diff --git a/src/lib/json/json.c b/src/lib/json/json.c
index c2427b5bd8e316aa4d426e79e1a569644ced82ea..e57325f67f22f552387878131f1497d8d0aa28e8 100644 (file)
--- a/src/lib/json/json.c
+++ b/src/lib/json/json.c
@@ -26,7 +26,7 @@
  * @copyright 2015 The FreeRADIUS Server Project
  */
 #include <freeradius-devel/server/rad_assert.h>
-#include "json.h"
+#include "base.h"
 
 /** Convert json object to fr_value_box_t
  *

diff --git a/src/lib/json/json_missing.h b/src/lib/json/json_missing.h
index 41b6697edb71cafaf787923478db19ed790d8859..4bf3b5709138ac2ea14aeae95461123ea80ff2bd 100644 (file)
--- a/src/lib/json/json_missing.h
+++ b/src/lib/json/json_missing.h
@@ -30,7 +30,7 @@ RCSIDH(jsonc_missing_h, "$Id$")
 #  if defined(HAVE_JSONMC_JSON_H)
 #    include <json-c/json.h>
 #  elif defined(HAVE_JSON_JSON_H)
-#    include <json/json.h>
+#    include <json/base.h>
 #  else
 #    error "Need json-c headers"
 #  endif

diff --git a/src/lib/ldap/base.c b/src/lib/ldap/base.c
index b8a4a32501fd8868b3efdde234daa6a2fd0b23be..8756e0a7c56f4c84c17e54f09a1e86fa80c72f85 100644 (file)
--- a/src/lib/ldap/base.c
+++ b/src/lib/ldap/base.c
@@ -31,7 +31,7 @@
 #define LOG_PREFIX_ARGS handle_config->name
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 LDAP *ldap_global_handle;                      //!< Hack for OpenLDAP libldap global initialisation.
 

diff --git a/src/lib/ldap/ldap.h b/src/lib/ldap/base.h
similarity index 100%
rename from src/lib/ldap/ldap.h
rename to src/lib/ldap/base.h

diff --git a/src/lib/ldap/bind.c b/src/lib/ldap/bind.c
index ed507a8b294a6e770fa936a94e43742967524177..de9c48b55f59f371d5407712556b9be746c7456c 100644 (file)
--- a/src/lib/ldap/bind.c
+++ b/src/lib/ldap/bind.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 /** Holds arguments for the bind operation

diff --git a/src/lib/ldap/connection.c b/src/lib/ldap/connection.c
index d90e9516e5e6c0339a5b5b5450136031e3a85d7a..6fa8fd91dac8a0dec5821a198c487aa7259584d8 100644 (file)
--- a/src/lib/ldap/connection.c
+++ b/src/lib/ldap/connection.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 #if LDAP_SET_REBIND_PROC_ARGS == 3

diff --git a/src/lib/ldap/control.c b/src/lib/ldap/control.c
index ace76681c8464d4e88133a9500e2d53c9bebf035..826248ea8b91d3ddf2cd346e785ec8d1613484fb 100644 (file)
--- a/src/lib/ldap/control.c
+++ b/src/lib/ldap/control.c
@@ -22,7 +22,7 @@
  * @author Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  * @copyright 2015 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 /** Merge connection and call specific client and server controls
  *

diff --git a/src/lib/ldap/directory.c b/src/lib/ldap/directory.c
index 5247551b6d3ef44568f22cd8101482a9890c9ce5..57afa3bc5bf9d7eaa34e7906e4b78375532e156c 100644 (file)
--- a/src/lib/ldap/directory.c
+++ b/src/lib/ldap/directory.c
@@ -27,7 +27,7 @@
 #define LOG_PREFIX "%s - "
 #define LOG_PREFIX_ARGS (*pconn)->config->name
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 static FR_NAME_NUMBER const fr_ldap_directory_type_table[] = {
        { "Unknown",                    FR_LDAP_DIRECTORY_UNKNOWN       },

diff --git a/src/lib/ldap/edir.c b/src/lib/ldap/edir.c
index 85a2477c1756838457dedb14dc21f86f379d3f7c..d821831b24a8c800e8f9d30f1557fad7b51179f4 100644 (file)
--- a/src/lib/ldap/edir.c
+++ b/src/lib/ldap/edir.c
@@ -29,7 +29,7 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 /* NMAS error codes */
 #define NMAS_E_BASE    (-1600)

diff --git a/src/lib/ldap/map.c b/src/lib/ldap/map.c
index 0a6f9bc8be7727fa4a354f56f09adc5bac3d7d39..7031b316eaabecca95ede3c5fb19897512859402 100644 (file)
--- a/src/lib/ldap/map.c
+++ b/src/lib/ldap/map.c
@@ -27,7 +27,7 @@
 #define LOG_PREFIX_ARGS handle_config->name
 
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 /** Callback for map_to_request
  *

diff --git a/src/lib/ldap/sasl.c b/src/lib/ldap/sasl.c
index f8257f22067fb758458b0ce87d1e1f4b2e9f21c8..6cecb685eafdf522d53702598e598f8c44e2a1d9 100644 (file)
--- a/src/lib/ldap/sasl.c
+++ b/src/lib/ldap/sasl.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <sasl/sasl.h>
 

diff --git a/src/lib/ldap/sasl_s.c b/src/lib/ldap/sasl_s.c
index 0288ccaf78f046137f0db8aa2c7328873f99b5d5..7be8802b2b4edf7db7832c28418dd983dc6d8233 100644 (file)
--- a/src/lib/ldap/sasl_s.c
+++ b/src/lib/ldap/sasl_s.c
@@ -28,7 +28,7 @@
 
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 #include <sasl/sasl.h>
 

diff --git a/src/lib/ldap/start_tls.c b/src/lib/ldap/start_tls.c
index 7966aa921fd795c447c76b1fa756c6156c50a8b4..ad512964584d1a3320edbcec26110693025c2cb5 100644 (file)
--- a/src/lib/ldap/start_tls.c
+++ b/src/lib/ldap/start_tls.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 /** Holds arguments for the start_tls operation

diff --git a/src/lib/ldap/state.c b/src/lib/ldap/state.c
index 26f42c18488bf5347fadd4098c2e88e4718dfb46..786c55e6b0c917e1cd7a67b42c9d615599aff2c2 100644 (file)
--- a/src/lib/ldap/state.c
+++ b/src/lib/ldap/state.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 #define STATE_TRANSITION(_new) \
 do { \

diff --git a/src/lib/ldap/util.c b/src/lib/ldap/util.c
index be8645e1c25ad85f4118a3c8d23277f6d2b564fb..2bc8d8c0aacf06e6a1ad6acff3cc17216c15cf14 100644 (file)
--- a/src/lib/ldap/util.c
+++ b/src/lib/ldap/util.c
@@ -23,7 +23,7 @@
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  * @copyright 2017 The FreeRADIUS Server Project.
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 #include <stdarg.h>
 #include <ctype.h>

diff --git a/src/lib/redis/redis.h b/src/lib/redis/base.h
similarity index 100%
rename from src/lib/redis/redis.h
rename to src/lib/redis/base.h

diff --git a/src/lib/redis/cluster.c b/src/lib/redis/cluster.c
index 9f038618d64a89bdaa07108c48278bbdcdbdd4fe..e3edbba927f8638962edea8e2a99c78e497c4342 100644 (file)
--- a/src/lib/redis/cluster.c
+++ b/src/lib/redis/cluster.c
@@ -145,7 +145,7 @@
  *   after some time.  This time is configurable.
  *
  */
-#include "redis.h"
+#include "base.h"
 #include "cluster.h"
 #include "crc16.h"
 #include <freeradius-devel/server/rad_assert.h>

diff --git a/src/lib/redis/redis.c b/src/lib/redis/redis.c
index b9aefbb5bb99805e99c768107b011f2b9dc50bcd..68be51c864a35fdb0c6a81de7c5bf1058c06a705 100644 (file)
--- a/src/lib/redis/redis.c
+++ b/src/lib/redis/redis.c
@@ -23,7 +23,7 @@
  * @copyright 2000,2006,2015  The FreeRADIUS server project
  * @copyright 2011 TekSavvy Solutions <gabe@teksavvy.com>
  */
-#include "redis.h"
+#include "base.h"
 #include <freeradius-devel/server/rad_assert.h>
 
 FR_NAME_NUMBER const redis_reply_types[] = {

diff --git a/src/lib/server/module.c b/src/lib/server/module.c
index 2d62294b7cd9bf01550940d3c7fdbbb72c7f099f..63daf9039fd4e18478a42d4d7ca7706d35ce29b8 100644 (file)
--- a/src/lib/server/module.c
+++ b/src/lib/server/module.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/parser.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/radmin.h>
 #include <freeradius-devel/server/cf_file.h>
 

diff --git a/src/lib/server/modules.h b/src/lib/server/modules.h
index e48edff5451a34e00ac03a4e507aaada0988e31f..1822406d44b7e6000f9766cc115f2bf7d6db2dd8 100644 (file)
--- a/src/lib/server/modules.h
+++ b/src/lib/server/modules.h
@@ -32,7 +32,7 @@ RCSIDH(modules_h, "$Id$")
 #include <freeradius-devel/server/exfile.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/server/components.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/lib/server/protocol.h b/src/lib/server/protocol.h
index c12b8e411dfecdd48e191cf9600bf6b5ab74b131..56474d1ff4343844a7328995cf4d8c668fc0154b 100644 (file)
--- a/src/lib/server/protocol.h
+++ b/src/lib/server/protocol.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 #include <freeradius-devel/server/dl.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 
 /*
  *     We'll use this below.

diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index 47a2f0940e411ac46759a5a7f90f8e099cff0462..838e380ddae2c6e22eb2ebd387acb9f66ce0fccd 100644 (file)
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 /** Per-request opaque data, added by modules
  *

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 7fee2e48c1eb4a6b4e9576d245c0a44dda87ad2f..a51b8b617c55c7f5756d686d041ccbfe9d3e7ee2 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/parser.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/io/listen.h>

diff --git a/src/lib/server/xlat_eval.c b/src/lib/server/xlat_eval.c
index 9e1b1c6ea22d2fd9e5be08824fa61927c1467a38..7312532b406529fb4876d9bd84edc066415c96aa 100644 (file)
--- a/src/lib/server/xlat_eval.c
+++ b/src/lib/server/xlat_eval.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/parser.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 #include <ctype.h>

diff --git a/src/lib/soh/soh.h b/src/lib/soh/base.h
similarity index 97%
rename from src/lib/soh/soh.h
rename to src/lib/soh/base.h
index 667cc4670bbdb6ebae5c62cfec906eabc444bfe3..7cc5ce468738712e06dee294ef735b0141fd6c4d 100644 (file)
--- a/src/lib/soh/soh.h
+++ b/src/lib/soh/base.h
@@ -18,7 +18,7 @@
 /**
  * $Id$
  *
- * @file src/lib/soh/soh.h
+ * @file src/lib/soh/base.h
  * @brief Common libraries for parsing Microsoft SOH data
  *
  * @copyright 2010 Phil Mayers <p.mayers@imperial.ac.uk>

diff --git a/src/lib/soh/soh.c b/src/lib/soh/soh.c
index fa49ecd6c0effd5fb293fc0899ad117921c73ee1..9d11b4744cafec572fa185f8d08d492898097a05 100644 (file)
--- a/src/lib/soh/soh.c
+++ b/src/lib/soh/soh.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "soh.h"
+#include "base.h"
 
 /*
  * This code implements parsing of MS-SOH data into FreeRadius AVPs

diff --git a/src/lib/tls/all.mk b/src/lib/tls/all.mk
index ab1c60c7d7b6ab6a3d215f39d043e386702ddd37..9df3763e49e522921928d22b457b27c94ba0e05a 100644 (file)
--- a/src/lib/tls/all.mk
+++ b/src/lib/tls/all.mk
@@ -21,8 +21,8 @@ TGT_PREREQS := libfreeradius-util.la
 TGT_LDLIBS  := $(LIBS) $(OPENSSL_LIBS) $(GPERFTOOLS_LIBS)
 TGT_LDFLAGS := $(OPENSSL_FLAGS) $(GPERFTOOL_FLAGS)
 
-src/lib/tls/tls.h: src/lib/tls/tls-h src/include/autoconf.sed src/include/autoconf.h
+src/lib/tls/base.h: src/lib/tls/base-h src/include/autoconf.sed src/include/autoconf.h
        ${Q}$(ECHO) HEADER $@
        ${Q}sed -f src/include/autoconf.sed < $< > $@
 
-src/freeradius-devel: | src/lib/tls/tls.h
+src/freeradius-devel: | src/lib/tls/base.h

diff --git a/src/lib/tls/tls-h b/src/lib/tls/base-h
similarity index 100%
rename from src/lib/tls/tls-h
rename to src/lib/tls/base-h

diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c
index 8a15b45dc0a7d1739640276eb04341f00014e644..75ab02cb054e5f1cf30f4fdfa44cf813ba4fad44 100644 (file)
--- a/src/lib/tls/base.c
+++ b/src/lib/tls/base.c
@@ -34,7 +34,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 static int instance_count = 0;

diff --git a/src/lib/tls/tls.h b/src/lib/tls/base.h
similarity index 99%
rename from src/lib/tls/tls.h
rename to src/lib/tls/base.h
index 2fe52253d81f31ba246d5247b4a767c360a418b3..05d9dff3731bdc964539871541d19fac418fdbae 100644 (file)
--- a/src/lib/tls/tls.h
+++ b/src/lib/tls/base.h
@@ -18,7 +18,7 @@
 /**
  * $Id$
  *
- * @file lib/tls/tls.h
+ * @file lib/tls/base.h
  * @brief Structures and prototypes for TLS wrappers
  *
  * @copyright 2010 Network RADIUS SARL <info@networkradius.com>

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index 28e0684af7cbca4b36c2272b22a6efc710d86df9..329df918413963831be3ec3ef792a800cd80c024 100644 (file)
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -32,7 +32,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /** Add attributes identifying the TLS session to be acted upon, and the action to be performed

diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c
index ece6440dcfd862019325033d62019d32f6f20fa2..4f330f5bea66c5d69be3847e2c511b3828a3c249 100644 (file)
--- a/src/lib/tls/conf.c
+++ b/src/lib/tls/conf.c
@@ -38,7 +38,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 /** Certificate formats
  *

diff --git a/src/lib/tls/ctx.c b/src/lib/tls/ctx.c
index adf76e605ec30f89bcfae837854c50396829d5f8..2102a57fb3c3696eb20ec99cb6188477ec3c3012 100644 (file)
--- a/src/lib/tls/ctx.c
+++ b/src/lib/tls/ctx.c
@@ -35,7 +35,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 
 #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #  ifndef OPENSSL_NO_ECDH

diff --git a/src/lib/tls/log.c b/src/lib/tls/log.c
index f1cfcb05b82dd3afd6f992d4916044594f739d02..84f89804f91d2a039f80fad5f317d7a494243379 100644 (file)
--- a/src/lib/tls/log.c
+++ b/src/lib/tls/log.c
@@ -31,7 +31,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 
 DIAG_OFF(format-nonliteral)
 /** Print errors in the TLS thread local error stack

diff --git a/src/lib/tls/ocsp.c b/src/lib/tls/ocsp.c
index e4dece05bec623deb8ddedb8bf9ae380e12af82f..c06057107d578b825334aa562472725bbba67402 100644 (file)
--- a/src/lib/tls/ocsp.c
+++ b/src/lib/tls/ocsp.c
@@ -33,7 +33,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <openssl/ocsp.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /** Rcodes returned by the OCSP check function

diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index d4d9ba189b94a3d788832de61b8ebef377ac8170..483c18dbace194631b254b449fd513b6aec8baf0 100644 (file)
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -32,7 +32,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <openssl/x509v3.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /*

diff --git a/src/lib/tls/utils.c b/src/lib/tls/utils.c
index 45bbcff1277c16be1402744de9323ccae00b51a3..176418e53e1fce26861ff88af7376f0fe368a66c 100644 (file)
--- a/src/lib/tls/utils.c
+++ b/src/lib/tls/utils.c
@@ -25,7 +25,7 @@
 
 #include <openssl/ssl.h>
 #include <freeradius-devel/server/base.h>
-#include "tls.h"
+#include "base.h"
 
 /** PKEY types (friendly names)
  *

diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
index cfafc23208d8bd3088663e65eef3f1501052dd4d..66dc520c4c60ae0227a67f94a9a0ce4ae094ffad 100644 (file)
--- a/src/lib/tls/validate.c
+++ b/src/lib/tls/validate.c
@@ -30,7 +30,7 @@
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "tls.h"
+#include "base.h"
 #include "tls_attrs.h"
 
 /** Validates a certificate using custom logic

diff --git a/src/lib/unlang/unlang.h b/src/lib/unlang/base.h
similarity index 99%
rename from src/lib/unlang/unlang.h
rename to src/lib/unlang/base.h
index 0dd9a0590b7c959692a13186d5cb04fb72871bba..44333c25b248f20e57c5a5ecb3cdddf582493158 100644 (file)
--- a/src/lib/unlang/unlang.h
+++ b/src/lib/unlang/base.h
@@ -18,7 +18,7 @@
 /**
  * $Id$
  *
- * @file lib/unlang/unlang.h
+ * @file lib/unlang/base.h
  * @brief Public interface to the interpreter
  *
  */

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index 0ac105905073c0cca9c04bc58efed951ecfa6e18..79e6446dd0c6cde734ded6b199563790d56c0522 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/parser.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "unlang_priv.h"
 
 /* Here's where we recognize all of our keywords: first the rcodes, then the

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 855e842c181ed5a6a698f8b70b09dfb12a3280b1..2771af5267d224c45c1de5f8d5cbb805ce328c4c 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/parser.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/xlat.h>
 #include "unlang_priv.h"
 

diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h
index 41728714540497560ae906a0a4553640a638f150..2c21ccb826e8496d5c4b7558ce76a272e0e1dbac 100644 (file)
--- a/src/lib/unlang/unlang_priv.h
+++ b/src/lib/unlang/unlang_priv.h
@@ -26,7 +26,7 @@
 #include <freeradius-devel/server/cf_util.h> /* Need CONF_* definitions */
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 #ifdef __cplusplus

diff --git a/src/modules/proto_arp/proto_arp.c b/src/modules/proto_arp/proto_arp.c
index 175491ada9067e8631e22d3932fae309b68d4188..3a7fb32cb1e4380fdf9754733010b5f683dc41f0 100644 (file)
--- a/src/modules/proto_arp/proto_arp.c
+++ b/src/modules/proto_arp/proto_arp.c
@@ -23,7 +23,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/util/pcap.h>

diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c
index 4c959bd779b6ebd1a65d3f5051281e851e4239d3..2a0ae2dab24b4f2cc1b8a7b35a839c307d6eb4fa 100644 (file)
--- a/src/modules/proto_bfd/proto_bfd.c
+++ b/src/modules/proto_bfd/proto_bfd.c
@@ -23,7 +23,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/md5.h>

diff --git a/src/modules/proto_control/proto_control.c b/src/modules/proto_control/proto_control.c
index db7f004ed94b5c2a3b34e90619a97e8fc6869f60..66534ecd4badb4fcd42d151b313d1c7855543b0b 100644 (file)
--- a/src/modules/proto_control/proto_control.c
+++ b/src/modules/proto_control/proto_control.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_control.h"
 

diff --git a/src/modules/proto_control/proto_control_tcp.c b/src/modules/proto_control/proto_control_tcp.c
index a8156dcc7234ac45cd94a31d68c47eacb3464f75..909d6a08f4d646b4051548b22b763d8d5d0625f8 100644 (file)
--- a/src/modules/proto_control/proto_control_tcp.c
+++ b/src/modules/proto_control/proto_control_tcp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/server/tcp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

diff --git a/src/modules/proto_control/proto_control_unix.c b/src/modules/proto_control/proto_control_unix.c
index 9ebc75260d586ddfccea1ceffa1b4d8b3f108bc9..abba678498a17b9f1858ae8c9d903e535bbe0914 100644 (file)
--- a/src/modules/proto_control/proto_control_unix.c
+++ b/src/modules/proto_control/proto_control_unix.c
@@ -27,7 +27,7 @@
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

diff --git a/src/modules/proto_detail/proto_detail_file.c b/src/modules/proto_detail/proto_detail_file.c
index caa61758eb0ab2d63d251c19fab0e70b58eb294f..1aaafa6bbd8d1d4930d812f3130a690d4a74c114 100644 (file)
--- a/src/modules/proto_detail/proto_detail_file.c
+++ b/src/modules/proto_detail/proto_detail_file.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

diff --git a/src/modules/proto_detail/proto_detail_process.c b/src/modules/proto_detail/proto_detail_process.c
index 6a3351f99d6b98e27fcc2f5ebc8f1c897150bae2..400eca842c0239567fa21d065e3e338d22cc4f2e 100644 (file)
--- a/src/modules/proto_detail/proto_detail_process.c
+++ b/src/modules/proto_detail/proto_detail_process.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>

diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c
index 99703066103e7522f17e23639aa513fefbebb765..1a87999bdacfe197b40138c623a7129087dc71ca 100644 (file)
--- a/src/modules/proto_detail/proto_detail_work.c
+++ b/src/modules/proto_detail/proto_detail_work.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/util/dlist.h>

diff --git a/src/modules/proto_dhcpv4/old.c b/src/modules/proto_dhcpv4/old.c
index 2f1a3a7d88e623b3adc8d911071d9a07392913bf..a0abba3a3efbe38846f894497f438caa80037d66 100644 (file)
--- a/src/modules/proto_dhcpv4/old.c
+++ b/src/modules/proto_dhcpv4/old.c
@@ -47,7 +47,7 @@
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c
index e9280979c8d10848e318888715ab57421fa5c448..1361247b7bff54d4ba9b8c52da82c345cf65933a 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_dhcpv4.h"
 

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
index 7d755a00feacc05b41e928cab4b2307adfad65b9..18d4b77d025fd47842050b80f0c3578502486159 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
index 1e362d4f2658dfac1e3b4e529a976915fdbdba00..1557a312fef3dd627711cd0a47ee1a1d2b643f72 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_udp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index 6378984387f9095e30c632d72a82f2fe8c1f38a8..d532ac9c913195353d5184740143af4cc14467c3 100644 (file)
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -23,9 +23,9 @@
  *
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/rad_assert.h>

diff --git a/src/modules/proto_ldap_sync/sync.c b/src/modules/proto_ldap_sync/sync.c
index 87202b904abb5390c4e0670c016af94537f1f312..a728c19a7e2c3916e0c7d635270de098f8c6d00f 100644 (file)
--- a/src/modules/proto_ldap_sync/sync.c
+++ b/src/modules/proto_ldap_sync/sync.c
@@ -27,7 +27,7 @@
  *
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <lber.h>
 #include "sync.h"

diff --git a/src/modules/proto_ldap_sync/sync.h b/src/modules/proto_ldap_sync/sync.h
index a6eec02112ea2ee0efb759958c15ba3abfdf87a7..7a2ef8411e1ef2be1a913466340e00ceca3b262d 100644 (file)
--- a/src/modules/proto_ldap_sync/sync.h
+++ b/src/modules/proto_ldap_sync/sync.h
@@ -24,7 +24,7 @@
  *
  * @copyright 2017 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <lber.h>
 
 #define SYNC_UUID_LENGTH               16

diff --git a/src/modules/proto_ldap_sync/sync_touch.c b/src/modules/proto_ldap_sync/sync_touch.c
index c3237d0e6e39673472932dd4a4041eeb75d53cdd..aeb1db2f88feb35f4a0841ebc7b9917a0520a389 100644 (file)
--- a/src/modules/proto_ldap_sync/sync_touch.c
+++ b/src/modules/proto_ldap_sync/sync_touch.c
@@ -23,7 +23,7 @@
  *
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 
 typedef struct {

diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
index 2d6bb5c1251c768ba45edf28ad9cb99a0547ab51..51e05020d9f27ccae4f474cdb805d772bb205a42 100644 (file)
--- a/src/modules/proto_radius/proto_radius.c
+++ b/src/modules/proto_radius/proto_radius.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_radius.h"
 

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index 4ba7984a746593efdd9d9aa713992ec054a80d5c..d0dce405c7f62a44cb3dbc3fcddbeeec6ad788bc 100644 (file)
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index 96ecfa35ed7ce47e2221fbb588998c91727904c0..e7c1d1e94653d1b2c5c1868f0fce00d58677ac1e 100644 (file)
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/rad_assert.h>

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index ff37653e2cf0911779dba900c8887a171c6fabbc..405b04caac423ec21380b082df687c35555daf21 100644 (file)
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 

diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
index 62f1d2c591ec653aac4e4614e14ddb16d6084936..39db9809ce25deafe6d53cda3404509b91eede75 100644 (file)
--- a/src/modules/proto_radius/proto_radius_dynamic_client.c
+++ b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 

diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
index 816da6003ba847bbbd2fe74f7668a55c6b9d22a6..6431fe887f4b5924bd172a253b72bea33a18069a 100644 (file)
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 

diff --git a/src/modules/proto_radius/proto_radius_tcp.c b/src/modules/proto_radius/proto_radius_tcp.c
index 099bc89f265fa28356df3c495cf0a711d6d2b609..0a803aaf6832493df45a6f75da7d4157dcc939d7 100644 (file)
--- a/src/modules/proto_radius/proto_radius_tcp.c
+++ b/src/modules/proto_radius/proto_radius_tcp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/server/tcp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

diff --git a/src/modules/proto_radius/proto_radius_udp.c b/src/modules/proto_radius/proto_radius_udp.c
index 7c8cafc284e0ee557c7ec2c93c756a780f21c8cf..da6d76cf89ea02cd82b339823c441385b737874b 100644 (file)
--- a/src/modules/proto_radius/proto_radius_udp.c
+++ b/src/modules/proto_radius/proto_radius_udp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

diff --git a/src/modules/proto_tacacs/proto_tacacs.c b/src/modules/proto_tacacs/proto_tacacs.c
index 53ede435e3e7a2bab439115023421af2346333b6..f4a2d98c7f875275b8ff7123c22f027dc664f296 100644 (file)
--- a/src/modules/proto_tacacs/proto_tacacs.c
+++ b/src/modules/proto_tacacs/proto_tacacs.c
@@ -22,7 +22,7 @@
  */
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/process.h>
 #include <freeradius-devel/server/state.h>

diff --git a/src/modules/proto_tls_cache/proto_tls_cache.c b/src/modules/proto_tls_cache/proto_tls_cache.c
index 3dce1609c00565944c949f4638fae507d022515f..3a4eb80daeb493adfb74d78d697c95096c0ee4cf 100644 (file)
--- a/src/modules/proto_tls_cache/proto_tls_cache.c
+++ b/src/modules/proto_tls_cache/proto_tls_cache.c
@@ -22,10 +22,10 @@
  * @copyright 2018 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/dl.h>
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 /** Compile various unlang sections
  *

diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index e1e3c1aec8e3cec54715087f2b3a4733446d26c5..27dde1fbd2cab036b5c4f19fe374ea17b1118871 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -26,7 +26,7 @@
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include "proto_vmps.h"
 

diff --git a/src/modules/proto_vmps/proto_vmps_all.c b/src/modules/proto_vmps/proto_vmps_all.c
index bda03551c8d551fb04c9803edb594e160baacbd2..0b47eba77633422e6979997663d66f2f73ed7e3e 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_all.c
+++ b/src/modules/proto_vmps/proto_vmps_all.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/vqp/vqp.h>

diff --git a/src/modules/proto_vmps/proto_vmps_dynamic_client.c b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
index 028a0f6ad12334c8e634b23d5c9d0906a1ae5f55..492e902c040973ba90209d7701e7133a16ea8205 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_dynamic_client.c
+++ b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
@@ -25,7 +25,7 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/vqp/vqp.h>

diff --git a/src/modules/proto_vmps/proto_vmps_udp.c b/src/modules/proto_vmps/proto_vmps_udp.c
index c6e6c959640edae79a216aca428cef5966d9252d..60c7401cf2c006e77520c0a51a5c77d629fa44f6 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_udp.c
+++ b/src/modules/proto_vmps/proto_vmps_udp.c
@@ -28,7 +28,7 @@
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/io/io.h>
+#include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

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 e609db7c82ec8680d989aad54dbbe1c8d14051f2..dbb579fb75aa010ef9d52b6155d5b71fd8cdeb48 100644 (file)
--- 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
@@ -27,7 +27,7 @@
 #include <freeradius-devel/server/rad_assert.h>
 
 #include "../../rlm_cache.h"
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 static CONF_PARSER driver_config[] = {
        REDIS_COMMON_CONFIG,

diff --git a/src/modules/rlm_cipher/rlm_cipher.c b/src/modules/rlm_cipher/rlm_cipher.c
index 115b13998f8c243640111866d27b39d1792c35b5..60ba4bb55439583431a9e93d4f31cbef307aa335 100644 (file)
--- a/src/modules/rlm_cipher/rlm_cipher.c
+++ b/src/modules/rlm_cipher/rlm_cipher.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #include <openssl/crypto.h>
 #include <openssl/pem.h>

diff --git a/src/modules/rlm_couchbase/couchbase.c b/src/modules/rlm_couchbase/couchbase.c
index 5e83d00c9f310b36faa13cc0b97256beadf854f7..9a1f0c1fe203f47dadd0ea135711ca593d7d38c5 100644 (file)
--- a/src/modules/rlm_couchbase/couchbase.c
+++ b/src/modules/rlm_couchbase/couchbase.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include "couchbase.h"
 

diff --git a/src/modules/rlm_couchbase/couchbase.h b/src/modules/rlm_couchbase/couchbase.h
index f536c9442187187808a544eb34d2b0dcf28905d1..b4d4cb8d19cda5e643fc5b9100bdc97dca3addd5 100644 (file)
--- a/src/modules/rlm_couchbase/couchbase.h
+++ b/src/modules/rlm_couchbase/couchbase.h
@@ -27,7 +27,7 @@
 RCSIDH(couchbase_h, "$Id$")
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 /** Information relating to the parsing of Couchbase document payloads
  *

diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c
index 2d006db302a57396208dfc6fa6fdebe161a5eee8..eb100be983ef94e82b7c6c5fe03ba289b529dc21 100644 (file)
--- a/src/modules/rlm_couchbase/mod.c
+++ b/src/modules/rlm_couchbase/mod.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include "mod.h"
 #include "couchbase.h"

diff --git a/src/modules/rlm_couchbase/mod.h b/src/modules/rlm_couchbase/mod.h
index 711ea94b3d82e825968f693c5180f31cc5d2a3e5..0e30893c2c4fd3ec978de14dbc90fe3d0a611667 100644 (file)
--- a/src/modules/rlm_couchbase/mod.h
+++ b/src/modules/rlm_couchbase/mod.h
@@ -29,7 +29,7 @@ RCSIDH(mod_h, "$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/pool.h>
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 /* maximum size of a stored value */
 #define MAX_VALUE_SIZE 20480

diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index bbcfb6d05780a0ff9c7fdaf36cd359c694d8e26a..221db98e1dece6e286a9008755749c8904dfd9bc 100644 (file)
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -34,7 +34,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 
 #include <libcouchbase/couchbase.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include "mod.h"
 #include "couchbase.h"

diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c
index fea7f78eaebc4c9b663fa754d69fcbf31b976176..c2cbf28892687edea29bd7b57fe1058b1853ff26 100644 (file)
--- a/src/modules/rlm_delay/rlm_delay.c
+++ b/src/modules/rlm_delay/rlm_delay.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/map_proc.h>
 

diff --git a/src/modules/rlm_eap/lib/base/eap_tls.h b/src/modules/rlm_eap/lib/base/eap_tls.h
index fa78f63ef8139e86a59dc18d89508f91b04d27e6..5113e2896a0e46d28a6984d8b674ba4f387dc389 100644 (file)
--- a/src/modules/rlm_eap/lib/base/eap_tls.h
+++ b/src/modules/rlm_eap/lib/base/eap_tls.h
@@ -46,7 +46,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #endif
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #include "eap.h"
 

diff --git a/src/modules/rlm_eap/lib/sim/base.c b/src/modules/rlm_eap/lib/sim/base.c
index 73843f00f4cbfac702fb00c19896d95fbe0c7bea..87a6743b88856e89d58769c52ebfd73f2f366fac 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/base.c
+++ b/src/modules/rlm_eap/lib/sim/base.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/sha1.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #include "eap_types.h"
 #include "eap_sim_common.h"

diff --git a/src/modules/rlm_eap/lib/sim/crypto.c b/src/modules/rlm_eap/lib/sim/crypto.c
index 449ef6b965a8e98dc798d5079e78d2346c14d81d..d2752f5bdc8a63140f6832d5e092ab7fd2781755 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/crypto.c
+++ b/src/modules/rlm_eap/lib/sim/crypto.c
@@ -41,7 +41,7 @@ RCSID("$Id$")
 #include "milenage.h"
 
 #include <freeradius-devel/util/sha1.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <openssl/evp.h>
 
 

diff --git a/src/modules/rlm_eap/lib/sim/decode.c b/src/modules/rlm_eap/lib/sim/decode.c
index 16e1911958814aaa3f6cfe37f18d1754247f4716..1aee6acb739f7e3945149f4f72c3a78384ec1e3d 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/decode.c
+++ b/src/modules/rlm_eap/lib/sim/decode.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/sha1.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/io/test_point.h>
 
 #include "eap_types.h"

diff --git a/src/modules/rlm_eap/lib/sim/encode.c b/src/modules/rlm_eap/lib/sim/encode.c
index 1a0194069819d9eb0885ec84655c1ba539288da2..7be12c927c4adc0fd8a28102bd20f9e32f704019 100644 (file)
--- a/src/modules/rlm_eap/lib/sim/encode.c
+++ b/src/modules/rlm_eap/lib/sim/encode.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/sha1.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/io/test_point.h>
 
 #include "eap_types.h"

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index 4a117ac0257912748dc7ec8b049d6b89760ce8e2..1f6076967290f743c4fb8a9a92095f2ab16468c5 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "eap.h"
 
 #include <freeradius-devel/server/rad_assert.h>

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 cf0280d705bac3af11064dd3e48c7ebe9774d7e7..3ff0a9d9b86b81b8421fb46586ece4229fa0b74d 100644 (file)
--- 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
@@ -25,7 +25,7 @@ RCSID("$Id$")
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "eap_mschapv2.h"
 
 #include <freeradius-devel/server/rad_assert.h>

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
index 37be584de803a91ce280671944d407e5207f910d..fabdc9009d004f28e5a1761467c9b334ac20635b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h
@@ -24,7 +24,7 @@
 RCSIDH(eap_peap_h, "$Id$")
 
 #include "eap_tls.h"
-#include <freeradius-devel/soh/soh.h>
+#include <freeradius-devel/soh/base.h>
 
 typedef enum {
        PEAP_STATUS_INVALID,

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index 8a946dddf61b25e109b33bc5f6d5df1cdf1a9f85..884ba665a1be5dc2e83b5868f8bb1afd23c8fd2b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include "eap_peap.h"
 
 static int setup_fake_request(REQUEST *request, REQUEST *fake, peap_tunnel_t *t);

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 b06ae371f734a63fe345c8c5e93af53b43248dc0..aefb2e62dfcebe43f89b84b516a46b11f75133c5 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
@@ -35,7 +35,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API      /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/server/modules.h>
 
 #include "eap_pwd.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 8757c4a7f9219bf793c810bd48b36579cd67a9b8..421195da70cb45d656efec1a585a0f88ec0d93e9 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
@@ -36,7 +36,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #define LOG_PREFIX "rlm_eap_pwd - "
 
 #include <freeradius-devel/server/base.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/server/modules.h>
 
 #include "eap_pwd.h"

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index 5506a17323ba699a2b40c72568666f08760cb49b..b431696ec47ac58ab2f7205130ce76dfc982c1b7 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -41,7 +41,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 #  include <sys/stat.h>
 #endif
 
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 static CONF_PARSER submodule_config[] = {
        { FR_CONF_OFFSET("tls", FR_TYPE_STRING, rlm_eap_tls_t, tls_conf_name) },

diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index a2c95b6d28237af65b8f638630952e9784a2fb8a..d996252f853221c6f5b2af497d6a4c0387c7e54a 100644 (file)
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/server/map_proc.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #include <ctype.h>
 

diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index dd955f4ee8c4c378cf4d7d733db5cc11fe772801..11c155e1b2c7cdf6b89df5dd3c1f58f9efd773e3 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -15,7 +15,7 @@
  */
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/ldap/ldap.h>
+#include <freeradius-devel/ldap/base.h>
 
 typedef struct ldap_inst_s rlm_ldap_t;
 

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index adb96f2ed334160fb248cbed54ef662c3142f4bc..b26713e8a5dc7f19e03cde55565c40fbe7ffbbee 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -35,7 +35,7 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/sha1.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 
 #ifdef HAVE_OPENSSL_EVP_H
 #  include <openssl/evp.h>

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 5ae9252afe924c69bcecf50f71c1832533c71b97..747101319081d1965a8a59790057c1ab963d451c 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/modpriv.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/server/rad_assert.h>
 

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 022da8fa3ca82bd7098071ba947ea81d12a48c49..2a52303b0832945d0495cf390ca33f24a157761d 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 #include "rlm_radius.h"
 #include "track.h"

diff --git a/src/modules/rlm_redis/rlm_redis.c b/src/modules/rlm_redis/rlm_redis.c
index 7b1cc93d3218219c7b55651a7440e406ddbc243e..e4c6ed28e5284152c7f626c840b36bd7011ab9b1 100644 (file)
--- a/src/modules/rlm_redis/rlm_redis.c
+++ b/src/modules/rlm_redis/rlm_redis.c
@@ -33,7 +33,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 
 #define MAX_QUERY_LEN  4096                    //!< Maximum command length.

diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index 9ed4d7dfeb3798ec545f9bd1a1aebb5519affc6e..38c45f8a9668963002ed793329648674e088675c 100644 (file)
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -46,7 +46,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 #include "redis_ippool.h"
 

diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
index f22943e4d17b5d73c9e1a501ec39e4eed7edc293..b455834cfb5f1ed71280155cb10de696579e9945 100644 (file)
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include "redis.h"
+#include "base.h"
 #include "cluster.h"
 #include "redis_ippool.h"
 

diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c
index c134bd4a8f2f48ec124e051df5ee55152af82aae..9795477b8b50e60e5282a9365aaba9cf2f744cbf 100644 (file)
--- a/src/modules/rlm_rediswho/rlm_rediswho.c
+++ b/src/modules/rlm_rediswho/rlm_rediswho.c
@@ -33,7 +33,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-#include <freeradius-devel/redis/redis.h>
+#include <freeradius-devel/redis/base.h>
 #include <freeradius-devel/redis/cluster.h>
 
 typedef struct rlm_rediswho {

diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c
index b470f3b8ac6b8d8c59df28dc07bb149dde3c783c..d14fcf03594013705b613d3e412d3da897c57bae 100644 (file)
--- a/src/modules/rlm_rest/io.c
+++ b/src/modules/rlm_rest/io.c
@@ -24,7 +24,7 @@
 #include "rest.h"
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 
 /*
  *  CURL headers do:

diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
index 80baba6148f4d20d82d05baac4194f9e92480385..bbd902fc9cababa2e1b0ebff2b38cc7fac656ffb 100644 (file)
--- a/src/modules/rlm_rest/rest.h
+++ b/src/modules/rlm_rest/rest.h
@@ -33,7 +33,7 @@ RCSIDH(other_h, "$Id$")
 /*
  *     The common JSON library (also tells us if we have json-c)
  */
-#include <freeradius-devel/json/json.h>
+#include <freeradius-devel/json/base.h>
 
 #define REST_URI_MAX_LEN               2048
 #define REST_BODY_MAX_LEN              8192

diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index fc2a5611e4f6bb69593717ce6a76ad5ceef36f63..33c98edb8ed45ae0ba694be1ac394a5093910c3f 100644 (file)
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -25,7 +25,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/util/token.h>
 #include <freeradius-devel/server/rad_assert.h>
 

diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c
index 0e76551ab89796963e0b999876f0400fc1197aa7..3b02e4013f550e5ba48cd278c711979da37a07c6 100644 (file)
--- a/src/modules/rlm_sigtran/client.c
+++ b/src/modules/rlm_sigtran/client.c
@@ -30,7 +30,7 @@
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/eap.aka.h>
 #include <freeradius-devel/eap.sim.h>
-#include <freeradius-devel/unlang/unlang.h>
+#include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/server/modules.h>
 #include "sigtran.h"
 

diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index 27340ef4601b8012810c2906c5502288e4bfb70f..0feee6dbf680ff8aa03cbb117c3fcb4681470f70 100644 (file)
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
-#include <freeradius-devel/soh/soh.h>
+#include <freeradius-devel/soh/base.h>
 
 typedef struct rlm_soh_t {
        char const *xlat_name;

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 7141e44fc20819974015a06c392c7d3424da400b..1026e1fc6cda27a734e5d19e76144ce148bb9e62 100644 (file)
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -28,7 +28,7 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modules.h>
-#include <freeradius-devel/tls/tls.h>
+#include <freeradius-devel/tls/base.h>
 /*
  *     FIXME: Add check for this header to configure.ac
  */