From 2f67f7094b6ef3f47c75ad231c063bcedb34e3aa Mon Sep 17 00:00:00 2001 From: aland Date: Thu, 5 Apr 2007 10:52:14 +0000 Subject: [PATCH 1/1] Massively cleaned up #include's, so they're in a consistent form. Most modules now need to include only radiusd.h && modules.h Some of the EAP modules still need to be checked --- src/include/libradius.h | 16 +------------ src/include/missing.h | 21 ++++++++++++++++ src/include/radiusd.h | 5 ---- src/include/udpfromto.h | 5 +++- src/lib/dict.c | 9 +------ src/lib/event.c | 6 ----- src/lib/fifo.c | 6 ----- src/lib/filters.c | 12 +--------- src/lib/getaddrinfo.c | 14 ++--------- src/lib/hash.c | 7 +----- src/lib/hmac.c | 6 +---- src/lib/hmacsha1.c | 12 +--------- src/lib/isaac.c | 2 -- src/lib/log.c | 7 ------ src/lib/md5.c | 2 -- src/lib/misc.c | 15 +----------- src/lib/missing.c | 13 ++-------- src/lib/packet.c | 5 ---- src/lib/print.c | 9 +------ src/lib/radius.c | 16 +------------ src/lib/rbtree.c | 6 ----- src/lib/strlcat.c | 2 -- src/lib/strlcpy.c | 1 - src/lib/token.c | 7 +++--- src/lib/udpfromto.c | 9 +------ src/lib/valuepair.c | 10 +------- src/main/acct.c | 1 - src/main/auth.c | 12 ++-------- src/main/client.c | 13 ++-------- src/main/conffile.c | 14 ++--------- src/main/crypt.c | 7 +----- src/main/event.c | 14 +++++------ src/main/exec.c | 12 ++-------- src/main/files.c | 13 ++-------- src/main/listen.c | 28 +++------------------- src/main/log.c | 8 ------- src/main/mainconfig.c | 16 +------------ src/main/modcall.c | 6 +---- src/main/modules.c | 6 ----- src/main/radclient.c | 22 +++-------------- src/main/radius_snmp.c | 9 +------ src/main/radiusd.c | 23 +++--------------- src/main/radsniff.c | 11 ++------- src/main/radwho.c | 10 +++----- src/main/realms.c | 9 ++----- src/main/session.c | 19 ++------------- src/main/smux.c | 18 ++++---------- src/main/threads.c | 10 ++------ src/main/util.c | 17 ++----------- src/main/valuepair.c | 12 +--------- src/main/version.c | 4 ---- src/main/xlat.c | 10 ++------ src/modules/rlm_acct_unique/rlm_acct_unique.c | 9 ++----- src/modules/rlm_acctlog/rlm_acctlog.c | 6 ----- src/modules/rlm_always/rlm_always.c | 6 ----- src/modules/rlm_attr_filter/rlm_attr_filter.c | 10 +++----- src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c | 9 ++----- src/modules/rlm_caching/rlm_caching.c | 11 +++------ src/modules/rlm_chap/rlm_chap.c | 6 ----- src/modules/rlm_checkval/rlm_checkval.c | 7 +----- src/modules/rlm_copy_packet/rlm_copy_packet.c | 6 ----- src/modules/rlm_counter/rlm_counter.c | 10 +++----- src/modules/rlm_cram/rlm_cram.c | 9 ++----- src/modules/rlm_dbm/rlm_dbm.c | 9 ++----- src/modules/rlm_dbm/rlm_dbm_cat.c | 6 +---- src/modules/rlm_dbm/rlm_dbm_parser.c | 9 +------ src/modules/rlm_detail/rlm_detail.c | 12 +++------- src/modules/rlm_digest/rlm_digest.c | 6 ----- src/modules/rlm_eap/eap.h | 14 ----------- src/modules/rlm_eap/radeapclient.c | 21 +--------------- src/modules/rlm_eap/rlm_eap.c | 5 ++-- src/modules/rlm_example/rlm_example.c | 5 ---- src/modules/rlm_exec/rlm_exec.c | 6 ----- src/modules/rlm_expiration/rlm_expiration.c | 9 ++----- src/modules/rlm_expr/paircmp.c | 7 ------ src/modules/rlm_expr/rlm_expr.c | 6 ----- src/modules/rlm_fastusers/rlm_fastusers.c | 11 ++------- src/modules/rlm_files/rlm_files.c | 11 ++------- src/modules/rlm_ippool/rlm_ippool.c | 28 +++------------------- src/modules/rlm_ippool/rlm_ippool_tool.c | 12 +--------- src/modules/rlm_krb5/rlm_krb5.c | 6 ----- src/modules/rlm_ldap/rlm_ldap.c | 27 +++++---------------- src/modules/rlm_linelog/rlm_linelog.c | 14 ++--------- src/modules/rlm_logintime/rlm_logintime.c | 9 ++----- src/modules/rlm_logintime/timestr.c | 7 +----- src/modules/rlm_mschap/rlm_mschap.c | 12 +++------- src/modules/rlm_mschap/smbencrypt.c | 7 ++---- src/modules/rlm_otp/otp_pw_valid.c | 9 ++----- src/modules/rlm_otp/otp_pwe.c | 3 +-- src/modules/rlm_otp/otp_rlm.c | 8 ------- src/modules/rlm_pam/rlm_pam.c | 10 ++------ src/modules/rlm_pap/rlm_pap.c | 9 ++----- src/modules/rlm_passwd/rlm_passwd.c | 5 ---- src/modules/rlm_perl/rlm_perl.c | 6 ----- src/modules/rlm_policy/rlm_policy.c | 6 ++--- src/modules/rlm_policy/rlm_policy.h | 10 -------- src/modules/rlm_preprocess/rlm_preprocess.c | 11 ++------- .../rlm_protocol_filter/rlm_protocol_filter.c | 5 ---- src/modules/rlm_python/rlm_python.c | 10 ++------ src/modules/rlm_radutmp/rlm_radutmp.c | 17 ++++--------- src/modules/rlm_radutmp/rlm_radutmp2.c | 17 ++++--------- src/modules/rlm_realm/rlm_realm.c | 14 ----------- src/modules/rlm_sim_files/rlm_sim_files.c | 9 ++----- src/modules/rlm_smb/rfcnb-util.c | 1 - src/modules/rlm_smb/rlm_smb.c | 6 ----- src/modules/rlm_smb/valid.c | 4 ++-- src/modules/rlm_sql/drivers/rlm_sql_db2/sql_db2.c | 6 +---- .../rlm_sql/drivers/rlm_sql_iodbc/sql_iodbc.c | 6 +---- .../rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c | 9 +++---- .../rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c | 8 +------ .../drivers/rlm_sql_postgresql/sql_postgresql.c | 7 +----- .../rlm_sql/drivers/rlm_sql_sybase/sql_sybase.c | 7 +----- .../drivers/rlm_sql_unixodbc/sql_unixodbc.c | 4 ---- src/modules/rlm_sql/rlm_sql.c | 17 +++---------- src/modules/rlm_sql/sql.c | 14 +---------- src/modules/rlm_sql_log/rlm_sql_log.c | 9 ++----- src/modules/rlm_sqlcounter/rlm_sqlcounter.c | 9 ++----- src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c | 15 +++--------- src/modules/rlm_sqlippool/rlm_sqlippool.c | 5 +--- src/modules/rlm_unix/rlm_unix.c | 6 +---- 120 files changed, 193 insertions(+), 984 deletions(-) diff --git a/src/include/libradius.h b/src/include/libradius.h index 0514eea..a363b64 100644 --- a/src/include/libradius.h +++ b/src/include/libradius.h @@ -34,23 +34,9 @@ RCSIDH(libradius_h, "$Id$") #endif #include +#include #include -/* - * Check for inclusion of , versus - * Taken verbatim from the autoconf manual. - */ -#if TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - #include #include #include diff --git a/src/include/missing.h b/src/include/missing.h index deadc5c..d3389bc 100644 --- a/src/include/missing.h +++ b/src/include/missing.h @@ -12,6 +12,8 @@ #include RCSIDH(missing_h, "$Id$") +#include + #ifdef HAVE_STDINT_H #include #endif @@ -32,6 +34,10 @@ RCSIDH(missing_h, "$Id$") #include #endif +#ifdef HAVE_NETDB_H +#include +#endif + #ifdef HAVE_NETINET_IN_H #include #endif @@ -49,6 +55,21 @@ RCSIDH(missing_h, "$Id$") #endif /* + * Check for inclusion of , versus + * Taken verbatim from the autoconf manual. + */ +#if TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + +/* * Functions from missing.c */ diff --git a/src/include/radiusd.h b/src/include/radiusd.h index ba14bfa..0800a6e 100644 --- a/src/include/radiusd.h +++ b/src/include/radiusd.h @@ -17,11 +17,6 @@ RCSIDH(radiusd_h, "$Id$") #include #include - -#ifdef HAVE_UNISTD_H -#include -#endif - #ifdef HAVE_PTHREAD_H #include typedef pthread_t child_pid_t; diff --git a/src/include/udpfromto.h b/src/include/udpfromto.h index b93c8a3..1c37048 100644 --- a/src/include/udpfromto.h +++ b/src/include/udpfromto.h @@ -8,8 +8,10 @@ #include RCSIDH(udpfromtoh, "$Id$") -#include +#include +#include +#ifdef WITH_UDPFROMTO int udpfromto_init(int s); int recvfromto(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen, @@ -17,5 +19,6 @@ int recvfromto(int s, void *buf, size_t len, int flags, int sendfromto(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t fromlen, struct sockaddr *to, socklen_t tolen); +#endif #endif diff --git a/src/lib/dict.c b/src/lib/dict.c index d04b0d0..b72f2cb 100644 --- a/src/lib/dict.c +++ b/src/lib/dict.c @@ -23,11 +23,9 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include #ifdef HAVE_MALLOC_H #include @@ -37,11 +35,6 @@ RCSID("$Id$") #include #endif -#include - -#include -#include - #define DICT_VALUE_MAX_NAME_LEN (128) #define DICT_VENDOR_MAX_NAME_LEN (128) diff --git a/src/lib/event.c b/src/lib/event.c index 11d9784..349cdb9 100644 --- a/src/lib/event.c +++ b/src/lib/event.c @@ -25,12 +25,6 @@ #include RCSID("$Id$") -#include - -#include -#include - -#include #include #include diff --git a/src/lib/fifo.c b/src/lib/fifo.c index f03f667..aa07a58 100644 --- a/src/lib/fifo.c +++ b/src/lib/fifo.c @@ -25,12 +25,6 @@ #include RCSID("$Id$") -#include - -#include -#include - -#include #include typedef struct lrad_fifo_entry_t { diff --git a/src/lib/filters.c b/src/lib/filters.c index 4ce2f48..d107e0d 100644 --- a/src/lib/filters.c +++ b/src/lib/filters.c @@ -23,19 +23,9 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include - - -#ifdef HAVE_NETINET_IN_H -#include -#endif - -#include -#include /* * Two types of filters are supported, GENERIC and IP. The identifiers diff --git a/src/lib/getaddrinfo.c b/src/lib/getaddrinfo.c index 0ad79de..e8d25f9 100644 --- a/src/lib/getaddrinfo.c +++ b/src/lib/getaddrinfo.c @@ -10,21 +10,11 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + #include #include -#include - #ifdef HAVE_PTHREAD_H #include diff --git a/src/lib/hash.c b/src/lib/hash.c index 381c675..909571f 100644 --- a/src/lib/hash.c +++ b/src/lib/hash.c @@ -33,12 +33,7 @@ #include RCSID("$Id$") -#include - -#include -#include - -#include +#include #include /* diff --git a/src/lib/hmac.c b/src/lib/hmac.c index 787b907..d649f1a 100644 --- a/src/lib/hmac.c +++ b/src/lib/hmac.c @@ -28,12 +28,8 @@ #include RCSID("$Id$") -#include - -#include -#include -#include #include +#include /* unsigned char* text; pointer to data stream diff --git a/src/lib/hmacsha1.c b/src/lib/hmacsha1.c index 639b980..c80d366 100644 --- a/src/lib/hmacsha1.c +++ b/src/lib/hmacsha1.c @@ -11,19 +11,9 @@ #include RCSID("$Id$") -#include - -#include -#include - -#ifdef HAVE_STDINT_H -#include -#endif - +#include #include -#include -#include /* uint8_t* text; pointer to data stream diff --git a/src/lib/isaac.c b/src/lib/isaac.c index 56ef22f..ac92135 100644 --- a/src/lib/isaac.c +++ b/src/lib/isaac.c @@ -13,8 +13,6 @@ MODIFIED: #include RCSID("$Id$") -#include -#include #include #define RANDSIZL (8) /* I recommend 8 for crypto, 4 for simulations */ diff --git a/src/lib/log.c b/src/lib/log.c index ffdb666..089220b 100644 --- a/src/lib/log.c +++ b/src/lib/log.c @@ -24,13 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - -#include #include char librad_errstr[1024]; diff --git a/src/lib/md5.c b/src/lib/md5.c index 43043c4..eae4c70 100644 --- a/src/lib/md5.c +++ b/src/lib/md5.c @@ -10,8 +10,6 @@ #include RCSID("$Id$") -#include -#include #include /* diff --git a/src/lib/misc.c b/src/lib/misc.c index 8864fa0..575eef3 100644 --- a/src/lib/misc.c +++ b/src/lib/misc.c @@ -23,24 +23,11 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include -#include +#include -#include -#include -#include #include #include #include -#include - -#include -#include int librad_dodns = 0; int librad_debug = 0; diff --git a/src/lib/missing.c b/src/lib/missing.c index b07f35b..42f9fbd 100644 --- a/src/lib/missing.c +++ b/src/lib/missing.c @@ -24,19 +24,10 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include -#include -#include -#include - -#include #include +#include + #ifndef HAVE_CRYPT char *crypt(char *key, char *salt) { diff --git a/src/lib/packet.c b/src/lib/packet.c index 105c45c..95f5a8e 100644 --- a/src/lib/packet.c +++ b/src/lib/packet.c @@ -23,13 +23,8 @@ #include RCSID("$Id$") -#include -#include #include -#include -#include - /* * Take the key fields of a request packet, and convert it to a * hash. diff --git a/src/lib/print.c b/src/lib/print.c index be6e39e..7d9085c 100644 --- a/src/lib/print.c +++ b/src/lib/print.c @@ -23,16 +23,9 @@ #include RCSID("$Id$") -#include +#include -#include -#include -#include #include -#include - -#include -#include /* * Convert a string to something printable. diff --git a/src/lib/radius.c b/src/lib/radius.c index e85c3ad..2030f24 100644 --- a/src/lib/radius.c +++ b/src/lib/radius.c @@ -23,15 +23,9 @@ #include RCSID("$Id$") -#include +#include #include -#include - -#ifdef HAVE_UNISTD_H -#include -#endif - #include #include @@ -39,18 +33,10 @@ RCSID("$Id$") #include #endif - #ifdef HAVE_MALLOC_H #include #endif -#ifdef WIN32 -#include -#endif - -#include -#include - /* * The RFC says 4096 octets max, and most packets are less than 256. */ diff --git a/src/lib/rbtree.c b/src/lib/rbtree.c index 4ece7ac..f656b9a 100644 --- a/src/lib/rbtree.c +++ b/src/lib/rbtree.c @@ -23,12 +23,6 @@ #include RCSID("$Id$") -#include - -#include -#include - -#include #include /* red-black tree description */ diff --git a/src/lib/strlcat.c b/src/lib/strlcat.c index 56bfae4..563a14c 100644 --- a/src/lib/strlcat.c +++ b/src/lib/strlcat.c @@ -30,8 +30,6 @@ RCSID("$Id$") #ifndef HAVE_STRLCAT -#include -#include #include /* diff --git a/src/lib/strlcpy.c b/src/lib/strlcpy.c index c507e47..549f138 100644 --- a/src/lib/strlcpy.c +++ b/src/lib/strlcpy.c @@ -30,7 +30,6 @@ RCSID("$Id$") #ifndef HAVE_STRLCPY -#include #include /* diff --git a/src/lib/token.c b/src/lib/token.c index 6191471..52cad85 100644 --- a/src/lib/token.c +++ b/src/lib/token.c @@ -24,12 +24,11 @@ #include RCSID("$Id$") -#include -#include -#include -#include +#include #include +#include + static const LRAD_NAME_NUMBER tokens[] = { { "=~", T_OP_REG_EQ, }, /* order is important! */ { "!~", T_OP_REG_NE, }, diff --git a/src/lib/udpfromto.c b/src/lib/udpfromto.c index bad2c34..e4535fc 100644 --- a/src/lib/udpfromto.c +++ b/src/lib/udpfromto.c @@ -37,23 +37,16 @@ #include RCSID("$Id$") -#include +#include #ifdef WITH_UDPFROMTO -#include - #ifdef HAVE_SYS_UIO_H #include #endif -#include -#include -#include #include -#include -#include int udpfromto_init(int s) { diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c index 7b3a3e8..79239ee 100644 --- a/src/lib/valuepair.c +++ b/src/lib/valuepair.c @@ -23,13 +23,8 @@ #include RCSID("$Id$") -#include - -#include +#include -#include -#include -#include #include #ifdef HAVE_MALLOC_H @@ -40,9 +35,6 @@ RCSID("$Id$") # include #endif -#include -#include - static const char *months[] = { "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec" }; diff --git a/src/main/acct.c b/src/main/acct.c index 0059c6f..367f118 100644 --- a/src/main/acct.c +++ b/src/main/acct.c @@ -26,7 +26,6 @@ #include RCSID("$Id$") -#include #include #include diff --git a/src/main/auth.c b/src/main/auth.c index 94bed74..90bf567 100644 --- a/src/main/auth.c +++ b/src/main/auth.c @@ -25,20 +25,12 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include #include +#include + /* * Return a short string showing the terminal server, port * and calling station ID. diff --git a/src/main/client.c b/src/main/client.c index 124a1ce..de21a31 100644 --- a/src/main/client.c +++ b/src/main/client.c @@ -25,23 +25,14 @@ #include RCSID("$Id$") -#include +#include +#include #include -#ifdef HAVE_NETINET_IN_H -# include -#endif - -#include -#include -#include #include #include -#include -#include - struct radclient_list { /* * FIXME: One set of trees for IPv4, and another for IPv6? diff --git a/src/main/conffile.c b/src/main/conffile.c index 4d60e66..deac55e 100644 --- a/src/main/conffile.c +++ b/src/main/conffile.c @@ -29,14 +29,8 @@ #include RCSID("$Id$") -#include - -#include -#include - -#ifdef HAVE_NETINET_IN_H -# include -#endif +#include +#include #ifdef HAVE_DIRENT_H #include @@ -48,10 +42,6 @@ RCSID("$Id$") #include -#include -#include -#include - typedef enum conf_type { CONF_ITEM_INVALID = 0, CONF_ITEM_PAIR, diff --git a/src/main/crypt.c b/src/main/crypt.c index 001daff..38c6a08 100644 --- a/src/main/crypt.c +++ b/src/main/crypt.c @@ -21,13 +21,10 @@ #include RCSID("$Id$") -#include -#include +#include #ifdef HAVE_CRYPT_H #include -#else -#include #endif #ifdef HAVE_PTHREAD_H @@ -40,8 +37,6 @@ static int lrad_crypt_init = 0; static pthread_mutex_t lrad_crypt_mutex; #endif -#include -#include /* * performs a crypt password check in an thread-safe way. diff --git a/src/main/event.c b/src/main/event.c index 97430ba..50ddc92 100644 --- a/src/main/event.c +++ b/src/main/event.c @@ -24,18 +24,18 @@ #include RCSID("$Id$") -#include - -#include -#include -#include #include -#include -#include #include +#include #include +#include + +#ifdef HAVE_SIGNAL_H +#include +#endif + #define USEC (1000000) /* diff --git a/src/main/exec.c b/src/main/exec.c index f200255..aa982b0 100644 --- a/src/main/exec.c +++ b/src/main/exec.c @@ -23,20 +23,15 @@ #include RCSID("$Id$") -#include +#include +#include #include -#include -#include #include #include #include -#ifdef HAVE_UNISTD_H -#include -#endif - #ifdef HAVE_SYS_WAIT_H # include #endif @@ -47,9 +42,6 @@ RCSID("$Id$") # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -#include -#include - #define MAX_ARGV (256) /* * Execute a program on successful authentication. diff --git a/src/main/files.c b/src/main/files.c index b409baf..d8caf88 100644 --- a/src/main/files.c +++ b/src/main/files.c @@ -25,23 +25,14 @@ #include RCSID("$Id$") -#include +#include +#include #include -#ifdef HAVE_NETINET_IN_H -# include -#endif - -#include -#include -#include #include #include -#include -#include - /* * Free a PAIR_LIST */ diff --git a/src/main/listen.c b/src/main/listen.c index d6f879f..dd845a4 100644 --- a/src/main/listen.c +++ b/src/main/listen.c @@ -24,24 +24,11 @@ #include RCSID("$Id$") -#include - -#include -#include - -#ifdef HAVE_NETINET_IN_H -#include -#endif - -#ifdef HAVE_ARPA_INET_H -#include -#endif +#include +#include +#include #include -#include -#include -#include -#include #ifdef HAVE_NET_IF_H #include @@ -51,17 +38,8 @@ RCSID("$Id$") #include #endif -#ifdef WITH_UDPFROMTO -#include -#endif - #include -#include -#include - -#include - static time_t start_time = 0; /* diff --git a/src/main/log.c b/src/main/log.c index 78fd893..7d9a68e 100644 --- a/src/main/log.c +++ b/src/main/log.c @@ -26,14 +26,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include -#include - #include #ifdef HAVE_SYSLOG_H diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c index bc882c2..a5c54c4 100644 --- a/src/main/mainconfig.c +++ b/src/main/mainconfig.c @@ -24,25 +24,11 @@ #include RCSID("$Id$") -#include - -#include -#include - -#ifdef HAVE_NETINET_IN_H -#include -#endif - -#ifdef HAVE_ARPA_INET_H -#include -#endif - #include -#include #include +#include #include -#include #include #include #include diff --git a/src/main/modcall.c b/src/main/modcall.c index c5a3b83..4ff85b6 100644 --- a/src/main/modcall.c +++ b/src/main/modcall.c @@ -23,14 +23,10 @@ #include RCSID("$Id$") -#include - -#include -#include #include -#include #include #include +#include /* mutually-recursive static functions need a prototype up front */ static modcallable *do_compile_modgroup(modcallable *, diff --git a/src/main/modules.c b/src/main/modules.c index 25971af..e2cd5c6 100644 --- a/src/main/modules.c +++ b/src/main/modules.c @@ -25,12 +25,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include #include diff --git a/src/main/radclient.c b/src/main/radclient.c index cd1ccb0..581aa6c 100644 --- a/src/main/radclient.c +++ b/src/main/radclient.c @@ -25,22 +25,11 @@ #include RCSID("$Id$") -#include - -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif +#include +#include +#include -#include #include -#include - -#ifdef HAVE_SYS_SELECT_H -# include -#endif #ifdef HAVE_GETOPT_H # include @@ -48,11 +37,6 @@ RCSID("$Id$") #include -#include -#include -#include -#include - static int retries = 10; static float timeout = 3; static const char *secret = NULL; diff --git a/src/main/radius_snmp.c b/src/main/radius_snmp.c index 5879741..90af9fb 100644 --- a/src/main/radius_snmp.c +++ b/src/main/radius_snmp.c @@ -24,19 +24,12 @@ #include RCSID("$Id$") -#include +#include #ifdef WITH_SNMP -#ifdef HAVE_NETINET_IN_H -# include -#endif - -#include - #include #include -#include extern int need_reload; diff --git a/src/main/radiusd.c b/src/main/radiusd.c index b6d623c..4683a95 100644 --- a/src/main/radiusd.c +++ b/src/main/radiusd.c @@ -28,33 +28,21 @@ #include RCSID("$Id$") -#include +#include +#include +#include #include -#ifdef HAVE_NETINET_IN_H -# include -#endif - -#include -#include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif - #include #ifdef HAVE_GETOPT_H # include #endif -#ifdef HAVE_SYS_SELECT_H -# include -#endif - #ifdef HAVE_SYS_WAIT_H # include #endif @@ -65,11 +53,6 @@ RCSID("$Id$") # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -#include -#include -#include -#include - /* * Global variables. */ diff --git a/src/main/radsniff.c b/src/main/radsniff.c index fe8c1c5..989a2aa 100644 --- a/src/main/radsniff.c +++ b/src/main/radsniff.c @@ -24,20 +24,13 @@ #include RCSID("$Id$") -#include +#define _LIBRADIUS 1 +#include #include -#include -#include -#include -#include -#include -#include -#define _LIBRADIUS 1 #include #include -#include #include static const char *radius_secret = "testing123"; diff --git a/src/main/radwho.c b/src/main/radwho.c index 9a9dce9..bb1c0ae 100644 --- a/src/main/radwho.c +++ b/src/main/radwho.c @@ -27,19 +27,15 @@ #include RCSID("$Id$") -#include +#include +#include +#include -#include -#include #include #include #include #include -#include -#include -#include - /* * FIXME: put in header file. */ diff --git a/src/main/realms.c b/src/main/realms.c index 6ed552a..6acae67 100644 --- a/src/main/realms.c +++ b/src/main/realms.c @@ -25,19 +25,14 @@ #include RCSID("$Id$") -#include +#include +#include #include -#include -#include -#include #include #include -#include -#include - static rbtree_t *realms_byname = NULL; static rbtree_t *home_servers_byaddr = NULL; diff --git a/src/main/session.c b/src/main/session.c index 54dee87..51f0657 100644 --- a/src/main/session.c +++ b/src/main/session.c @@ -23,27 +23,12 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - -#ifdef HAVE_UNISTD_H -#include -#endif +#include +#include #include -#include #include -#ifdef HAVE_NETINET_IN_H -#include -#endif - -#include -#include - /* * End a session by faking a Stop packet to all accounting modules. */ diff --git a/src/main/smux.c b/src/main/smux.c index 600c804..345db34 100644 --- a/src/main/smux.c +++ b/src/main/smux.c @@ -25,28 +25,18 @@ #include RCSID("$Id$") -#include +#include #ifdef WITH_SNMP -#include -#include +#include +#include -#ifdef HAVE_NETINET_IN_H -#include -#endif +#include -#include -#include -#include -#include #include #include -#include -#include -#include - #define min(A,B) ((A) < (B) ? (A) : (B)) diff --git a/src/main/threads.c b/src/main/threads.c index c29fa46..154231a 100644 --- a/src/main/threads.c +++ b/src/main/threads.c @@ -24,10 +24,8 @@ #include RCSID("$Id$") -#include - -#include -#include +#include +#include /* * Other OS's have sem_init, OS X doesn't. @@ -54,10 +52,6 @@ RCSID("$Id$") #include #endif -#include -#include -#include - #ifdef HAVE_PTHREAD_H #ifdef HAVE_OPENSSL_CRYPTO_H diff --git a/src/main/util.c b/src/main/util.c index 960d470..168662f 100644 --- a/src/main/util.c +++ b/src/main/util.c @@ -23,28 +23,15 @@ #include RCSID("$Id$") -#include +#include +#include -#include -#include -#include #include #include #include #include -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -#include -#endif - -#include -#include - /* * The signal() function in Solaris 2.5.1 sets SA_NODEFER in * sa_flags, which causes grief if signal() is called in the diff --git a/src/main/valuepair.c b/src/main/valuepair.c index 7c5bae1..76e962c 100644 --- a/src/main/valuepair.c +++ b/src/main/valuepair.c @@ -25,15 +25,7 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - -#ifdef HAVE_NETINET_IN_H -# include -#endif +#include #ifdef HAVE_REGEX_H # include @@ -52,8 +44,6 @@ RCSID("$Id$") #endif #endif -#include - struct cmp { int attribute; int otherattr; diff --git a/src/main/version.c b/src/main/version.c index dffbe91..d5cff45 100644 --- a/src/main/version.c +++ b/src/main/version.c @@ -25,10 +25,6 @@ #include RCSID("$Id$") -#include - -#include -#include #include /* diff --git a/src/main/xlat.c b/src/main/xlat.c index 25e76e9..4794c6c 100644 --- a/src/main/xlat.c +++ b/src/main/xlat.c @@ -25,17 +25,11 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - #include - #include +#include + typedef struct xlat_t { char module[MAX_STRING_LEN]; int length; diff --git a/src/modules/rlm_acct_unique/rlm_acct_unique.c b/src/modules/rlm_acct_unique/rlm_acct_unique.c index ed51a71..2d3f014 100644 --- a/src/modules/rlm_acct_unique/rlm_acct_unique.c +++ b/src/modules/rlm_acct_unique/rlm_acct_unique.c @@ -21,16 +21,11 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - #include #include +#include + /* * Room for at least 16 attributes. */ diff --git a/src/modules/rlm_acctlog/rlm_acctlog.c b/src/modules/rlm_acctlog/rlm_acctlog.c index 137e666..fee4979 100644 --- a/src/modules/rlm_acctlog/rlm_acctlog.c +++ b/src/modules/rlm_acctlog/rlm_acctlog.c @@ -25,14 +25,8 @@ #include RCSID("$Id$") -#include - -#include -#include - #include #include -#include typedef struct rlm_acctlog_t { char *acctstart; diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c index 27363e4..f6a2189 100644 --- a/src/modules/rlm_always/rlm_always.c +++ b/src/modules/rlm_always/rlm_always.c @@ -21,12 +21,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c index 408f599..f45ca0b 100644 --- a/src/modules/rlm_attr_filter/rlm_attr_filter.c +++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c @@ -25,20 +25,16 @@ #include RCSID("$Id$") -#include +#include +#include +#include #include -#include -#include -#include #include #include #include -#include -#include -#include /* * Define a structure with the module configuration, so it can diff --git a/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c b/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c index e22ab58..4fb55fd 100644 --- a/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c +++ b/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c @@ -24,18 +24,13 @@ #include RCSID("$Id$") -#include +#include +#include -#include -#include -#include #ifdef HAVE_REGEX_H # include #endif -#include -#include - #define RLM_REGEX_INPACKET 0 #define RLM_REGEX_INCONFIG 1 #define RLM_REGEX_INREPLY 2 diff --git a/src/modules/rlm_caching/rlm_caching.c b/src/modules/rlm_caching/rlm_caching.c index 5a56e33..3af9e98 100644 --- a/src/modules/rlm_caching/rlm_caching.c +++ b/src/modules/rlm_caching/rlm_caching.c @@ -25,17 +25,12 @@ #include RCSID("$Id$") -#include "config.h" -#include +#include +#include -#include -#include -#include #include -#include -#include -#include +#include "config.h" #include #include diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c index 434d1c8..c38967c 100644 --- a/src/modules/rlm_chap/rlm_chap.c +++ b/src/modules/rlm_chap/rlm_chap.c @@ -28,12 +28,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include diff --git a/src/modules/rlm_checkval/rlm_checkval.c b/src/modules/rlm_checkval/rlm_checkval.c index 04059a5..41f5015 100644 --- a/src/modules/rlm_checkval/rlm_checkval.c +++ b/src/modules/rlm_checkval/rlm_checkval.c @@ -24,14 +24,9 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include + #ifdef HAVE_REGEX_H # include #endif diff --git a/src/modules/rlm_copy_packet/rlm_copy_packet.c b/src/modules/rlm_copy_packet/rlm_copy_packet.c index 72f0baa..0603993 100644 --- a/src/modules/rlm_copy_packet/rlm_copy_packet.c +++ b/src/modules/rlm_copy_packet/rlm_copy_packet.c @@ -24,14 +24,8 @@ #include RCSID("$Id$") -#include - -#include -#include - #include #include -#include /* * Define a structure for our module configuration. diff --git a/src/modules/rlm_counter/rlm_counter.c b/src/modules/rlm_counter/rlm_counter.c index 2a523b6..5dae38a 100644 --- a/src/modules/rlm_counter/rlm_counter.c +++ b/src/modules/rlm_counter/rlm_counter.c @@ -25,16 +25,12 @@ #include RCSID("$Id$") -#include "config.h" -#include +#include +#include -#include -#include -#include #include -#include -#include +#include "config.h" #include diff --git a/src/modules/rlm_cram/rlm_cram.c b/src/modules/rlm_cram/rlm_cram.c index 58b18cf..174ac28 100644 --- a/src/modules/rlm_cram/rlm_cram.c +++ b/src/modules/rlm_cram/rlm_cram.c @@ -44,18 +44,13 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - #include #include #include +#include + #define SM_AUTHTYPE ((11406<<16)|101) #define SM_CHALLENGE ((11406<<16)|102) diff --git a/src/modules/rlm_dbm/rlm_dbm.c b/src/modules/rlm_dbm/rlm_dbm.c index 850670f..94c0471 100644 --- a/src/modules/rlm_dbm/rlm_dbm.c +++ b/src/modules/rlm_dbm/rlm_dbm.c @@ -24,10 +24,8 @@ #include RCSID("$Id$") -#include - -#include -#include +#include +#include #ifdef HAVE_NDBM_H #include @@ -43,9 +41,6 @@ RCSID("$Id$") #include -#include -#include - #ifdef SANDY_MOD # include "sandymod.h" #endif diff --git a/src/modules/rlm_dbm/rlm_dbm_cat.c b/src/modules/rlm_dbm/rlm_dbm_cat.c index 3d3bfb1..bdc13d5 100644 --- a/src/modules/rlm_dbm/rlm_dbm_cat.c +++ b/src/modules/rlm_dbm/rlm_dbm_cat.c @@ -20,11 +20,8 @@ * Copyright 2001 Koulik Andrei, Sandy Service */ -#include +#include #include -#include -#include -#include #ifdef HAVE_NDBM_H #include @@ -38,7 +35,6 @@ #include #endif -#include #include #define LOTSTUP 20 diff --git a/src/modules/rlm_dbm/rlm_dbm_parser.c b/src/modules/rlm_dbm/rlm_dbm_parser.c index a3ddcc4..b443fee 100644 --- a/src/modules/rlm_dbm/rlm_dbm_parser.c +++ b/src/modules/rlm_dbm/rlm_dbm_parser.c @@ -24,11 +24,9 @@ char sccsid[] = "$Id$ sandy module project\n Copyright 2001 Sandy Service\nCopyright 2001 Koulik Andrei"; -#include +#include #include -#include - #ifdef HAVE_NDBM_H #include #endif @@ -41,15 +39,10 @@ char sccsid[] = #include #endif -#include #include -#include - -#include #include #include -#include #define MAX_BUFF_SIZE 1024 diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c index e023217..a7df46b 100644 --- a/src/modules/rlm_detail/rlm_detail.c +++ b/src/modules/rlm_detail/rlm_detail.c @@ -23,20 +23,14 @@ #include RCSID("$Id$") -#include +#include +#include +#include #include -#include - -#include -#include #include #include -#include -#include -#include - #define DIRLEN 8192 static const char *packet_codes[] = { diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c index 2ddb321..7576d4a 100644 --- a/src/modules/rlm_digest/rlm_digest.c +++ b/src/modules/rlm_digest/rlm_digest.c @@ -24,12 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include diff --git a/src/modules/rlm_eap/eap.h b/src/modules/rlm_eap/eap.h index 8c5a476..63847a1 100644 --- a/src/modules/rlm_eap/eap.h +++ b/src/modules/rlm_eap/eap.h @@ -27,22 +27,8 @@ #include RCSIDH(eap_h, "$Id$") -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#ifdef HAVE_NETINET_IN_H -#include -#endif - -#include -#include - #include #include - #include #include "eap_types.h" diff --git a/src/modules/rlm_eap/radeapclient.c b/src/modules/rlm_eap/radeapclient.c index eb8423f..6bb618a 100644 --- a/src/modules/rlm_eap/radeapclient.c +++ b/src/modules/rlm_eap/radeapclient.c @@ -25,27 +25,9 @@ #include RCSID("$Id$") -#include +#include -#include -#include - -#if HAVE_UNISTD_H -# include -#endif - -#include #include -#include -#include - -#if HAVE_NETINET_IN_H -# include -#endif - -#if HAVE_SYS_SELECT_H -# include -#endif #if HAVE_GETOPT_H # include @@ -53,7 +35,6 @@ RCSID("$Id$") #include #include -#include #include #include "eap_types.h" diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c index dcaf53c..13fbff4 100644 --- a/src/modules/rlm_eap/rlm_eap.c +++ b/src/modules/rlm_eap/rlm_eap.c @@ -25,10 +25,11 @@ #include RCSID("$Id$") -#include -#include "rlm_eap.h" +#include #include +#include "rlm_eap.h" + static const CONF_PARSER module_config[] = { { "default_eap_type", PW_TYPE_STRING_PTR, offsetof(rlm_eap_t, default_eap_type_name), NULL, "md5" }, diff --git a/src/modules/rlm_example/rlm_example.c b/src/modules/rlm_example/rlm_example.c index ea8c9f4..5462062 100644 --- a/src/modules/rlm_example/rlm_example.c +++ b/src/modules/rlm_example/rlm_example.c @@ -24,11 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include - #include #include diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c index 9e8517d..0d6e9fd 100644 --- a/src/modules/rlm_exec/rlm_exec.c +++ b/src/modules/rlm_exec/rlm_exec.c @@ -24,12 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include diff --git a/src/modules/rlm_expiration/rlm_expiration.c b/src/modules/rlm_expiration/rlm_expiration.c index d5e8a83..5b89b0f 100644 --- a/src/modules/rlm_expiration/rlm_expiration.c +++ b/src/modules/rlm_expiration/rlm_expiration.c @@ -24,16 +24,11 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - #include #include +#include + /* * Define a structure for our module configuration. * diff --git a/src/modules/rlm_expr/paircmp.c b/src/modules/rlm_expr/paircmp.c index 4c7e1b0..0bc2d49 100644 --- a/src/modules/rlm_expr/paircmp.c +++ b/src/modules/rlm_expr/paircmp.c @@ -24,15 +24,8 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include - /* * Compare a Connect-Info and a Connect-Rate */ diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c index 76d17d6..8c76d94 100644 --- a/src/modules/rlm_expr/rlm_expr.c +++ b/src/modules/rlm_expr/rlm_expr.c @@ -24,12 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include diff --git a/src/modules/rlm_fastusers/rlm_fastusers.c b/src/modules/rlm_fastusers/rlm_fastusers.c index 817f1f8..b63251c 100644 --- a/src/modules/rlm_fastusers/rlm_fastusers.c +++ b/src/modules/rlm_fastusers/rlm_fastusers.c @@ -25,24 +25,17 @@ #include RCSID("$Id$") -#include +#include +#include -#include -#include #include -#include -#include -#include #include #include #include #include #include -#include -#include - struct fastuser_instance { char *compat_mode; int hash_reload; diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c index 063e0a4..47858fd 100644 --- a/src/modules/rlm_files/rlm_files.c +++ b/src/modules/rlm_files/rlm_files.c @@ -24,20 +24,13 @@ #include RCSID("$Id$") -#include - -#include +#include +#include -#include -#include -#include #include #include #include -#include -#include - struct file_instance { char *compat_mode; diff --git a/src/modules/rlm_ippool/rlm_ippool.c b/src/modules/rlm_ippool/rlm_ippool.c index e283586..b8ac0cd 100644 --- a/src/modules/rlm_ippool/rlm_ippool.c +++ b/src/modules/rlm_ippool/rlm_ippool.c @@ -58,37 +58,15 @@ #include RCSID("$Id$") -#include "config.h" -#include +#include +#include -#include -#include -#include +#include "config.h" #include -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#ifdef HAVE_STDINT_H -#include -#endif - -#ifdef HAVE_INTTYPES_H -#include -#endif - -#ifdef HAVE_NETINET_IN_H -#include -#endif - -#include -#include -#include #include "../../include/md5.h" #include -#include #ifdef NEEDS_GDBM_SYNC # define GDBM_SYNCOPT GDBM_SYNC diff --git a/src/modules/rlm_ippool/rlm_ippool_tool.c b/src/modules/rlm_ippool/rlm_ippool_tool.c index addbae9..0b1497c 100755 --- a/src/modules/rlm_ippool/rlm_ippool_tool.c +++ b/src/modules/rlm_ippool/rlm_ippool_tool.c @@ -56,20 +56,10 @@ #include RCSID("$Id$") -#include -#include -#include -#include -#include -#include +#include #include #include -#include -#include -#include #include "../../include/md5.h" -#include -#include int active=0; diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c index 1abedae..a5ed511 100644 --- a/src/modules/rlm_krb5/rlm_krb5.c +++ b/src/modules/rlm_krb5/rlm_krb5.c @@ -25,12 +25,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index fcbdaf8..538cf6f 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -21,33 +21,16 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - -#include -#include -#include +#include +#include +#include + #include -#include #include -#include #include #include -#include -#include -#include - -#include -#include -#include -#include - #ifndef HAVE_PTHREAD_H /* * This is a lot simpler than putting ifdef's around @@ -58,6 +41,8 @@ RCSID("$Id$") #define pthread_mutex_unlock(a) #define pthread_mutex_init(a,b) #define pthread_mutex_destroy(a) +#else +#include #endif diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c index b58b969..66fedf3 100755 --- a/src/modules/rlm_linelog/rlm_linelog.c +++ b/src/modules/rlm_linelog/rlm_linelog.c @@ -24,23 +24,13 @@ #include RCSID("$Id$") -#include - -#include -#include - -#ifdef HAVE_UNISTD_H -#include -#endif +#include +#include #ifdef HAVE_FCNTL_H #include #endif -#include -#include - - /* * Define a structure for our module configuration. * diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c index dd1a1d1..03ca05a 100644 --- a/src/modules/rlm_logintime/rlm_logintime.c +++ b/src/modules/rlm_logintime/rlm_logintime.c @@ -24,16 +24,11 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - #include #include +#include + /* * Define a structure for our module configuration. * diff --git a/src/modules/rlm_logintime/timestr.c b/src/modules/rlm_logintime/timestr.c index 6798798..c90e471 100644 --- a/src/modules/rlm_logintime/timestr.c +++ b/src/modules/rlm_logintime/timestr.c @@ -24,15 +24,10 @@ #include RCSID("$Id$") -#include +#include -#include -#include -#include #include -#include - static const char *days[] = { "su", "mo", "tu", "we", "th", "fr", "sa", "wk", "any", "al" }; diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c index 645abb1..e9ac66a 100644 --- a/src/modules/rlm_mschap/rlm_mschap.c +++ b/src/modules/rlm_mschap/rlm_mschap.c @@ -45,18 +45,12 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - #include #include - -#include #include +#include + +#include #include "smbdes.h" diff --git a/src/modules/rlm_mschap/smbencrypt.c b/src/modules/rlm_mschap/smbencrypt.c index 90150f9..dd299a1 100644 --- a/src/modules/rlm_mschap/smbencrypt.c +++ b/src/modules/rlm_mschap/smbencrypt.c @@ -23,13 +23,10 @@ #include RCSID("$Id$") -#include -#include -#include -#include +#include +#include #include -#include #include "smbdes.h" diff --git a/src/modules/rlm_otp/otp_pw_valid.c b/src/modules/rlm_otp/otp_pw_valid.c index a036231..6e4498a 100644 --- a/src/modules/rlm_otp/otp_pw_valid.c +++ b/src/modules/rlm_otp/otp_pw_valid.c @@ -24,7 +24,6 @@ #include RCSID("$Id$") -#include #include #include @@ -32,14 +31,10 @@ RCSID("$Id$") #include "otp.h" #include "otp_pw_valid.h" -#include +#ifdef HAVE_PTHREAD_H #include -#include -#include -#include -#include +#endif #include -#include /* transform otpd return codes into rlm return codes */ diff --git a/src/modules/rlm_otp/otp_pwe.c b/src/modules/rlm_otp/otp_pwe.c index 0227918..e3e56b8 100644 --- a/src/modules/rlm_otp/otp_pwe.c +++ b/src/modules/rlm_otp/otp_pwe.c @@ -31,9 +31,8 @@ RCSID("$Id$") /* avoid inclusion of these FR headers which conflict w/ OpenSSL */ #define _LRAD_MD4_H #define _LRAD_SHA1_H -#include -#include #include +#include #include "extern.h" diff --git a/src/modules/rlm_otp/otp_rlm.c b/src/modules/rlm_otp/otp_rlm.c index a487d8a..98709b0 100644 --- a/src/modules/rlm_otp/otp_rlm.c +++ b/src/modules/rlm_otp/otp_rlm.c @@ -23,20 +23,12 @@ #include RCSID("$Id$") -#include #include #include #include "extern.h" #include "otp.h" -#include -#include -#include -#include -#include -#include /* htonl(), ntohl() */ - /* Global data */ static unsigned char hmac_key[16]; /* to protect State attribute */ static int ninstance = 0; /* #instances, for global init */ diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c index 1e7a289..ac1ea85 100644 --- a/src/modules/rlm_pam/rlm_pam.c +++ b/src/modules/rlm_pam/rlm_pam.c @@ -31,14 +31,11 @@ #include RCSID("$Id$") -#include +#include +#include #include "config.h" -#include -#include -#include - #ifdef HAVE_SECURITY_PAM_APPL_H #include #endif @@ -52,9 +49,6 @@ RCSID("$Id$") #include #endif -#include -#include - typedef struct rlm_pam_t { const char *pam_auth_name; } rlm_pam_t; diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index ec0c8c4..3742da5 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -24,16 +24,11 @@ #include RCSID("$Id$") -#include +#include +#include -#include -#include -#include -#include #include -#include -#include #include "../../include/md5.h" #include "../../include/sha1.h" diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c index 4969d4d..632f8d7 100644 --- a/src/modules/rlm_passwd/rlm_passwd.c +++ b/src/modules/rlm_passwd/rlm_passwd.c @@ -21,14 +21,9 @@ #include RCSID("$Id$") -#include -#include -#include -#include #include #include - struct mypasswd { struct mypasswd *next; char *listflag; diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c index 3fd351e..0917038 100644 --- a/src/modules/rlm_perl/rlm_perl.c +++ b/src/modules/rlm_perl/rlm_perl.c @@ -24,12 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - #include #include diff --git a/src/modules/rlm_policy/rlm_policy.c b/src/modules/rlm_policy/rlm_policy.c index fb6cb94..b1cd0c8 100644 --- a/src/modules/rlm_policy/rlm_policy.c +++ b/src/modules/rlm_policy/rlm_policy.c @@ -24,10 +24,10 @@ #include RCSID("$Id$") -#include "rlm_policy.h" - +#include #include -#include + +#include "rlm_policy.h" /* * A mapping of configuration file names to internal variables. diff --git a/src/modules/rlm_policy/rlm_policy.h b/src/modules/rlm_policy/rlm_policy.h index 9b77597..79b27ec 100644 --- a/src/modules/rlm_policy/rlm_policy.h +++ b/src/modules/rlm_policy/rlm_policy.h @@ -26,19 +26,9 @@ #include RCSIDH(rlm_policy_h, "$Id$") -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#include -#include - #include #include #include - #include /* diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c index 8f081d9..967e10c 100644 --- a/src/modules/rlm_preprocess/rlm_preprocess.c +++ b/src/modules/rlm_preprocess/rlm_preprocess.c @@ -26,19 +26,12 @@ #include RCSID("$Id$") -#include - -#include - -#include -#include -#include -#include - #include #include #include +#include + typedef struct rlm_preprocess_t { char *huntgroup_file; char *hints_file; diff --git a/src/modules/rlm_protocol_filter/rlm_protocol_filter.c b/src/modules/rlm_protocol_filter/rlm_protocol_filter.c index 353a1ca..73dde37 100755 --- a/src/modules/rlm_protocol_filter/rlm_protocol_filter.c +++ b/src/modules/rlm_protocol_filter/rlm_protocol_filter.c @@ -24,11 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include - #include #include diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c index 1880465..2669500 100644 --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -24,16 +24,10 @@ #include RCSID("$Id$") -#include - -#include - -#include -#include - #include #include -#include + +#include /* * Define a structure for our module configuration. diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c index 84350db..bc37f78 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp.c +++ b/src/modules/rlm_radutmp/rlm_radutmp.c @@ -24,25 +24,16 @@ #include RCSID("$Id$") -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include #include -#include -#include #include #include "config.h" -#include -#include -#include -#include - #define LOCK_LEN sizeof(struct radutmp) static const char porttypes[] = "ASITX"; diff --git a/src/modules/rlm_radutmp/rlm_radutmp2.c b/src/modules/rlm_radutmp/rlm_radutmp2.c index f38ab0b..fbdae70 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp2.c +++ b/src/modules/rlm_radutmp/rlm_radutmp2.c @@ -23,25 +23,16 @@ #include RCSID("$Id$") -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include #include -#include -#include #include #include "config.h" -#include -#include -#include -#include - #define LOCK_LEN sizeof(struct radutmp) static const char porttypes[] = "ASITX"; diff --git a/src/modules/rlm_realm/rlm_realm.c b/src/modules/rlm_realm/rlm_realm.c index 34598cd..dbbe7b1 100644 --- a/src/modules/rlm_realm/rlm_realm.c +++ b/src/modules/rlm_realm/rlm_realm.c @@ -24,20 +24,6 @@ #include RCSID("$Id$") -#include - -#include -#include -#include - -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#ifdef HAVE_NETINET_IN_H -#include -#endif - #include #include diff --git a/src/modules/rlm_sim_files/rlm_sim_files.c b/src/modules/rlm_sim_files/rlm_sim_files.c index 72573c6..c7f5bc3 100644 --- a/src/modules/rlm_sim_files/rlm_sim_files.c +++ b/src/modules/rlm_sim_files/rlm_sim_files.c @@ -57,19 +57,14 @@ #include RCSID("$Id$") -#include +#include +#include #include - -#include -#include -#include #include #include #include -#include -#include #include "../rlm_eap/libeap/eap_sim.h" struct sim_file_instance { diff --git a/src/modules/rlm_smb/rfcnb-util.c b/src/modules/rlm_smb/rfcnb-util.c index b502e9e..67d2bf3 100644 --- a/src/modules/rlm_smb/rfcnb-util.c +++ b/src/modules/rlm_smb/rfcnb-util.c @@ -29,7 +29,6 @@ RCSID("$Id$") #include -#include #include #include "std-includes.h" #include "rfcnb-priv.h" diff --git a/src/modules/rlm_smb/rlm_smb.c b/src/modules/rlm_smb/rlm_smb.c index c88eddc..fdee2e4 100644 --- a/src/modules/rlm_smb/rlm_smb.c +++ b/src/modules/rlm_smb/rlm_smb.c @@ -24,14 +24,8 @@ #include RCSID("$Id$") -#include - -#include -#include - #include #include -#include #include "valid.h" diff --git a/src/modules/rlm_smb/valid.c b/src/modules/rlm_smb/valid.c index 98ada35..a4af4b7 100644 --- a/src/modules/rlm_smb/valid.c +++ b/src/modules/rlm_smb/valid.c @@ -21,8 +21,8 @@ #include RCSID("$Id$") -#include -#include +#include + #include #include "smblib-priv.h" #include "valid.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/sql_db2.c index e903062..6eccceb 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_db2/sql_db2.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/sql_db2.c @@ -31,14 +31,10 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include -#include -#include #include #include #include "rlm_sql.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/sql_iodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/sql_iodbc.c index 308ed12..0de8861 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/sql_iodbc.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/sql_iodbc.c @@ -24,18 +24,14 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include -#include #include #include #include -#include #include "rlm_sql.h" typedef struct rlm_sql_iodbc_sock { diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c index fa32728..8da0503 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c @@ -25,22 +25,19 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include -#include - -#include #include "config.h" #ifdef HAVE_MYSQL_MYSQL_H +#include #include #include #else #ifdef HAVE_MYSQL_H +#include #include #include #endif diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c index da14953..5cd9f53 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c @@ -22,15 +22,9 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include -#include -#include - -#include #include #include "rlm_sql.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c index 8618adc..8d85390 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c @@ -40,14 +40,9 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include -#include - -#include #include #include "rlm_sql.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sybase/sql_sybase.c b/src/modules/rlm_sql/drivers/rlm_sql_sybase/sql_sybase.c index 17faeb6..13228ad 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_sybase/sql_sybase.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_sybase/sql_sybase.c @@ -23,14 +23,9 @@ #include RCSID("$Id$") -#include +#include -#include #include -#include -#include - -#include #include #include "rlm_sql.h" diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c index 146785e..7183dd8 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c @@ -22,10 +22,6 @@ #include RCSID("$Id$") -#include - -#include -#include #include #include diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index 31b7c25..7f22ae0 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -26,26 +26,15 @@ #include RCSID("$Id$") -#include +#include +#include +#include -#include #include -#include -#include -#include -#include #include -#include - -#include -#include -#include -#include -#include #include "rlm_sql.h" -#include static char *allowed_chars = NULL; diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c index c0f713a..72c164b 100644 --- a/src/modules/rlm_sql/sql.c +++ b/src/modules/rlm_sql/sql.c @@ -27,28 +27,16 @@ #include RCSID("$Id$") -#include +#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include #include -#include #include -#include #include -#include #include -#include #include "rlm_sql.h" #ifdef HAVE_PTHREAD_H diff --git a/src/modules/rlm_sql_log/rlm_sql_log.c b/src/modules/rlm_sql_log/rlm_sql_log.c index d9c5047..4628dc0 100644 --- a/src/modules/rlm_sql_log/rlm_sql_log.c +++ b/src/modules/rlm_sql_log/rlm_sql_log.c @@ -27,17 +27,12 @@ #include RCSID("$Id$") -#include +#include +#include #include -#include -#include #include -#include -#include -#include - static int sql_log_instantiate(CONF_SECTION *conf, void **instance); static int sql_log_detach(void *instance); static int sql_log_accounting(void *instance, REQUEST *request); diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c index de68b1a..630f971 100644 --- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c +++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c @@ -27,16 +27,11 @@ #include RCSID("$Id$") -#include - -#include -#include -#include -#include - #include #include +#include + #define MAX_QUERY_LEN 1024 static int sqlcounter_detach(void *instance); diff --git a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c index d0a985b..a09db40 100644 --- a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c +++ b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c @@ -34,20 +34,11 @@ */ #include "config.h" -#include "freeradius-devel/autoconf.h" -#include "freeradius-devel/libradius.h" +#include +#include +#include -#include -#include -#include #include -#include -#include - -#include "freeradius-devel/radiusd.h" -#include "freeradius-devel/modules.h" -#include "freeradius-devel/conffile.h" -#include "freeradius-devel/modpriv.h" #include "rlm_sql.h" diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c index 836241d..39b5a58 100644 --- a/src/modules/rlm_sqlippool/rlm_sqlippool.c +++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c @@ -25,13 +25,10 @@ #include RCSID("$Id$") -#include -#include +#include -#include #include -#include #include #include diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c index d8d1038..ec707c3 100644 --- a/src/modules/rlm_unix/rlm_unix.c +++ b/src/modules/rlm_unix/rlm_unix.c @@ -27,13 +27,10 @@ #include RCSID("$Id$") -#include +#include -#include -#include #include #include -#include #include #include "config.h" @@ -52,7 +49,6 @@ RCSID("$Id$") # include #endif -#include #include #include -- 2.1.4