Use full paths for headers. This fixes some issues with stale symlinks in package...

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 8cfa5840950fde6567c034a6326a6fbe5f8df835..33c873d3c4d43d5e2a5c8e951c7583a3881a0459 100644 (file)
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -31,16 +31,15 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/cf_file.h>
+#include <freeradius-devel/server/cf_priv.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/util.h>
 
 #include <freeradius-devel/util/cursor.h>
-#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/misc.h>
-
-#include "cf_priv.h"
+#include <freeradius-devel/util/syserror.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c
index 70eec12ee1d8d6cd28a25ba6eeb7f4118e5799d3..c5d59dc6b41af9d3c0e686107504c8b517d9d0be 100644 (file)
--- a/src/lib/server/cf_parse.c
+++ b/src/lib/server/cf_parse.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/cf_file.h>
 #include <freeradius-devel/server/cf_parse.h>
+#include <freeradius-devel/server/cf_priv.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/tmpl.h>
@@ -38,10 +39,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/types.h>
 
-#include "cf_priv.h"
-
-
-
 static CONF_PARSER conf_term = CONF_PARSER_TERMINATOR;
 static char const parse_spaces[] = "                                                                                                                                                                                                                                              ";
 

diff --git a/src/lib/server/cf_util.c b/src/lib/server/cf_util.c
index 330f1426be85b2d09e1782f593fdab0174f16286..e7f3d258cd6f2a9641c53a1dbdfeed9669b9f062 100644 (file)
--- a/src/lib/server/cf_util.c
+++ b/src/lib/server/cf_util.c
@@ -25,13 +25,13 @@ RCSID("$Id$")
 
 #include <string.h>
 
-#include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/cf_file.h>
+#include <freeradius-devel/server/cf_priv.h>
+#include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include <freeradius-devel/util/cursor.h>
 
-#include "cf_priv.h"
+#include <freeradius-devel/util/cursor.h>
 
 static inline int cf_ident2_cmp(void const *a, void const *b);
 static int _cf_ident1_cmp(void const *a, void const *b);

diff --git a/src/lib/server/client.c b/src/lib/server/client.c
index 96c3da1382d2f54908aa8f89754f64cd77abf3c6..e8e11b8df6e52f6783b358b6dae94259e7fdb833 100644 (file)
--- a/src/lib/server/client.c
+++ b/src/lib/server/client.c
@@ -33,8 +33,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/util/misc.h>
 
-
-
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>

diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index 1aa78aad7beea4a4ab41d6fcd8c30295e951538f..6fd7500d6900b5fafa5b075cfaeb022bd258b8d9 100644 (file)
--- a/src/lib/server/cond_tokenize.c
+++ b/src/lib/server/cond_tokenize.c
@@ -29,11 +29,8 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/rad_assert.h>
 
-
-
 #include <ctype.h>
 
-
 static fr_table_num_sorted_t const allowed_return_codes[] = {
        { "fail",       1 },
        { "handled",    1 },

diff --git a/src/lib/server/dl_module.c b/src/lib/server/dl_module.c
index 42bfe66129ccd678b497157bed2aeb4c9d88817c..c73ca30750e6aea2e330b97c213bb9b8b599acef 100644 (file)
--- a/src/lib/server/dl_module.c
+++ b/src/lib/server/dl_module.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-
+#include <freeradius-devel/server/dl_module.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/rad_assert.h>
 
@@ -33,8 +33,6 @@ RCSID("$Id$")
 #include <freeradius-devel/util/dl.h>
 #include <freeradius-devel/util/syserror.h>
 
-#include "dl_module.h"
-
 #include <ctype.h>
 #include <unistd.h>
 

diff --git a/src/lib/server/exfile.c b/src/lib/server/exfile.c
index be97a958d394f1a15df2bfdb5075925ba6005435..8cb48b00beb10c51fbb0d310af21fdf7551914ff 100644 (file)
--- a/src/lib/server/exfile.c
+++ b/src/lib/server/exfile.c
@@ -29,8 +29,6 @@
 
 #include <freeradius-devel/util/misc.h>
 
-
-
 #include <sys/stat.h>
 #include <fcntl.h>
 
@@ -487,7 +485,7 @@ try_lock:
                    (fchmod(ef->entries[i].fd, (st.st_mode & ~S_IFMT) | permissions) < 0)) {
                        rad_mode_to_oct(oct_need, (st.st_mode & ~S_IFMT) | permissions);
                        rad_mode_to_str(str_need, (st.st_mode & ~S_IFMT) | permissions);
-                       
+
                        WARN("Failed resetting file %s permissions to %s (%s): %s",
                             filename, oct_need, str_need, fr_syserror(errno));
                }

