From: Arran Cudbard-Bell Date: Mon, 12 Dec 2022 04:11:09 +0000 (-0600) Subject: Re-arrange some includes X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0e47736cae956c31b1153cc1c8c71f3420aca38;p=thirdparty%2Ffreeradius-server.git Re-arrange some includes --- diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c index b35569d6c42..60f1ba8ad65 100644 --- a/src/bin/unit_test_map.c +++ b/src/bin/unit_test_map.c @@ -22,12 +22,12 @@ RCSID("$Id$") - #include -#include -#include +#include #include #include +#include +#include #include diff --git a/src/lib/server/client.c b/src/lib/server/client.c index 98b22922727..7576f56b474 100644 --- a/src/lib/server/client.c +++ b/src/lib/server/client.c @@ -30,6 +30,7 @@ RCSID("$Id$") #include #include #include +#include #include #include #include diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c index 82933957060..15818870fe3 100644 --- a/src/lib/server/paircmp.c +++ b/src/lib/server/paircmp.c @@ -30,9 +30,10 @@ RCSID("$Id$") #include -#include #include #include +#include +#include #include #include diff --git a/src/lib/server/request.h b/src/lib/server/request.h index 8461a0923c0..9db498072a6 100644 --- a/src/lib/server/request.h +++ b/src/lib/server/request.h @@ -43,7 +43,6 @@ typedef struct rad_client RADCLIENT; #endif #include -#include #include #include #include diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h index b41e67ae416..cb5377e133c 100644 --- a/src/lib/server/tmpl.h +++ b/src/lib/server/tmpl.h @@ -255,6 +255,7 @@ typedef struct tmpl_res_rules_s tmpl_res_rules_t; typedef struct tmpl_s tmpl_t; #include +#include #include #include #include diff --git a/src/lib/unlang/condition.c b/src/lib/unlang/condition.c index b792c18c28c..0b4a4218aa5 100644 --- a/src/lib/unlang/condition.c +++ b/src/lib/unlang/condition.c @@ -24,6 +24,8 @@ */ RCSID("$Id$") +#include + #include "condition_priv.h" #include "group_priv.h" diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c index 7094a5129e1..82f09b07489 100644 --- a/src/lib/unlang/edit.c +++ b/src/lib/unlang/edit.c @@ -1236,7 +1236,7 @@ static int expanded_lhs_attribute(request_t *request, unlang_frame_state_edit_t * foo := bar LHS foo * foo = { bar = baz } LHS bar * foo = { 1, 2, 3, 4 } LHS 1, 2, etc. - * + * */ static int expand_lhs(request_t *request, unlang_frame_state_edit_t *state, edit_map_t *current) { diff --git a/src/lib/unlang/interpret.h b/src/lib/unlang/interpret.h index 17f3849ff33..cf2be144fb7 100644 --- a/src/lib/unlang/interpret.h +++ b/src/lib/unlang/interpret.h @@ -28,6 +28,7 @@ extern "C" { #endif +#include #include #include diff --git a/src/lib/unlang/xlat.h b/src/lib/unlang/xlat.h index abd34c1ce2b..1465ef04718 100644 --- a/src/lib/unlang/xlat.h +++ b/src/lib/unlang/xlat.h @@ -51,9 +51,13 @@ typedef enum { typedef struct xlat_inst xlat_inst_t; typedef struct xlat_thread_inst xlat_thread_inst_t; -#include #include + +typedef size_t (*xlat_escape_legacy_t)(request_t *request, char *out, size_t outlen, char const *in, void *arg); + +#include #include +#include #include #include @@ -265,8 +269,6 @@ typedef int (*xlat_detach_t)(xlat_inst_ctx_t const *xctx); */ typedef int (*xlat_thread_detach_t)(xlat_thread_inst_ctx_t const *xctx); -typedef size_t (*xlat_escape_legacy_t)(request_t *request, char *out, size_t outlen, char const *in, void *arg); - /** Set the next argument to the next item in the input list or NULL * * @param[in] _list we're extracting arguments from. diff --git a/src/lib/unlang/xlat_priv.h b/src/lib/unlang/xlat_priv.h index fd5b70eb65e..f55c08aa85b 100644 --- a/src/lib/unlang/xlat_priv.h +++ b/src/lib/unlang/xlat_priv.h @@ -30,6 +30,8 @@ extern "C" { #endif +#include +#include #include #ifdef DEBUG_XLAT diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c index d8dd0478308..69fabd8ae34 100644 --- a/src/lib/unlang/xlat_tokenize.c +++ b/src/lib/unlang/xlat_tokenize.c @@ -29,7 +29,6 @@ RCSID("$Id$") #include #include -#include #include #include diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c index 1d9ce7ffbd4..058493eb87f 100644 --- a/src/listen/vmps/proto_vmps.c +++ b/src/listen/vmps/proto_vmps.c @@ -23,11 +23,10 @@ * @copyright 2016 Alan DeKok (aland@freeradius.org) */ #include +#include #include #include -#include - #include "proto_vmps.h" extern fr_app_t proto_vmps; diff --git a/src/process/radius/base.c b/src/process/radius/base.c index e63cece6ccd..5e2383f15d0 100644 --- a/src/process/radius/base.c +++ b/src/process/radius/base.c @@ -23,15 +23,18 @@ * @copyright 2021 Network RADIUS SARL (legal@networkradius.com) */ #include + #include +#include #include -#include #include #include +#include + +#include #include -#include static fr_dict_t const *dict_freeradius; static fr_dict_t const *dict_radius; diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c index 20fdf2e2e2d..15717e22a53 100644 --- a/src/process/tacacs/base.c +++ b/src/process/tacacs/base.c @@ -24,15 +24,16 @@ * @copyright 2020 Network RADIUS SARL (legal@networkradius.com) */ + #include #include +#include #include #include +#include #include #include -#include - static fr_dict_t const *dict_freeradius; static fr_dict_t const *dict_tacacs; diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c index 69dfedf7356..febed435d45 100644 --- a/src/process/ttls/base.c +++ b/src/process/ttls/base.c @@ -23,15 +23,18 @@ * @copyright 2021 Network RADIUS SARL (legal@networkradius.com) */ #include + #include +#include #include -#include #include #include +#include + +#include #include -#include static fr_dict_t const *dict_freeradius; static fr_dict_t const *dict_radius; diff --git a/src/protocols/vmps/vmps.c b/src/protocols/vmps/vmps.c index c557a253e6c..076dd06ca4b 100644 --- a/src/protocols/vmps/vmps.c +++ b/src/protocols/vmps/vmps.c @@ -25,10 +25,11 @@ RCSID("$Id$") +#include +#include #include +#include #include -#include -#include #include "vmps.h" #include "attrs.h" diff --git a/src/tests/unit/xlat/cond_base.txt b/src/tests/unit/xlat/cond_base.txt index 78d4397885a..839c711d853 100644 --- a/src/tests/unit/xlat/cond_base.txt +++ b/src/tests/unit/xlat/cond_base.txt @@ -239,7 +239,7 @@ match (&Session-Timeout == '10') # @todo - yuck. Suppress full path? # xlat_purify &Event-Timestamp == "January 1, 2012 %{User-Name}" -match (&Event-Timestamp == %(cast:string "January 1, 2012 %{Request[0].User-Name}")) +match (&Event-Timestamp == %(cast:string "January 1, 2012 %{request[0].User-Name}")) # This one is NOT an expansion, so it's parsed into normal form xlat_purify &Event-Timestamp == 'January 1 2012' @@ -278,7 +278,7 @@ match NULL # @todo - yuck, don't print full path? xlat_purify 127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{User-Name}'} -match (127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{Request[0].User-Name}'}) +match (127.0.0.1 == %{md4: SELECT user FROM table WHERE user='%{request[0].User-Name}'}) xlat_purify 00:11:22:33:44:55 == "00:11:22:33:44:55" match true @@ -522,7 +522,7 @@ match (&User-Name[n] == "bob") #match &Foo-Bar xlat_purify &Acct-Input-Octets > "%{Session-Timeout}" -match (&Acct-Input-Octets > %(cast:string "%{Request[0].Session-Timeout}")) +match (&Acct-Input-Octets > %(cast:string "%{request[0].Session-Timeout}")) xlat_purify &Acct-Input-Octets > &Session-Timeout match (&Acct-Input-Octets > &Session-Timeout)