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

diff --git a/src/bin/dhcpclient.c b/src/bin/dhcpclient.c
index 2360d6f88fafb9e485563b92a3b5592354cbdebb..bec2348a1af641ea617ee101727476c83d91fb46 100644 (file)
--- 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 7171e465cec6ec5e76ee991ce7bef881ca607817..8125b7cf879f4e100aa80923b1261bbd7e8c75d3 100644 (file)
--- 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 e6c3a092f7638077c07d6e8d4d2e4d5e310e45db..aba5cae0ce4a164faa7b01df34c61dbfb2dc50cf 100644 (file)
--- 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 3e198f44866e634f2d8ef51774df9fe1ace69549..a0b372f2141b10daf60ae7eeb49005e61694503e 100644 (file)
--- 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 28b8c8e47f5ea6ae89b127cda199e102609e1631..6380d0096922e50e1c5af8342ee8bf60541de6d0 100644 (file)
--- 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 aeba308320948cf6c254e7af4f8b19a30faabbc1..6e21f121c6c2823638ea5d29e899e17b6a9cb893 100644 (file)
--- 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 4c827c87b7dcdbb91f941653e3cac3509967ed9d..ed39b3f7e0c98ac174d4211edc536831298483dc 100644 (file)
--- 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 b661721850d95b99ca154ab971cf11927f678164..2857bcc2a2fea9290704bc4954602963afaee993 100644 (file)
--- 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 31525fa42dc05985d4a72d055eb4845b89c1850f..6e8b7e5d11d360ed19a807c68eb4379ea8aa86c9 100644 (file)
--- 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 90e795f122c0d48991ebb5245d26076de918ab4b..887068ca75340216dfe97099df8fb8cee9cf7b87 100644 (file)
--- 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 a0f5079efc3c6c809cef426536b39aa97560ab99..0580220e2917c5e841626b1ef5ec7bb2ceec615c 100644 (file)
--- 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 0eabf1c2f03197c639f113036e526cf03615d32f..a05c0cfb2aabf7c950523af9067bf85e67009213 100644 (file)
--- 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 d2bc51cba03207cc0bd71bfe1aab305e1fd51006..79f25e7decc90bafd2983dcd1b0cd11fc2d25fbf 100644 (file)
--- 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 0bcb8db0f3a3e1759fba4f4d452c203113295a5c..710cbff79aa625865177e4b9945576e87152da9c 100644 (file)
--- 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 5f84a88ff9724ac0d57d34e1869aaadcfa207fdf..dd01d51b8680073c6189f1a96949036fe61ce89a 100644 (file)
--- 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 34aae19dde2fe614169965f7a58064cd0bb35655..d948592dcb2b8f002803d309ccbc61b2bc77ff06 100644 (file)
--- 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 8cb9e84c5f3b4ddbbd9502e6217db736d8f81d9d..44cf27d5f17033c3f70d3d0b49296515b8665134 100644 (file)
--- 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 d145f277e38a4cdeaef1a043d679dce23754bcdc..b948da80c2d525728f82a8607e86054f19eca15e 100644 (file)
--- 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 d558580d45570a5904fcda883de48642c43db6f8..16003621be0e094186f3fe297e0afa3a70baed6b 100644 (file)
--- 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>