diff --git a/src/lib/server/main_loop.c b/src/lib/server/main_loop.c
index 5afe17d88332d9c3be444cf34cb7c11863bc0fc2..70e36c8918e91cd76f1210743c28e028dc5808b4 100644 (file)
--- a/src/lib/server/main_loop.c
+++ b/src/lib/server/main_loop.c
@@ -27,17 +27,16 @@
 
 RCSID("$Id$")
 
-
+#include <freeradius-devel/server/cf_parse.h>
+#include <freeradius-devel/server/main_loop.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/server/trigger.h>
-#include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/util.h>
+
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/syserror.h>
 
-#include "main_loop.h"
-
 #include <signal.h>
 #include <fcntl.h>
 

diff --git a/src/lib/server/map_proc.c b/src/lib/server/map_proc.c
index 0f973eea957abea1e9f01c0ccf6eabf6494febd9..ef2c23a465da08117d38bfe4c71070007930ff44 100644 (file)
--- a/src/lib/server/map_proc.c
+++ b/src/lib/server/map_proc.c
@@ -27,8 +27,8 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
+#include <freeradius-devel/server/map_proc_priv.h>
 #include <freeradius-devel/server/rad_assert.h>
-#include "map_proc_priv.h"
 
 static rbtree_t *map_proc_root = NULL;
 

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index 9f3f59741e4550c76215505f3ee6d379b171534f..25cf521de3c31b99570dbff5dc229108480def86 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -33,14 +33,13 @@ RCSID("$Id$")
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/protocol.h>
+#include <freeradius-devel/server/virtual_servers.h>
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 
 #include <freeradius-devel/unlang/base.h>
 
