From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 21 Oct 2021 17:30:35 +0000 (-0400)
Subject: no need to include server/base.h everywhere
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25646e5e98c6999df8f097bef5b219411312e6f7;p=thirdparty%2Ffreeradius-server.git

no need to include server/base.h everywhere
---

diff --git a/src/listen/arp/proto_arp.c b/src/listen/arp/proto_arp.c
index 16946e46c37..5debd9326c4 100644
--- a/src/listen/arp/proto_arp.c
+++ b/src/listen/arp/proto_arp.c
@@ -22,7 +22,6 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/listen/arp/proto_arp_ethernet.c b/src/listen/arp/proto_arp_ethernet.c
index d1ded6d696d..b903f1d7ac6 100644
--- a/src/listen/arp/proto_arp_ethernet.c
+++ b/src/listen/arp/proto_arp_ethernet.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/trie.h>
diff --git a/src/listen/control/conduit.c b/src/listen/control/conduit.c
index 08ff5eafc75..3d9f46e142b 100644
--- a/src/listen/control/conduit.c
+++ b/src/listen/control/conduit.c
@@ -25,7 +25,11 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/server/base.h>
+#include <freeradius-devel/util/strerror.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <errno.h>
 #include "conduit.h"
 
 static ssize_t lo_read(int fd, void *out, size_t outlen)
diff --git a/src/listen/control/proto_control.c b/src/listen/control/proto_control.c
index 117a1c5ef9e..ad75a3e643d 100644
--- a/src/listen/control/proto_control.c
+++ b/src/listen/control/proto_control.c
@@ -21,7 +21,6 @@
  *
  * @copyright 2018 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/listen/control/proto_control_unix.c b/src/listen/control/proto_control_unix.c
index 20b62189092..9bad0b998cc 100644
--- a/src/listen/control/proto_control_unix.c
+++ b/src/listen/control/proto_control_unix.c
@@ -26,7 +26,6 @@
 #include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/fopencookie.h>
diff --git a/src/listen/control/radmin.c b/src/listen/control/radmin.c
index c37561dd099..c3b4cd7d450 100644
--- a/src/listen/control/radmin.c
+++ b/src/listen/control/radmin.c
@@ -67,8 +67,10 @@ DIAG_ON(strict-prototypes)
 
 #define LOG_PREFIX "radmin - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/cf_parse.h>
+#include <freeradius-devel/server/cf_util.h>
+#include <freeradius-devel/server/cf_file.h>
+#include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/radmin.h>
 
 #include <freeradius-devel/util/conf.h>
@@ -76,7 +78,9 @@ DIAG_ON(strict-prototypes)
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/socket.h>
+#include <freeradius-devel/util/atexit.h>
 
 #ifdef USE_READLINE_HISTORY
 #ifndef READLINE_MAX_HISTORY_LINES
diff --git a/src/listen/cron/proto_cron.c b/src/listen/cron/proto_cron.c
index 65ee251327c..204ebe000a0 100644
--- a/src/listen/cron/proto_cron.c
+++ b/src/listen/cron/proto_cron.c
@@ -26,7 +26,6 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/util/debug.h>
 
diff --git a/src/listen/cron/proto_cron_crontab.c b/src/listen/cron/proto_cron_crontab.c
index f179994f3c5..52b2fa656d5 100644
--- a/src/listen/cron/proto_cron_crontab.c
+++ b/src/listen/cron/proto_cron_crontab.c
@@ -23,7 +23,6 @@
  */
 #include <netdb.h>
 #include <fcntl.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/io/base.h>
 #include <freeradius-devel/io/application.h>
diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index 7bb5a68e64a..397c4e4b2ea 100644
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -26,8 +26,8 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/virtual_servers.h>
+#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/debug.h>
 
 #include "proto_detail.h"
diff --git a/src/listen/detail/proto_detail_file.c b/src/listen/detail/proto_detail_file.c
index cef9187f27a..ba521fdf359 100644
--- a/src/listen/detail/proto_detail_file.c
+++ b/src/listen/detail/proto_detail_file.c
@@ -28,8 +28,8 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/debug.h>
 
 #include <freeradius-devel/util/misc.h>
diff --git a/src/listen/detail/proto_detail_work.c b/src/listen/detail/proto_detail_work.c
index fe3a5d45422..72e9bfc36fb 100644
--- a/src/listen/detail/proto_detail_work.c
+++ b/src/listen/detail/proto_detail_work.c
@@ -23,13 +23,14 @@
  * @copyright 2017 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/server/pair.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>
 #include <freeradius-devel/util/time.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/debug.h>
 #include "proto_detail.h"
 
diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index f4f3f0fd0f4..4b209d5dbda 100644
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -24,7 +24,6 @@
  */
 #define LOG_PREFIX "proto_dhcpv4 - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index 134869375d5..b29017ba35d 100644
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -25,7 +25,6 @@
 #define LOG_PREFIX "proto_dhcpv4_udp - "
 
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index 36932c16d3f..71faca50c4d 100644
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dhcpv6 - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 54dd1e36497..c25ebc98298 100644
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dhcpv6_udp - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c
index 45169779f5b..e2ede7df655 100644
--- a/src/listen/dns/proto_dns.c
+++ b/src/listen/dns/proto_dns.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dns - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index 81ba4cd324b..165f40dabdb 100644
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dns_udp - "
 
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
diff --git a/src/listen/load/proto_load.c b/src/listen/load/proto_load.c
index d87e84d84af..cbae07e2fd7 100644
--- a/src/listen/load/proto_load.c
+++ b/src/listen/load/proto_load.c
@@ -26,7 +26,6 @@
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/util/debug.h>
 
diff --git a/src/listen/load/proto_load_step.c b/src/listen/load/proto_load_step.c
index fa506148470..1478e3d5748 100644
--- a/src/listen/load/proto_load_step.c
+++ b/src/listen/load/proto_load_step.c
@@ -24,7 +24,6 @@
  */
 #include <netdb.h>
 #include <fcntl.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/base.h>
diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index a56cf213637..465c5c8465b 100644
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -22,7 +22,6 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index bc84f95b640..304bf00fb74 100644
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/tcp.h>
 #include <freeradius-devel/util/trie.h>
diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index bc4cde5727d..e8eeb41107e 100644
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c
index fe9344bc83b..deb71ac9c58 100644
--- a/src/listen/tacacs/proto_tacacs.c
+++ b/src/listen/tacacs/proto_tacacs.c
@@ -25,7 +25,6 @@
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/master.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/state.h>
diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index 90ec551df84..c90a7dda0c8 100644
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -25,7 +25,6 @@
  */
 
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/base.h>
diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index ec2f7f7ab4d..afcda25dcb2 100644
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -22,7 +22,6 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/listen/vmps/proto_vmps_udp.c b/src/listen/vmps/proto_vmps_udp.c
index 6c2bb63fa60..6a24b23ca98 100644
--- a/src/listen/vmps/proto_vmps_udp.c
+++ b/src/listen/vmps/proto_vmps_udp.c
@@ -23,7 +23,6 @@
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index d996ba458a4..290e8969a28 100644
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -26,7 +26,6 @@
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/master.h>
-#include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/unlang/call.h>