From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 21 Oct 2021 16:06:13 +0000 (-0400)
Subject: remove util/base.h, and replace with specific files
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8053ad2293ad50d6a58a1f6a1494ef26ee7799ca;p=thirdparty%2Ffreeradius-server.git

remove util/base.h, and replace with specific files
---

diff --git a/src/bin/dhcpclient.c b/src/bin/dhcpclient.c
index 2360d6f88fa..bec2348a1af 100644
--- a/src/bin/dhcpclient.c
+++ b/src/bin/dhcpclient.c
@@ -24,8 +24,10 @@
 
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/conf.h>
+#include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/atexit.h>
+#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
 #include <freeradius-devel/util/pcap.h>
 
diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 7171e465cec..8125b7cf879 100644
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -28,6 +28,9 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/conf.h>
+#include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/atexit.h>
+#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/time.h>
 #include <freeradius-devel/radius/list.h>
 #include <freeradius-devel/radius/radius.h>
diff --git a/src/bin/radclient.h b/src/bin/radclient.h
index e6c3a092f76..aba5cae0ce4 100644
--- a/src/bin/radclient.h
+++ b/src/bin/radclient.h
@@ -25,8 +25,6 @@
  */
 RCSIDH(radclient_h, "$Id$")
 
-#include <freeradius-devel/util/base.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/bin/radict.c b/src/bin/radict.c
index 3e198f44866..a0b372f2141 100644
--- a/src/bin/radict.c
+++ b/src/bin/radict.c
@@ -25,10 +25,10 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/conf.h>
+#include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/atexit.h>
 #include <freeradius-devel/util/dict_priv.h>
-#include <freeradius-devel/autoconf.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <stdbool.h>
diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index 28b8c8e47f5..6380d009692 100644
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -31,9 +31,11 @@ RCSID("$Id$")
 
 #include <freeradius-devel/autoconf.h>
 #include <freeradius-devel/radius/list.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/event.h>
+#include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/atexit.h>
+#include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/base16.h>
 #include <freeradius-devel/util/pcap.h>
 #include <freeradius-devel/util/timeval.h>
diff --git a/src/bin/radsniff.h b/src/bin/radsniff.h
index aeba3083209..6e21f121c6c 100644
--- a/src/bin/radsniff.h
+++ b/src/bin/radsniff.h
@@ -29,7 +29,6 @@ RCSIDH(radsniff_h, "$Id$")
 
 #include <sys/types.h>
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/pcap.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/radius/radius.h>
diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index 4c827c87b7d..ed39b3f7e0c 100644
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -28,8 +28,9 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/conf.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/udp.h>
+#include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/atexit.h>
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/radius/list.h>
 
diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index b661721850d..2857bcc2a2f 100644
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -25,11 +25,8 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
-
 typedef struct request_s request_t;
 
-#include <freeradius-devel/autoconf.h>
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/cf_util.h>
@@ -46,6 +43,12 @@ typedef struct request_s request_t;
 #include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/unlang/xlat.h>
 #include <freeradius-devel/util/conf.h>
+#include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/log.h>
+#include <freeradius-devel/util/atexit.h>
+#include <freeradius-devel/util/file.h>
+#include <freeradius-devel/util/pair_legacy.h>
+#include <freeradius-devel/util/dns.h>
 
 #include <ctype.h>
 
diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c
index 31525fa42dc..6e8b7e5d11d 100644
--- a/src/bin/unit_test_map.c
+++ b/src/bin/unit_test_map.c
@@ -24,11 +24,12 @@ RCSID("$Id$")
 
 
 #include <freeradius-devel/server/cf_file.h>
+#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/util/conf.h>
-#include <freeradius-devel/util/base.h>
 
 #include <ctype.h>
 
diff --git a/src/lib/eap/base.c b/src/lib/eap/base.c
index 90e795f122c..887068ca753 100644
--- a/src/lib/eap/base.c
+++ b/src/lib/eap/base.c
@@ -64,7 +64,6 @@ RCSID("$Id$")
 
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/unlang/call.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/debug.h>
 #include "types.h"
 #include "attrs.h"
diff --git a/src/lib/eap_aka_sim/base.c b/src/lib/eap_aka_sim/base.c
index a0f5079efc3..0580220e291 100644
--- a/src/lib/eap_aka_sim/base.c
+++ b/src/lib/eap_aka_sim/base.c
@@ -27,7 +27,6 @@
 
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/sha1.h>
 
 #include <freeradius-devel/util/debug.h>
diff --git a/src/lib/eap_aka_sim/decode.c b/src/lib/eap_aka_sim/decode.c
index 0eabf1c2f03..a05c0cfb2aa 100644
--- a/src/lib/eap_aka_sim/decode.c
+++ b/src/lib/eap_aka_sim/decode.c
@@ -29,9 +29,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/server/module.h>
-#include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/tls/log.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/sha1.h>
 
diff --git a/src/lib/eap_aka_sim/encode.c b/src/lib/eap_aka_sim/encode.c
index d2bc51cba03..79f25e7decc 100644
--- a/src/lib/eap_aka_sim/encode.c
+++ b/src/lib/eap_aka_sim/encode.c
@@ -27,8 +27,8 @@ RCSID("$Id$")
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/tls/log.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/dbuff.h>
+#include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/sha1.h>
 
diff --git a/src/lib/server/connection.c b/src/lib/server/connection.c
index 0bcb8db0f3a..710cbff79aa 100644
--- a/src/lib/server/connection.c
+++ b/src/lib/server/connection.c
@@ -34,9 +34,10 @@ typedef struct fr_connection_s fr_connection_t;
 #include <freeradius-devel/server/trigger.h>
 
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/talloc.h>
+#include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/log.h>
 
 #ifdef HAVE_STDATOMIC_H
 #  include <stdatomic.h>
diff --git a/src/lib/sim/base.c b/src/lib/sim/base.c
index 5f84a88ff97..dd01d51b868 100644
--- a/src/lib/sim/base.c
+++ b/src/lib/sim/base.c
@@ -27,7 +27,6 @@
 
 RCSID("$Id$")
 
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/sha1.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c
index 34aae19dde2..d948592dcb2 100644
--- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast_crypto.c
@@ -28,7 +28,6 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #include <stdio.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/eap/tls.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 8cb9e84c5f3..44cf27d5f17 100644
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool_tool.c
@@ -25,7 +25,6 @@
  * @copyright 2015 The FreeRADIUS server project
  */
 RCSID("$Id$")
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/util/debug.h>
 
diff --git a/src/tests/util/radius1_test.c b/src/tests/util/radius1_test.c
index d145f277e38..b948da80c2d 100644
--- a/src/tests/util/radius1_test.c
+++ b/src/tests/util/radius1_test.c
@@ -27,7 +27,6 @@ RCSID("$Id$")
 #include <freeradius-devel/io/worker.h>
 #include <freeradius-devel/radius/defs.h>
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/inet.h>
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/md5.h>
diff --git a/src/tests/util/radius_schedule_test.c b/src/tests/util/radius_schedule_test.c
index d558580d455..16003621be0 100644
--- a/src/tests/util/radius_schedule_test.c
+++ b/src/tests/util/radius_schedule_test.c
@@ -26,7 +26,6 @@ RCSID("$Id$")
 #include <freeradius-devel/io/schedule.h>
 #include <freeradius-devel/radius/defs.h>
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/util/base.h>
 #include <freeradius-devel/util/inet.h>
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/syserror.h>