-#include "virtual_servers.h"
-
 typedef struct {
        char const              *namespace;             //!< Namespace function is registered to.
        fr_virtual_server_compile_t     func;           //!< Function to call to compile sections.

diff --git a/src/lib/server/xlat_builtin.c b/src/lib/server/xlat_builtin.c
index abfa726efd699ce79e6c7ef9af95c50e2fa4fa0d..4ac6680d17517510735152643754f905c9c98c62 100644 (file)
--- a/src/lib/server/xlat_builtin.c
+++ b/src/lib/server/xlat_builtin.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/cond.h>
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/regex.h>
+#include <freeradius-devel/server/xlat_priv.h>
 
 #include <freeradius-devel/util/base64.h>
 #include <freeradius-devel/util/md5.h>
@@ -47,7 +48,6 @@ RCSID("$Id$")
 #endif
 
 #include <ctype.h>
-#include "xlat_priv.h"
 
 static rbtree_t *xlat_root = NULL;
 

diff --git a/src/lib/server/xlat_eval.c b/src/lib/server/xlat_eval.c
index 1d3211603a2492f42bae1a630830b7c15ba09226..aab5bebfada375d1b6d42a6c601fc31dd73d267e 100644 (file)
--- a/src/lib/server/xlat_eval.c
+++ b/src/lib/server/xlat_eval.c
@@ -32,12 +32,12 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/regex.h>
 #include <freeradius-devel/server/request.h>
+#include <freeradius-devel/server/xlat_priv.h>
 
 #include <freeradius-devel/unlang/base.h>
 #include <freeradius-devel/unlang/unlang_priv.h>       /* Remove when everything uses new xlat API */
 
 #include <ctype.h>
-#include "xlat_priv.h"
 
 static bool done_init = false;
 

diff --git a/src/lib/server/xlat_inst.c b/src/lib/server/xlat_inst.c
index 8c7f1c9eb7ef07cef5cbd381e71112f9bd6745b6..478f5024d858842ab0d02370d59523b9a3957d66 100644 (file)
--- a/src/lib/server/xlat_inst.c
+++ b/src/lib/server/xlat_inst.c
@@ -27,12 +27,11 @@ RCSID("$Id$")
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/rad_assert.h>
+#include <freeradius-devel/server/xlat_priv.h>
 #include <freeradius-devel/io/schedule.h>
 
 #include <ctype.h>
 
-#include "xlat_priv.h"
-
 /** Holds instance data created by xlat_instantiate
  */
 static rbtree_t *xlat_inst_tree;

diff --git a/src/lib/server/xlat_tokenize.c b/src/lib/server/xlat_tokenize.c
index 43de6e7affb7bc9339a0e29955a1bc67b1f6e9dd..6ffd67b1dcd65e9e524ea1832fd2523672400f10 100644 (file)
--- a/src/lib/server/xlat_tokenize.c
+++ b/src/lib/server/xlat_tokenize.c
@@ -29,9 +29,9 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/server/regex.h>
+#include <freeradius-devel/server/xlat_priv.h>
 
 #include <ctype.h>
-#include "xlat_priv.h"
 
 #undef XLAT_DEBUG
 #ifdef DEBUG_XLAT

diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c
index 57fc4f41c8d6cf15c9eb784255c8dfdd8318ff24..54aa8c7c35a6e7aaccf8cc4311917be3b3c61a39 100644 (file)
--- a/src/lib/util/debug.c
+++ b/src/lib/util/debug.c
@@ -21,13 +21,12 @@
  * @copyright 2013 The FreeRADIUS server project
  * @copyright 2013 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include "debug.h"
-
+#include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/talloc.h>
-#include <freeradius-devel/util/hash.h>
 
 #include <assert.h>
 #include <limits.h>

diff --git a/src/lib/util/dl.c b/src/lib/util/dl.c
index a6e0a8a22fc054aeeb9befd4ed3a2df7b05118d7..f73172aaea3ba94c23da6afe9e91236aa84c99d5 100644 (file)
--- a/src/lib/util/dl.c
+++ b/src/lib/util/dl.c
@@ -30,6 +30,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/rad_assert.h>
 
 #include <freeradius-devel/util/cursor.h>
+#include <freeradius-devel/util/dl.h>
 #include <freeradius-devel/util/syserror.h>
 
 #include <ctype.h>
@@ -48,7 +49,7 @@ RCSID("$Id$")
 #  define RTLD_LOCAL (0)
 #endif
 
-#include "dl.h"
+
 
 /** Symbol dependent initialisation callback
  *

diff --git a/src/lib/util/dlist.h b/src/lib/util/dlist.h
index 394e6ec8e73be68f5b4ce6ea359dc09689821ad4..02bc32d94ffaf67f088bbe8c90e837504a189a94 100644 (file)
--- a/src/lib/util/dlist.h
+++ b/src/lib/util/dlist.h
@@ -27,9 +27,12 @@ RCSIDH(dlist_h, "$Id$")
 extern "C" {
 #endif
 
+#include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 
+#include <talloc.h>
+
 typedef struct fr_dlist_s fr_dlist_t;
 
 /** Entry in a doubly linked list

diff --git a/src/lib/util/event.c b/src/lib/util/event.c
index e57716ed7ddc2f18965cc5cc1596e3c25ab746d7..6a4af10e53bfcd144515883cfaac082dcc0a77dd 100644 (file)
--- a/src/lib/util/event.c
+++ b/src/lib/util/event.c
@@ -29,8 +29,6 @@
  */
 RCSID("$Id$")
 
-#include "event.h"
-
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/heap.h>
@@ -41,6 +39,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/table.h>
 #include <freeradius-devel/util/time.h>
+#include <freeradius-devel/util/token.h>
 #include <sys/stat.h>
 
 #define FR_EV_BATCH_FDS (256)

diff --git a/src/lib/util/fifo.c b/src/lib/util/fifo.c
index c50a79aa2054ae6e4163cb52a8b342d8dddb36b4..e91aaa82e5a055f82959096cd98d5c94767c4caa 100644 (file)
--- a/src/lib/util/fifo.c
+++ b/src/lib/util/fifo.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 #include <string.h>
 #include <talloc.h>
 
-#include "fifo.h"
+#include <freeradius-devel/util/fifo.h>
 
 struct fr_fifo_t {
        unsigned int    num;            //!< How many elements exist in the fifo.

diff --git a/src/lib/util/fring.c b/src/lib/util/fring.c
index df799415593e9ba2feab54e48c0cfc19f092cc67..9438d77eea3fafc3f2a3bb54cdc90a036fba9154 100644 (file)
--- a/src/lib/util/fring.c
+++ b/src/lib/util/fring.c
@@ -26,7 +26,7 @@
  */
 RCSID("$Id$")
 
-#include "fring.h"
+#include <freeradius-devel/util/fring.h>
 
 #include <pthread.h>
 

diff --git a/src/lib/util/hash.c b/src/lib/util/hash.c
index 35bc9b973883c559b5a4c1ef9d79184ab9c6b5f5..58e74d182cc1cc6df3056c3802f4bf3855167197 100644 (file)
--- a/src/lib/util/hash.c
+++ b/src/lib/util/hash.c
@@ -32,8 +32,7 @@
  */
 RCSID("$Id$")
 
-#include "hash.h"
-
+#include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/talloc.h>
 
 /*

diff --git a/src/lib/util/heap.c b/src/lib/util/heap.c
index 2e9d4c7ba7de131514d2f00e2ecaf8c934031e33..f9af9446cccf2ac2346630218c99767291642436 100644 (file)
--- a/src/lib/util/heap.c
+++ b/src/lib/util/heap.c
@@ -22,8 +22,7 @@
  */
 RCSID("$Id$")
 
-#include "heap.h"
-
+#include <freeradius-devel/util/heap.h>
 #include <freeradius-devel/util/strerror.h>
 
 /*

diff --git a/src/lib/util/inet.c b/src/lib/util/inet.c
index d772924208ae6c6f92631ccae1a76a98e7eee06e..5eef12a46e33901ba9bac52913ce4c4b1fee469a 100644 (file)
--- a/src/lib/util/inet.c
+++ b/src/lib/util/inet.c
@@ -20,8 +20,7 @@
  * @author Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include "inet.h"
-
+#include <freeradius-devel/util/inet.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>

diff --git a/src/lib/util/log.c b/src/lib/util/log.c
index 465a0cffc6cbd906480c99ed336e9add010f6bfd..3fb09bf03bbcc18f297eab73009f877d7bc4028c 100644 (file)
--- a/src/lib/util/log.c
+++ b/src/lib/util/log.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "log.h"
-
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>

diff --git a/src/lib/util/md4.c b/src/lib/util/md4.c
index bfa694efbcf6de617595060b19c78869e247f88b..ad2fb801e7a16bd43ed3c0c329c0ae01b1d05637 100644 (file)
--- a/src/lib/util/md4.c
+++ b/src/lib/util/md4.c
@@ -15,7 +15,7 @@ RCSID("$Id$")
  *  FORCE MD4 TO USE OUR MD4 HEADER FILE!
  *  If we don't do this, it might pick up the systems broken MD4.
  */
-#include "md4.h"
+#include <freeradius-devel/util/md4.h>
 
 fr_thread_local_setup(fr_md4_ctx_t *, md4_ctx)
 

diff --git a/src/lib/util/md5.c b/src/lib/util/md5.c
index 007299800a9c63dca3fb73afec4e0c6a63085536..1879f5d7139ea48d4cfb063663aecc2647a9b54a 100644 (file)
--- a/src/lib/util/md5.c
+++ b/src/lib/util/md5.c
@@ -16,7 +16,7 @@ RCSID("$Id$")
  *  FORCE MD5 TO USE OUR MD5 HEADER FILE!
  *  If we don't do this, it might pick up the systems broken MD5.
  */
-#include "md5.h"
+#include <freeradius-devel/util/md5.h>
 
 fr_thread_local_setup(fr_md5_ctx_t *, md5_ctx)
 

diff --git a/src/lib/util/misc.c b/src/lib/util/misc.c
index 43a8e42a3210f9971bb42135810b4667bcc2de46..11cec1c978d2da52ec725eb8f0907b15b1cb0de3 100644 (file)
--- a/src/lib/util/misc.c
+++ b/src/lib/util/misc.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "misc.h"
-
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/time.h>

diff --git a/src/lib/util/net.c b/src/lib/util/net.c
index d064bcbc5bd4c21a584f0500478fad34a94e927f..b5829f1191e0e854529b0a8e78ba3cd2af770846 100644 (file)
--- a/src/lib/util/net.c
+++ b/src/lib/util/net.c
@@ -20,7 +20,7 @@
  * @author Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2014-2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include "net.h"
+#include <freeradius-devel/util/net.h>
 
 /** Strings for L4 protocols
  *

diff --git a/src/lib/util/packet.c b/src/lib/util/packet.c
index c0762b89c2bb594d089eca12f724b34d3ff59ece..3caec88b5652345ee54e69ced9ee1025e33a3e49 100644 (file)
--- a/src/lib/util/packet.c
+++ b/src/lib/util/packet.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "packet.h"
-
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/talloc.h>
 

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index a58a830cd07701e9a49f7e283ce6f81ab7f46b57..a2222db1611fbb6c835e1e32da0f9bfdbd368f98 100644 (file)
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -22,20 +22,19 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/regex.h>
-#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/proto.h>
-#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/pair_cursor.h>
+#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/print.h>
+#include <freeradius-devel/util/proto.h>
+#include <freeradius-devel/util/regex.h>
+#include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include <ctype.h>
 
-#include "pair.h"
-
 #ifndef NDEBUG
 #  define FREE_MAGIC (0xF4EEF4EE)
 #endif

diff --git a/src/lib/util/pair_cursor.c b/src/lib/util/pair_cursor.c
index 419cd490a43565927067106c661692bc9d15362e..381b0c07dc0cf17568d2e6d724fa272f219e4fb5 100644 (file)
--- a/src/lib/util/pair_cursor.c
+++ b/src/lib/util/pair_cursor.c
@@ -24,9 +24,8 @@
  * @copyright 2013-2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2013-2015 The FreeRADIUS Server Project.
  */
-#include "pair_cursor.h"
-
 #include <freeradius-devel/missing.h>
+#include <freeradius-devel/util/pair_cursor.h>
 
 /** Internal function to update cursor state
  *

diff --git a/src/lib/util/pcap.c b/src/lib/util/pcap.c
index 2a4c7f2aad6048fcb6836a34fd85799d962e02ca..c43ae6204dea2f482d3fe3301dc4dc0026ba6aa1 100644 (file)
--- a/src/lib/util/pcap.c
+++ b/src/lib/util/pcap.c
@@ -22,10 +22,9 @@
  */
 #ifdef HAVE_LIBPCAP
 
-#include "pcap.h"
-
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/net.h>
+#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pcap.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/talloc.h>

diff --git a/src/lib/util/print.c b/src/lib/util/print.c
index f4df844816c607c4b1099aa682c7922368569d7e..dcd15f8f435e821be63140e7b91bd1530e41dd90 100644 (file)
--- a/src/lib/util/print.c
+++ b/src/lib/util/print.c
@@ -22,11 +22,10 @@
  */
 RCSID("$Id$")
 
-#include "print.h"
-
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/talloc.h>
 

diff --git a/src/lib/util/rand.c b/src/lib/util/rand.c
index 40b890d941843db768a31101dbb107f45405bb18..7d099a436d6a48906d5e57837fbf020bfd440a1a 100644 (file)
--- a/src/lib/util/rand.c
+++ b/src/lib/util/rand.c
@@ -22,8 +22,7 @@
  */
 RCSID("$Id$")
 
-#include "rand.h"
-
+#include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/hash.h>
 
 #include <errno.h>

diff --git a/src/lib/util/rbtree.c b/src/lib/util/rbtree.c
index 573a96027a9f979e665b75535de6a574a1636db3..1be854f558baef7177379d94f72ac8cd28042c16 100644 (file)
--- a/src/lib/util/rbtree.c
+++ b/src/lib/util/rbtree.c
@@ -22,9 +22,8 @@
  */
 RCSID("$Id$")
 
-#include "rbtree.h"
-
 #include <freeradius-devel/util/log.h>
+#include <freeradius-devel/util/rbtree.h>
 #include <freeradius-devel/util/strerror.h>
 
 #include <pthread.h>

diff --git a/src/lib/util/regex.c b/src/lib/util/regex.c
index 170c3712857a571dfcd5aeb1313d150c3de54fc3..fb93c224c89ac4c47ba7fd59494b80b5b4753d9e 100644 (file)
--- a/src/lib/util/regex.c
+++ b/src/lib/util/regex.c
@@ -24,9 +24,10 @@
 RCSID("$Id$")
 
 #ifdef HAVE_REGEX
-#include "regex.h"
 
+#include <freeradius-devel/util/regex.h>
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/thread_local.h>
 #include <freeradius-devel/util/table.h>
 #include <freeradius-devel/util/talloc.h>

diff --git a/src/lib/util/sha1.c b/src/lib/util/sha1.c
index 7910eb537b7d65e6cc4642026e01b1080ffbb835..141f248b11ab4b635ce76fd6049e080c11522ab3 100644 (file)
--- a/src/lib/util/sha1.c
+++ b/src/lib/util/sha1.c
@@ -8,7 +8,7 @@
  */
 RCSID("$Id$")
 
-#include "sha1.h"
+#include <freeradius-devel/util/sha1.h>
 
 #include <arpa/inet.h>
 

diff --git a/src/lib/util/snprintf.c b/src/lib/util/snprintf.c
index ceee19161f7e5520e3f5a92a1e39e96fabf7e2e1..935636998a5f660b041ffeaf5899f729814bbecd 100644 (file)
--- a/src/lib/util/snprintf.c
+++ b/src/lib/util/snprintf.c
@@ -54,7 +54,7 @@
 
 RCSID("$Id$")
 
-#include "snprintf.h"
+#include <freeradius-devel/util/snprintf.h>
 
 #ifndef HAVE_VSNPRINTF
 

diff --git a/src/lib/util/socket.c b/src/lib/util/socket.c
index 207aaece90430308bb08179bfc234d29cf9ce7a3..3bd20dceef4e2588fc5849b134b14c6059f3c68f 100644 (file)
--- a/src/lib/util/socket.c
+++ b/src/lib/util/socket.c
@@ -23,10 +23,10 @@
  *
  * @copyright 2015 The FreeRADIUS project
  */
-#include "socket.h"
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/socket.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/udpfromto.h>

diff --git a/src/lib/util/strerror.c b/src/lib/util/strerror.c
index 86ca75f526cf93bb128f79b6c01898161198c7f2..d71d355ef5b29078bce73dfe30d180cd8daa5f9e 100644 (file)
--- a/src/lib/util/strerror.c
+++ b/src/lib/util/strerror.c
@@ -23,10 +23,9 @@
  */
 RCSID("$Id$")
 
-#include "strerror.h"
-
 #include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/print.h>
+#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/thread_local.h>
 
 #include <stdbool.h>

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index 23af3540f37c501242f74e5aef66ffb68ca32b4f..c40888fa2be9410ac1247ad21505126ce6ff50cc 100644 (file)
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#include "struct.h"
+#include <freeradius-devel/util/struct.h>
 
 VALUE_PAIR *fr_unknown_from_network(TALLOC_CTX *ctx, fr_dict_attr_t const *parent, uint8_t const *data, size_t data_len)
 {

diff --git a/src/lib/util/syserror.c b/src/lib/util/syserror.c
index 667818b829661e7812c3f20ad679eb556a80abc5..2407dab197da63a53436c3a991dab873951c31c6 100644 (file)
--- a/src/lib/util/syserror.c
+++ b/src/lib/util/syserror.c
@@ -23,10 +23,9 @@
  */
 RCSID("$Id$")
 
-#include "syserror.h"
-
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/thread_local.h>
 
 #include <errno.h>

diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c
index cad985854b25c3f531cee4c5f83ff8da215f6c63..c7ae2ecb66be665dca4b6b28ff43e86bf89cd7ab 100644 (file)
--- a/src/lib/util/talloc.c
+++ b/src/lib/util/talloc.c
@@ -23,10 +23,9 @@
  */
 RCSID("$Id$")
 
-#include "talloc.h"
-
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/talloc.h>
 
 #include <string.h>
 #include <unistd.h>

diff --git a/src/lib/util/token.c b/src/lib/util/token.c
index a57d70ba627c3a96dfcf45c441ba90f0a142a5ef..94129a5c517913b6a9859713405cad671e0cfdd3 100644 (file)
--- a/src/lib/util/token.c
+++ b/src/lib/util/token.c
@@ -24,10 +24,9 @@
  */
 RCSID("$Id$")
 
-#include "token.h"
-
-#include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/misc.h>
+#include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/token.h>
 
 #include <ctype.h>
 #include <stdio.h>

diff --git a/src/lib/util/udp.c b/src/lib/util/udp.c
index fd416877f3b6703f7cf4ab014f60dcd197be03c7..bc3215f88f2876c6aa0f48f35ed71c677f6fc4b0 100644 (file)
--- a/src/lib/util/udp.c
+++ b/src/lib/util/udp.c
@@ -22,11 +22,10 @@
  */
 RCSID("$Id$")
 
-#include "udp.h"
-
 #include <freeradius-devel/util/log.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/udp.h>
 
 /*
  *     This is easier than ifdef's in the function definition.

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index c1fbd251d5385f19f99b1783fbb28b416e450fda..a3e56b4fe56b491560463060cd01848916f0bc0e 100644 (file)
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -44,13 +44,12 @@
  */
 RCSID("$Id$")
 
-#include "value.h"
-
 #include <freeradius-devel/util/ascend.h>
 #include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/talloc.h>
+#include <freeradius-devel/util/value.h>
 
 #include <assert.h>
 #include <ctype.h>

diff --git a/src/lib/util/version.c b/src/lib/util/version.c
index d6de092ae11f54a5975249cd029c29f2f822d0f7..de20dff3eb1b88cc1c270dcdc4b76ab3775e61bf 100644 (file)
--- a/src/lib/util/version.c
+++ b/src/lib/util/version.c
@@ -23,9 +23,8 @@
  */
 RCSID("$Id$")
 
-#include "version.h"
-
 #include <freeradius-devel/util/strerror.h>
+#include <freeradius-devel/util/version.h>
 
 static uint64_t libmagic = RADIUSD_MAGIC_NUMBER;