From 782f556183836382fa888ebac18ea86f15648bb8 Mon Sep 17 00:00:00 2001 From: aland Date: Fri, 11 Nov 2005 00:32:48 +0000 Subject: [PATCH] Include files used to build the server are now If this is bad, we can easily change it in the future to something like . Also, updated rlm_sqlippool to build with the recent cleanups. The work was done via a Perl script, and the server rebuilt & tested to be sure it works. --- src/Makefile | 4 +- src/include/conffile.h | 2 +- src/include/libradius.h | 8 +- src/include/modcall.h | 2 +- src/include/modpriv.h | 4 +- src/include/modules.h | 2 +- src/include/radiusd.h | 10 +-- src/lib/Makefile | 2 +- src/lib/dict.c | 6 +- src/lib/filters.c | 6 +- src/lib/getaddrinfo.c | 4 +- src/lib/hash.c | 6 +- src/lib/hmac.c | 8 +- src/lib/hmacsha1.c | 8 +- src/lib/isaac.c | 6 +- src/lib/log.c | 6 +- src/lib/md4.c | 2 +- src/lib/md5.c | 4 +- src/lib/misc.c | 6 +- src/lib/missing.c | 6 +- src/lib/print.c | 6 +- src/lib/radius.c | 10 +-- src/lib/rbtree.c | 6 +- src/lib/sha1.c | 2 +- src/lib/snprintf.c | 2 +- src/lib/strlcat.c | 4 +- src/lib/strlcpy.c | 4 +- src/lib/token.c | 2 +- src/lib/udpfromto.c | 4 +- src/lib/valuepair.c | 6 +- src/main/Makefile.in | 2 +- src/main/acct.c | 6 +- src/main/auth.c | 8 +- src/main/client.c | 8 +- src/main/conffile.c | 12 +-- src/main/crypt.c | 6 +- src/main/files.c | 6 +- src/main/listen.c | 16 ++-- src/main/log.c | 4 +- src/main/mainconfig.c | 14 +-- src/main/modcall.c | 14 +-- src/main/modules.c | 14 +-- src/main/proxy.c | 10 +-- src/main/radclient.c | 10 +-- src/main/radius_snmp.c | 10 +-- src/main/radiusd.c | 14 +-- src/main/radwho.c | 10 +-- src/main/request_list.c | 10 +-- src/main/request_process.c | 8 +- src/main/session.c | 6 +- src/main/smux.c | 8 +- src/main/threads.c | 10 +-- src/main/util.c | 6 +- src/main/valuepair.c | 4 +- src/main/version.c | 4 +- src/main/xlat.c | 6 +- src/modules/rlm_acct_unique/rlm_acct_unique.c | 6 +- src/modules/rlm_always/rlm_always.c | 8 +- src/modules/rlm_attr_filter/rlm_attr_filter.c | 8 +- src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c | 8 +- src/modules/rlm_caching/rlm_caching.c | 8 +- src/modules/rlm_chap/rlm_chap.c | 8 +- src/modules/rlm_checkval/rlm_checkval.c | 8 +- src/modules/rlm_copy_packet/rlm_copy_packet.c | 8 +- src/modules/rlm_counter/rlm_counter.c | 8 +- src/modules/rlm_cram/rlm_cram.c | 12 +-- src/modules/rlm_dbm/rlm_dbm.c | 6 +- src/modules/rlm_dbm/rlm_dbm_cat.c | 2 +- src/modules/rlm_dbm/rlm_dbm_parser.c | 10 +-- src/modules/rlm_detail/rlm_detail.c | 8 +- src/modules/rlm_digest/rlm_digest.c | 10 +-- src/modules/rlm_eap/Makefile.in | 2 +- src/modules/rlm_eap/eap.h | 8 +- src/modules/rlm_eap/libeap/eap_types.h | 6 +- src/modules/rlm_eap/libeap/eapcommon.c | 6 +- src/modules/rlm_eap/libeap/eapcrypto.c | 6 +- src/modules/rlm_eap/libeap/eapsimlib.c | 8 +- src/modules/rlm_eap/libeap/fips186prf.c | 18 +++- src/modules/rlm_eap/radeapclient.c | 10 +-- src/modules/rlm_eap/rlm_eap.c | 4 +- .../rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c | 4 +- .../rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c | 2 +- .../rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c | 4 +- .../types/rlm_eap_mschapv2/rlm_eap_mschapv2.c | 4 +- .../rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c | 2 +- .../rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c | 16 +++- .../rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c | 2 +- .../rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c | 2 +- src/modules/rlm_example/rlm_example.c | 8 +- src/modules/rlm_exec/exec.c | 6 +- src/modules/rlm_exec/rlm_exec.c | 8 +- src/modules/rlm_expiration/rlm_expiration.c | 8 +- src/modules/rlm_expr/paircmp.c | 4 +- src/modules/rlm_expr/rlm_expr.c | 8 +- src/modules/rlm_fastusers/rlm_fastusers.c | 6 +- src/modules/rlm_files/rlm_files.c | 6 +- src/modules/rlm_ippool/rlm_ippool.c | 8 +- src/modules/rlm_ippool/rlm_ippool_tool.c | 6 +- src/modules/rlm_krb5/rlm_krb5.c | 6 +- src/modules/rlm_ldap/rlm_ldap.c | 10 +-- src/modules/rlm_linelog/rlm_linelog.c | 8 +- src/modules/rlm_logintime/rlm_logintime.c | 8 +- src/modules/rlm_logintime/timestr.c | 4 +- src/modules/rlm_mschap/rlm_mschap.c | 14 +-- src/modules/rlm_mschap/smbencrypt.c | 4 +- src/modules/rlm_otp/otp_pwe.c | 2 +- src/modules/rlm_otp/otp_rad.h | 6 +- src/modules/rlm_otp/otp_rlm.c | 2 +- src/modules/rlm_pam/rlm_pam.c | 6 +- src/modules/rlm_pap/rlm_pap.c | 8 +- src/modules/rlm_passwd/rlm_passwd.c | 6 +- src/modules/rlm_perl/rlm_perl.c | 8 +- src/modules/rlm_policy/parse.c | 2 +- src/modules/rlm_policy/rlm_policy.c | 4 +- src/modules/rlm_policy/rlm_policy.h | 10 +-- src/modules/rlm_preprocess/rlm_preprocess.c | 8 +- .../rlm_protocol_filter/rlm_protocol_filter.c | 8 +- src/modules/rlm_python/rlm_python.c | 8 +- src/modules/rlm_radutmp/rlm_radutmp.c | 10 +-- src/modules/rlm_radutmp/rlm_radutmp2.c | 10 +-- src/modules/rlm_realm/rlm_realm.c | 6 +- src/modules/rlm_sim_files/rlm_sim_files.c | 6 +- src/modules/rlm_smb/rfcnb-util.c | 4 +- src/modules/rlm_smb/rlm_smb.c | 8 +- src/modules/rlm_sql/Makefile.in | 4 +- src/modules/rlm_sql/drivers/rlm_sql_db2/sql_db2.c | 4 +- .../rlm_sql/drivers/rlm_sql_iodbc/sql_iodbc.c | 4 +- .../rlm_sql/drivers/rlm_sql_mysql/sql_mysql.c | 4 +- .../rlm_sql/drivers/rlm_sql_oracle/sql_oracle.c | 4 +- .../drivers/rlm_sql_postgresql/sql_postgresql.c | 4 +- .../rlm_sql/drivers/rlm_sql_sybase/sql_sybase.c | 4 +- .../drivers/rlm_sql_unixodbc/sql_unixodbc.c | 4 +- src/modules/rlm_sql/drivers/rules.mak | 2 +- src/modules/rlm_sql/rlm_sql.c | 9 +- src/modules/rlm_sql/rlm_sql.h | 1 - src/modules/rlm_sql/sql.c | 6 +- src/modules/rlm_sql_log/rlm_sql_log.c | 10 +-- src/modules/rlm_sqlcounter/rlm_sqlcounter.c | 8 +- src/modules/rlm_sqlippool/Makefile.in | 4 +- src/modules/rlm_sqlippool/conf.h | 100 --------------------- src/modules/rlm_sqlippool/ip_set.c | 10 +-- src/modules/rlm_sqlippool/rlm_sql.h | 89 ------------------ src/modules/rlm_sqlippool/rlm_sqlippool.c | 22 ++--- src/modules/rlm_unix/rlm_unix.c | 8 +- src/modules/rules.mak | 2 +- 145 files changed, 488 insertions(+), 655 deletions(-) delete mode 100644 src/modules/rlm_sqlippool/conf.h delete mode 100644 src/modules/rlm_sqlippool/rlm_sql.h diff --git a/src/Makefile b/src/Makefile index 09b70f7..ffb169e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,7 +9,7 @@ include ../Make.inc SUBDIRS = include lib modules main WHAT_TO_MAKE = all -all: +all: freeradius-devel @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common clean: @@ -25,3 +25,5 @@ common: (cd $$dir && $(MAKE) $(MFLAGS) $(WHAT_TO_MAKE)) || exit $?;\ done +freeradius-devel: + ln -s include freeradius-devel diff --git a/src/include/conffile.h b/src/include/conffile.h index 391b867..72f69f1 100644 --- a/src/include/conffile.h +++ b/src/include/conffile.h @@ -9,7 +9,7 @@ */ #include -#include "token.h" +#include /* * Export the minimum amount of information about these structs diff --git a/src/include/libradius.h b/src/include/libradius.h index 1b4eacd..df0f7c8 100644 --- a/src/include/libradius.h +++ b/src/include/libradius.h @@ -54,8 +54,8 @@ # endif #endif -#include "radius.h" -#include "token.h" +#include +#include #ifdef SIZEOF_UNSIGNED_INT #if SIZEOF_UNSIGNED_INT != 4 @@ -66,8 +66,8 @@ /* * Include for modules. */ -#include -#include +#include +#include #define EAP_START 2 diff --git a/src/include/modcall.h b/src/include/modcall.h index 4da5a3b..c737cae 100644 --- a/src/include/modcall.h +++ b/src/include/modcall.h @@ -4,7 +4,7 @@ * * Version: $Id$ */ -#include "conffile.h" /* Need CONF_* definitions */ +#include /* Need CONF_* definitions */ /* * For each authorize/authtype/etc, we have an ordered diff --git a/src/include/modpriv.h b/src/include/modpriv.h index f10d331..a85c5ff 100644 --- a/src/include/modpriv.h +++ b/src/include/modpriv.h @@ -2,8 +2,8 @@ * accessed from anywhere else. * * Version: $Id$ */ -#include "radiusd.h" -#include "modules.h" +#include +#include #include "ltdl.h" /* diff --git a/src/include/modules.h b/src/include/modules.h index 87362b3..c987784 100644 --- a/src/include/modules.h +++ b/src/include/modules.h @@ -7,7 +7,7 @@ #ifndef RADIUS_MODULES_H #define RADIUS_MODULES_H -#include "conffile.h" +#include typedef int (*packetmethod)(void *instance, REQUEST *request); diff --git a/src/include/radiusd.h b/src/include/radiusd.h index 79e23d6..f726a8a 100644 --- a/src/include/radiusd.h +++ b/src/include/radiusd.h @@ -7,11 +7,11 @@ * Version: $Id$ * */ -#include "missing.h" -#include "libradius.h" -#include "radpaths.h" -#include "conf.h" -#include "conffile.h" +#include +#include +#include +#include +#include #include diff --git a/src/lib/Makefile b/src/lib/Makefile index ed86a63..ce75e88 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -14,7 +14,7 @@ SRCS = dict.c filters.c hash.c hmac.c hmacsha1.c isaac.c log.c \ INCLUDES = ../include/radius.h ../include/libradius.h \ ../include/missing.h ../include/autoconf.h -CFLAGS += -D_LIBRADIUS -I../include +CFLAGS += -D_LIBRADIUS -I$(top_builddir)/src # if you have problems with things that need SHA1-HMAC, this will # dump the key and the input to the hash so you can compare to what diff --git a/src/lib/dict.c b/src/lib/dict.c index ba14754..45805d8 100644 --- a/src/lib/dict.c +++ b/src/lib/dict.c @@ -22,7 +22,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -38,8 +38,8 @@ static const char rcsid[] = "$Id$"; #include -#include "missing.h" -#include "libradius.h" +#include +#include #define DICT_VALUE_MAX_NAME_LEN (128) #define DICT_VENDOR_MAX_NAME_LEN (128) diff --git a/src/lib/filters.c b/src/lib/filters.c index 67e8d0b..96d8c3d 100644 --- a/src/lib/filters.c +++ b/src/lib/filters.c @@ -22,7 +22,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -33,8 +33,8 @@ static const char rcsid[] = "$Id$"; #include #endif -#include "missing.h" -#include "libradius.h" +#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 ad9076d..9fa6311 100644 --- a/src/lib/getaddrinfo.c +++ b/src/lib/getaddrinfo.c @@ -7,7 +7,7 @@ * return all IPv4 addresses provided by DNS lookup. */ -#include "autoconf.h" +#include #include #include @@ -20,7 +20,7 @@ #include #include -#include "missing.h" +#include #ifdef HAVE_PTHREAD_H #include diff --git a/src/lib/hash.c b/src/lib/hash.c index 5824843..f74886d 100644 --- a/src/lib/hash.c +++ b/src/lib/hash.c @@ -32,13 +32,13 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include -#include "missing.h" -#include "libradius.h" +#include +#include typedef struct lrad_hash_entry_t { struct lrad_hash_entry_t *next; diff --git a/src/lib/hmac.c b/src/lib/hmac.c index d1295ac..1974f08 100644 --- a/src/lib/hmac.c +++ b/src/lib/hmac.c @@ -24,12 +24,12 @@ /* ** Function: hmac_md5 */ -#include "autoconf.h" +#include #include -#include "md5.h" -#include "missing.h" -#include "libradius.h" +#include +#include +#include /* unsigned char* text; pointer to data stream diff --git a/src/lib/hmacsha1.c b/src/lib/hmacsha1.c index e64b502..2933cfa 100644 --- a/src/lib/hmacsha1.c +++ b/src/lib/hmacsha1.c @@ -8,7 +8,7 @@ ** Function: hmac_sha1 */ -#include "autoconf.h" +#include #include #include @@ -17,10 +17,10 @@ #include #endif -#include "sha1.h" +#include -#include "missing.h" -#include "libradius.h" +#include +#include /* uint8_t* text; pointer to data stream diff --git a/src/lib/isaac.c b/src/lib/isaac.c index f94a8ee..2006f4e 100644 --- a/src/lib/isaac.c +++ b/src/lib/isaac.c @@ -10,9 +10,9 @@ MODIFIED: ------------------------------------------------------------------------------ */ -#include "autoconf.h" -#include "missing.h" -#include "libradius.h" +#include +#include +#include #define RANDSIZL (8) /* I recommend 8 for crypto, 4 for simulations */ #define RANDSIZ (1< #include #include #include #include -#include "missing.h" -#include "libradius.h" +#include +#include char librad_errstr[1024]; diff --git a/src/lib/md4.c b/src/lib/md4.c index 2a97aee..db066ab 100644 --- a/src/lib/md4.c +++ b/src/lib/md4.c @@ -7,7 +7,7 @@ * from public domain source code. */ -#include "autoconf.h" +#include /* * FORCE MD4 TO USE OUR MD4 HEADER FILE! diff --git a/src/lib/md5.c b/src/lib/md5.c index e2c4d71..6287040 100644 --- a/src/lib/md5.c +++ b/src/lib/md5.c @@ -7,8 +7,8 @@ * from public domain source code. */ -#include "autoconf.h" -#include "libradius.h" +#include +#include /* * FORCE MD5 TO USE OUR MD5 HEADER FILE! diff --git a/src/lib/misc.c b/src/lib/misc.c index dc98d28..16d5f56 100644 --- a/src/lib/misc.c +++ b/src/lib/misc.c @@ -23,7 +23,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -39,8 +39,8 @@ static const char rcsid[] = #include #include -#include "missing.h" -#include "libradius.h" +#include +#include int librad_dodns = 0; int librad_debug = 0; diff --git a/src/lib/missing.c b/src/lib/missing.c index 32d33bf..06425bd 100644 --- a/src/lib/missing.c +++ b/src/lib/missing.c @@ -23,7 +23,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -33,8 +33,8 @@ static const char rcsid[] = "$Id$"; #include #include -#include "missing.h" -#include "libradius.h" +#include +#include #ifndef HAVE_CRYPT char *crypt(char *key, char *salt) diff --git a/src/lib/print.c b/src/lib/print.c index 873bb0b..d99b610 100644 --- a/src/lib/print.c +++ b/src/lib/print.c @@ -22,7 +22,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -30,8 +30,8 @@ static const char rcsid[] = "$Id$"; #include #include -#include "missing.h" -#include "libradius.h" +#include +#include /* * Convert a string to something printable. diff --git a/src/lib/radius.c b/src/lib/radius.c index 0b256e0..88397f1 100644 --- a/src/lib/radius.c +++ b/src/lib/radius.c @@ -22,8 +22,8 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" -#include "md5.h" +#include +#include #include @@ -36,7 +36,7 @@ static const char rcsid[] = "$Id$"; #include #ifdef WITH_UDPFROMTO -#include "udpfromto.h" +#include #endif #include @@ -49,8 +49,8 @@ static const char rcsid[] = "$Id$"; #include #endif -#include "missing.h" -#include "libradius.h" +#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 7e63fcd..84b219d 100644 --- a/src/lib/rbtree.c +++ b/src/lib/rbtree.c @@ -22,13 +22,13 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include -#include "missing.h" -#include "libradius.h" +#include +#include /* red-black tree description */ typedef enum { Black, Red } NodeColor; diff --git a/src/lib/sha1.c b/src/lib/sha1.c index dd18c3d..6d03f3d 100644 --- a/src/lib/sha1.c +++ b/src/lib/sha1.c @@ -6,7 +6,7 @@ * Version: $Id$ */ -#include "autoconf.h" +#include #include diff --git a/src/lib/snprintf.c b/src/lib/snprintf.c index a29528c..883fbaa 100644 --- a/src/lib/snprintf.c +++ b/src/lib/snprintf.c @@ -49,7 +49,7 @@ */ -#include "autoconf.h" +#include #include "snprintf.h" #ifndef HAVE_VSNPRINTF diff --git a/src/lib/strlcat.c b/src/lib/strlcat.c index f52e748..55de165 100644 --- a/src/lib/strlcat.c +++ b/src/lib/strlcat.c @@ -21,13 +21,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "autoconf.h" +#include #ifndef HAVE_STRLCAT #include #include -#include "missing.h" +#include /* * Appends src to string dst of size siz (unlike strncat, siz is the diff --git a/src/lib/strlcpy.c b/src/lib/strlcpy.c index 5cbb576..2445a00 100644 --- a/src/lib/strlcpy.c +++ b/src/lib/strlcpy.c @@ -21,12 +21,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "autoconf.h" +#include #ifndef HAVE_STRLCPY #include -#include "missing.h" +#include /* * Copy src to string dst of size siz. At most siz-1 characters diff --git a/src/lib/token.c b/src/lib/token.c index 0979d88..2728098 100644 --- a/src/lib/token.c +++ b/src/lib/token.c @@ -25,7 +25,7 @@ #include #include #include -#include "token.h" +#include static const char rcsid[] = "$Id$"; diff --git a/src/lib/udpfromto.c b/src/lib/udpfromto.c index 8dac01f..0362429 100644 --- a/src/lib/udpfromto.c +++ b/src/lib/udpfromto.c @@ -34,7 +34,7 @@ * Version: $Id$ */ -#include "autoconf.h" +#include #ifdef WITH_UDPFROMTO static const char rcsid[] = "$Id$"; @@ -51,7 +51,7 @@ static const char rcsid[] = "$Id$"; #include #include -#include "udpfromto.h" +#include int udpfromto_init(int s) { diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c index d0ba14c..e29005a 100644 --- a/src/lib/valuepair.c +++ b/src/lib/valuepair.c @@ -22,7 +22,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -39,8 +39,8 @@ static const char rcsid[] = "$Id$"; # include #endif -#include "missing.h" -#include "libradius.h" +#include +#include static const char *months[] = { "jan", "feb", "mar", "apr", "may", "jun", diff --git a/src/main/Makefile.in b/src/main/Makefile.in index 35c2453..2b504bc 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -14,7 +14,7 @@ SERVER_OBJS += $(SERVER_SRCS:.c=.o) INCLUDES = ../include/radiusd.h ../include/radius.h ../include/libradius.h ../include/conf.h ../include/autoconf.h -CFLAGS += -I../include +CFLAGS += -I$(top_builddir)/src CFLAGS += -DHOSTINFO=\"${HOSTINFO}\" CFLAGS += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\" CFLAGS += $(SNMP_INCLUDE) diff --git a/src/main/acct.c b/src/main/acct.c index aedc569..bf947b2 100644 --- a/src/main/acct.c +++ b/src/main/acct.c @@ -25,9 +25,9 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" -#include "radiusd.h" -#include "modules.h" +#include +#include +#include /* * rad_accounting: call modules. diff --git a/src/main/auth.c b/src/main/auth.c index 3edb3ef..0c9692e 100644 --- a/src/main/auth.c +++ b/src/main/auth.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -34,9 +34,9 @@ static const char rcsid[] = "$Id$"; # include #endif -#include "radiusd.h" -#include "modules.h" -#include "rad_assert.h" +#include +#include +#include /* * Return a short string showing the terminal server, port diff --git a/src/main/client.c b/src/main/client.c index 064c883..c100420 100644 --- a/src/main/client.c +++ b/src/main/client.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -38,9 +38,9 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "conffile.h" -#include "rad_assert.h" +#include +#include +#include struct radclient_list { /* diff --git a/src/main/conffile.c b/src/main/conffile.c index 67fa016..97afea9 100644 --- a/src/main/conffile.c +++ b/src/main/conffile.c @@ -26,7 +26,7 @@ * Copyright 2000 Alan DeKok */ -#include "autoconf.h" +#include #include #include @@ -45,11 +45,11 @@ #include -#include "radiusd.h" -#include "rad_assert.h" -#include "conffile.h" -#include "token.h" -#include "modules.h" +#include +#include +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/main/crypt.c b/src/main/crypt.c index 1d1dc1f..f4140d7 100644 --- a/src/main/crypt.c +++ b/src/main/crypt.c @@ -18,7 +18,7 @@ * Copyright 2000-2005 The FreeRADIUS server project */ -#include "autoconf.h" +#include #include #ifdef HAVE_CRYPT_H @@ -37,8 +37,8 @@ static int lrad_crypt_init = 0; static pthread_mutex_t lrad_crypt_mutex; #endif -#include "missing.h" -#include "libradius.h" +#include +#include /* * performs a crypt password check in an thread-safe way. diff --git a/src/main/files.c b/src/main/files.c index 4d766e7..e6c1d9b 100644 --- a/src/main/files.c +++ b/src/main/files.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -38,8 +38,8 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "rad_assert.h" +#include +#include /* * Free a PAIR_LIST diff --git a/src/main/listen.c b/src/main/listen.c index 3f4a3fd..55489aa 100644 --- a/src/main/listen.c +++ b/src/main/listen.c @@ -21,7 +21,7 @@ * Copyright 2005 Alan DeKok */ -#include "autoconf.h" +#include #include #include @@ -49,18 +49,18 @@ #endif #ifdef WITH_UDPFROMTO -#include "udpfromto.h" +#include #endif #include -#include "radiusd.h" -#include "rad_assert.h" -#include "conffile.h" -#include "token.h" +#include +#include +#include +#include -#include "radius_snmp.h" -#include "request_list.h" +#include +#include static time_t start_time = 0; diff --git a/src/main/log.c b/src/main/log.c index 7c57219..bba6ed1 100644 --- a/src/main/log.c +++ b/src/main/log.c @@ -25,7 +25,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -34,7 +34,7 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" +#include #ifdef HAVE_SYSLOG_H # include diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c index 905027b..9f3c3ed 100644 --- a/src/main/mainconfig.c +++ b/src/main/mainconfig.c @@ -21,7 +21,7 @@ * Copyright 2002 Alan DeKok */ -#include "autoconf.h" +#include #include #include @@ -34,12 +34,12 @@ #include #endif -#include "radiusd.h" -#include "rad_assert.h" -#include "conffile.h" -#include "token.h" -#include "modules.h" -#include "request_list.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/main/modcall.c b/src/main/modcall.c index ad0f1ab..d9801de 100644 --- a/src/main/modcall.c +++ b/src/main/modcall.c @@ -19,17 +19,17 @@ * * Copyright 2000 The FreeRADIUS server project */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "rad_assert.h" -#include "conffile.h" -#include "modpriv.h" -#include "modules.h" -#include "modcall.h" +#include +#include +#include +#include +#include +#include /* mutually-recursive static functions need a prototype up front */ static modcallable *do_compile_modgroup(int, CONF_SECTION *, const char *, diff --git a/src/main/modules.c b/src/main/modules.c index c118f18..f1c9a44 100644 --- a/src/main/modules.c +++ b/src/main/modules.c @@ -24,19 +24,19 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modpriv.h" -#include "modules.h" -#include "modcall.h" -#include "conffile.h" +#include +#include +#include +#include +#include #include "ltdl.h" -#include "rad_assert.h" +#include typedef struct indexed_modcallable { struct indexed_modcallable *next; diff --git a/src/main/proxy.c b/src/main/proxy.c index 3c15857..723a687 100644 --- a/src/main/proxy.c +++ b/src/main/proxy.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -37,10 +37,10 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "rad_assert.h" -#include "modules.h" -#include "request_list.h" +#include +#include +#include +#include /* * We received a response from a remote radius server. diff --git a/src/main/radclient.c b/src/main/radclient.c index 9993530..cb05c16 100644 --- a/src/main/radclient.c +++ b/src/main/radclient.c @@ -23,7 +23,7 @@ */ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -51,10 +51,10 @@ static const char rcsid[] = "$Id$"; #include -#include "conf.h" -#include "radpaths.h" -#include "missing.h" -#include "libradius.h" +#include +#include +#include +#include static int retries = 10; static float timeout = 3; diff --git a/src/main/radius_snmp.c b/src/main/radius_snmp.c index 321d784..36d340b 100644 --- a/src/main/radius_snmp.c +++ b/src/main/radius_snmp.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #ifdef WITH_SNMP @@ -34,10 +34,10 @@ static const char rcsid[] = #include -#include "smux.h" -#include "radius_snmp.h" -#include "radiusd.h" -#include "conffile.h" +#include +#include +#include +#include extern int need_reload; diff --git a/src/main/radiusd.c b/src/main/radiusd.c index 9d43925..4b3f69a 100644 --- a/src/main/radiusd.c +++ b/src/main/radiusd.c @@ -29,7 +29,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -66,12 +66,12 @@ static const char rcsid[] = # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -#include "radiusd.h" -#include "rad_assert.h" -#include "conffile.h" -#include "modules.h" -#include "request_list.h" -#include "radius_snmp.h" +#include +#include +#include +#include +#include +#include #define SLEEP_FOREVER (65536) diff --git a/src/main/radwho.c b/src/main/radwho.c index 02d58ad..292786a 100644 --- a/src/main/radwho.c +++ b/src/main/radwho.c @@ -26,7 +26,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -38,10 +38,10 @@ static const char rcsid[] = #include #endif -#include "sysutmp.h" -#include "radutmp.h" -#include "radiusd.h" -#include "conffile.h" +#include +#include +#include +#include /* * FIXME: put in header file. diff --git a/src/main/request_list.c b/src/main/request_list.c index d9b4240..2f2e21a 100644 --- a/src/main/request_list.c +++ b/src/main/request_list.c @@ -22,16 +22,16 @@ */ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "rad_assert.h" -#include "request_list.h" -#include "radius_snmp.h" +#include +#include +#include +#include struct request_list_t { lrad_hash_table_t *ht; diff --git a/src/main/request_process.c b/src/main/request_process.c index 852db3a..17011c1 100755 --- a/src/main/request_process.c +++ b/src/main/request_process.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -37,9 +37,9 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "rad_assert.h" -#include "modules.h" +#include +#include +#include /* diff --git a/src/main/session.c b/src/main/session.c index bde2249..90fe9b3 100644 --- a/src/main/session.c +++ b/src/main/session.c @@ -21,7 +21,7 @@ */ -#include "autoconf.h" +#include #include #include @@ -39,8 +39,8 @@ #include #endif -#include "radiusd.h" -#include "rad_assert.h" +#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 b6cd912..bbd9df2 100644 --- a/src/main/smux.c +++ b/src/main/smux.c @@ -25,7 +25,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #ifdef WITH_SNMP @@ -43,9 +43,9 @@ static const char rcsid[] = #include #include -#include "radiusd.h" -#include "radius_snmp.h" -#include "smux.h" +#include +#include +#include #define min(A,B) ((A) < (B) ? (A) : (B)) diff --git a/src/main/threads.c b/src/main/threads.c index 6a44b04..b513037 100644 --- a/src/main/threads.c +++ b/src/main/threads.c @@ -21,7 +21,7 @@ * Copyright 2000 Alan DeKok */ -#include "autoconf.h" +#include #include #include @@ -51,10 +51,10 @@ #include #endif -#include "radiusd.h" -#include "rad_assert.h" -#include "conffile.h" -#include "modules.h" +#include +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/main/util.c b/src/main/util.c index 8e49e65..cca623a 100644 --- a/src/main/util.c +++ b/src/main/util.c @@ -22,7 +22,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -41,8 +41,8 @@ static const char rcsid[] = "$Id$"; #include #endif -#include "radiusd.h" -#include "rad_assert.h" +#include +#include /* * The signal() function in Solaris 2.5.1 sets SA_NODEFER in diff --git a/src/main/valuepair.c b/src/main/valuepair.c index 0b6b254..33c1257 100644 --- a/src/main/valuepair.c +++ b/src/main/valuepair.c @@ -24,7 +24,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -51,7 +51,7 @@ static const char rcsid[] = "$Id$"; #endif #endif -#include "radiusd.h" +#include struct cmp { int attribute; diff --git a/src/main/version.c b/src/main/version.c index 4173fdc..b0bb114 100644 --- a/src/main/version.c +++ b/src/main/version.c @@ -24,11 +24,11 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include -#include "radiusd.h" +#include /* * Display the revision number for this program diff --git a/src/main/xlat.c b/src/main/xlat.c index a90b9a4..9bbf470 100644 --- a/src/main/xlat.c +++ b/src/main/xlat.c @@ -25,16 +25,16 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" +#include -#include "rad_assert.h" +#include typedef struct xlat_t { char module[MAX_STRING_LEN]; diff --git a/src/modules/rlm_acct_unique/rlm_acct_unique.c b/src/modules/rlm_acct_unique/rlm_acct_unique.c index 29b2f54..8c4ce24 100644 --- a/src/modules/rlm_acct_unique/rlm_acct_unique.c +++ b/src/modules/rlm_acct_unique/rlm_acct_unique.c @@ -18,15 +18,15 @@ * Copyright 2000 The FreeRADIUS server project */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" +#include +#include /* * Room for at least 16 attributes. diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c index 370f7d4..0455b8a 100644 --- a/src/modules/rlm_always/rlm_always.c +++ b/src/modules/rlm_always/rlm_always.c @@ -18,15 +18,15 @@ * Copyright 2000 The FreeRADIUS server project */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c index c6e0f95..31e12be 100644 --- a/src/modules/rlm_attr_filter/rlm_attr_filter.c +++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c @@ -22,7 +22,7 @@ * Copyright (C) 2001 Chris Parker */ -#include "autoconf.h" +#include #include @@ -33,9 +33,9 @@ #include #include -#include "radiusd.h" -#include "rad_assert.h" -#include "modules.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c b/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c index 59901d4..dbbf0d3 100644 --- a/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c +++ b/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c @@ -21,7 +21,7 @@ * Copyright 2002 Kostas Kalevras */ -#include "autoconf.h" +#include #include #include @@ -30,9 +30,9 @@ # include #endif -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #define RLM_REGEX_INPACKET 0 #define RLM_REGEX_INCONFIG 1 diff --git a/src/modules/rlm_caching/rlm_caching.c b/src/modules/rlm_caching/rlm_caching.c index 20307c6..3bf1e1e 100644 --- a/src/modules/rlm_caching/rlm_caching.c +++ b/src/modules/rlm_caching/rlm_caching.c @@ -23,16 +23,16 @@ */ #include "config.h" -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #include #include diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c index 5662cc6..0895275 100644 --- a/src/modules/rlm_chap/rlm_chap.c +++ b/src/modules/rlm_chap/rlm_chap.c @@ -25,15 +25,15 @@ * - Added module messages when rejecting user */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_checkval/rlm_checkval.c b/src/modules/rlm_checkval/rlm_checkval.c index b26a1d0..d876e64 100644 --- a/src/modules/rlm_checkval/rlm_checkval.c +++ b/src/modules/rlm_checkval/rlm_checkval.c @@ -21,15 +21,15 @@ * Copyright 2003 Kostas Kalevras */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#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 a78a896..0b2a676 100644 --- a/src/modules/rlm_copy_packet/rlm_copy_packet.c +++ b/src/modules/rlm_copy_packet/rlm_copy_packet.c @@ -21,14 +21,14 @@ * Copyright 2004 Alan DeKok */ -#include "autoconf.h" +#include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_counter/rlm_counter.c b/src/modules/rlm_counter/rlm_counter.c index 8afac56..5629b00 100644 --- a/src/modules/rlm_counter/rlm_counter.c +++ b/src/modules/rlm_counter/rlm_counter.c @@ -23,16 +23,16 @@ */ #include "config.h" -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #include #include diff --git a/src/modules/rlm_cram/rlm_cram.c b/src/modules/rlm_cram/rlm_cram.c index a243c2b..4b619a5 100644 --- a/src/modules/rlm_cram/rlm_cram.c +++ b/src/modules/rlm_cram/rlm_cram.c @@ -41,19 +41,19 @@ * (c) 2002 by SANDY (http://www.sandy.ru/) under GPL */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" +#include +#include -#include "md4.h" -#include "md5.h" -#include "sha1.h" +#include +#include +#include #define SM_AUTHTYPE ((11406<<16)|101) diff --git a/src/modules/rlm_dbm/rlm_dbm.c b/src/modules/rlm_dbm/rlm_dbm.c index debcd80..ae4d27f 100644 --- a/src/modules/rlm_dbm/rlm_dbm.c +++ b/src/modules/rlm_dbm/rlm_dbm.c @@ -20,7 +20,7 @@ * Copyright 2001 Koulik Andrei, Sandy Service */ -#include "autoconf.h" +#include #include #include @@ -39,8 +39,8 @@ #include -#include "radiusd.h" -#include "modules.h" +#include +#include #ifdef SANDY_MOD # include "sandymod.h" diff --git a/src/modules/rlm_dbm/rlm_dbm_cat.c b/src/modules/rlm_dbm/rlm_dbm_cat.c index cdc20c8..75a1761 100644 --- a/src/modules/rlm_dbm/rlm_dbm_cat.c +++ b/src/modules/rlm_dbm/rlm_dbm_cat.c @@ -20,7 +20,7 @@ * Copyright 2001 Koulik Andrei, Sandy Service */ -#include "autoconf.h" +#include #include #include #include diff --git a/src/modules/rlm_dbm/rlm_dbm_parser.c b/src/modules/rlm_dbm/rlm_dbm_parser.c index a212c29..b5422bf 100644 --- a/src/modules/rlm_dbm/rlm_dbm_parser.c +++ b/src/modules/rlm_dbm/rlm_dbm_parser.c @@ -24,7 +24,7 @@ char sccsid[] = "$Id$ sandy module project\n Copyright 2001 Sandy Service\nCopyright 2001 Koulik Andrei"; -#include "autoconf.h" +#include #include #include @@ -45,11 +45,11 @@ char sccsid[] = #include #include -#include "radiusd.h" +#include -#include "conf.h" -#include "radpaths.h" -#include "missing.h" +#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 60fc3bd..d2e1a3f 100644 --- a/src/modules/rlm_detail/rlm_detail.c +++ b/src/modules/rlm_detail/rlm_detail.c @@ -22,7 +22,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -32,9 +32,9 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "modules.h" -#include "rad_assert.h" +#include +#include +#include #define DIRLEN 8192 diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c index 82d3bdc..9db1334 100644 --- a/src/modules/rlm_digest/rlm_digest.c +++ b/src/modules/rlm_digest/rlm_digest.c @@ -21,16 +21,16 @@ * Copyright 2002 Alan DeKok */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" -#include "rad_assert.h" +#include +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_eap/Makefile.in b/src/modules/rlm_eap/Makefile.in index 5973199..3057064 100644 --- a/src/modules/rlm_eap/Makefile.in +++ b/src/modules/rlm_eap/Makefile.in @@ -1,7 +1,7 @@ TARGET = @targetname@ SRCS = rlm_eap.c eap.c mem.c state.c HEADERS = eap.h rlm_eap.h -RLM_CFLAGS = $(INCLTDL) -I@srcdir@/libeap +RLM_CFLAGS = $(INCLTDL) -I$(top_builddir)/src/modules/rlm_eap/libeap CLIENTLIBS = libeap/libeap.la -L../../lib -lradius RLM_LIBS = libeap/libeap.la $(LIBLTDL) #RLM_LIBS = $(shell for x in types/rlm_eap*/rlm_eap*.la;do echo -dlpreopen $$x;done) diff --git a/src/modules/rlm_eap/eap.h b/src/modules/rlm_eap/eap.h index 35b9688..64c24ac 100644 --- a/src/modules/rlm_eap/eap.h +++ b/src/modules/rlm_eap/eap.h @@ -23,7 +23,7 @@ #ifndef _EAP_H #define _EAP_H -#include "autoconf.h" +#include #ifdef HAVE_SYS_TYPES_H #include @@ -36,10 +36,10 @@ #include #include -#include "radiusd.h" -#include "modules.h" +#include +#include -#include "rad_assert.h" +#include #include "eap_types.h" diff --git a/src/modules/rlm_eap/libeap/eap_types.h b/src/modules/rlm_eap/libeap/eap_types.h index 5cd513e..5adc913 100644 --- a/src/modules/rlm_eap/libeap/eap_types.h +++ b/src/modules/rlm_eap/libeap/eap_types.h @@ -36,10 +36,10 @@ #include #include -#include "radiusd.h" -#include "modules.h" +#include +#include -#include "rad_assert.h" +#include #define PW_EAP_REQUEST 1 #define PW_EAP_RESPONSE 2 diff --git a/src/modules/rlm_eap/libeap/eapcommon.c b/src/modules/rlm_eap/libeap/eapcommon.c index 5e085ea..eea929c 100644 --- a/src/modules/rlm_eap/libeap/eapcommon.c +++ b/src/modules/rlm_eap/libeap/eapcommon.c @@ -57,9 +57,9 @@ * */ -#include "autoconf.h" -#include "missing.h" -#include "libradius.h" +#include +#include +#include #include "eap_types.h" static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_eap/libeap/eapcrypto.c b/src/modules/rlm_eap/libeap/eapcrypto.c index 81ea2ab..74a92a0 100644 --- a/src/modules/rlm_eap/libeap/eapcrypto.c +++ b/src/modules/rlm_eap/libeap/eapcrypto.c @@ -25,16 +25,16 @@ * */ -#include "autoconf.h" +#include #include #include #include "eap_types.h" #include "eap_sim.h" -#include "sha1.h" +#include -#include +#include void eapsim_calculate_keys(struct eapsim_keys *ek) { diff --git a/src/modules/rlm_eap/libeap/eapsimlib.c b/src/modules/rlm_eap/libeap/eapsimlib.c index aeaa68f..7b71101 100644 --- a/src/modules/rlm_eap/libeap/eapsimlib.c +++ b/src/modules/rlm_eap/libeap/eapsimlib.c @@ -48,12 +48,12 @@ * */ -#include "autoconf.h" -#include "missing.h" -#include "libradius.h" +#include +#include +#include #include "eap_types.h" #include "eap_sim.h" -#include "sha1.h" +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_eap/libeap/fips186prf.c b/src/modules/rlm_eap/libeap/fips186prf.c index f0f01e4..06280bb 100644 --- a/src/modules/rlm_eap/libeap/fips186prf.c +++ b/src/modules/rlm_eap/libeap/fips186prf.c @@ -43,7 +43,7 @@ * */ -#include "autoconf.h" +#include #include #include @@ -61,9 +61,9 @@ #include #endif -#include +#include -#include "sha1.h" +#include /* * we do it in 8-bit chunks, because we have to keep the numbers @@ -266,7 +266,17 @@ main(int argc, char *argv[]) /* * $Log$ - * Revision 1.4 2005-09-21 03:02:40 nbk + * Revision 1.5 2005-11-11 00:32:58 aland + * Include files used to build the server are now + * If this is bad, we can easily change it in the future to something + * like . + * + * Also, updated rlm_sqlippool to build with the recent cleanups. + * + * The work was done via a Perl script, and the server rebuilt & + * tested to be sure it works. + * + * Revision 1.4 2005/09/21 03:02:40 nbk * Fix compilation warnings. * * Revision 1.3 2004/02/26 19:04:30 aland diff --git a/src/modules/rlm_eap/radeapclient.c b/src/modules/rlm_eap/radeapclient.c index 6de007c..852705e 100644 --- a/src/modules/rlm_eap/radeapclient.c +++ b/src/modules/rlm_eap/radeapclient.c @@ -23,7 +23,7 @@ */ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -49,10 +49,10 @@ static const char rcsid[] = "$Id$"; # include #endif -#include "conf.h" -#include "radpaths.h" -#include "missing.h" -#include "../include/md5.h" +#include +#include +#include +#include #include "eap_types.h" #include "eap_sim.h" diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c index f1cfef0..52f2b48 100644 --- a/src/modules/rlm_eap/rlm_eap.c +++ b/src/modules/rlm_eap/rlm_eap.c @@ -22,9 +22,9 @@ * Copyright 2003 Alan DeKok */ -#include "autoconf.h" +#include #include "rlm_eap.h" -#include "modules.h" +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c index f349252..8919ab3 100644 --- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c +++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c @@ -20,14 +20,14 @@ * Copyright 2003 The FreeRADIUS server project */ -#include "autoconf.h" +#include #include #include #include "eap.h" -#include +#include /* * EAP-GTC is just ASCII data carried inside of the EAP session. diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c b/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c index 878eef2..141d261 100644 --- a/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c +++ b/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c @@ -20,7 +20,7 @@ * Copyright 2003 Alan DeKok */ -#include "autoconf.h" +#include #include #include diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c index c87ade4..ce9baa6 100644 --- a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c +++ b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c @@ -21,14 +21,14 @@ * Copyright 2001 hereUare Communications, Inc. */ -#include "autoconf.h" +#include #include #include #include "eap_md5.h" -#include +#include /* * Initiate the EAP-MD5 session by sending a challenge to the peer. diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index d164aeb..06582f1 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -20,14 +20,14 @@ * Copyright 2003 The FreeRADIUS server project */ -#include "autoconf.h" +#include #include #include #include "eap_mschapv2.h" -#include +#include typedef struct rlm_eap_mschapv2_t { int with_ntdomain_hack; diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c index 37f1973..53be018 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c +++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c @@ -20,7 +20,7 @@ * Copyright 2003 Alan DeKok */ -#include "autoconf.h" +#include #include "rlm_eap_tls.h" #include "eap_peap.h" diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c index 8244e64..dd9d561 100644 --- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c +++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c @@ -25,7 +25,7 @@ * */ -#include "autoconf.h" +#include #include #include @@ -34,7 +34,7 @@ #include "eap_types.h" #include "eap_sim.h" -#include +#include struct eap_sim_server_state { enum eapsim_serverstates state; @@ -621,7 +621,17 @@ EAP_TYPE rlm_eap_sim = { /* * $Log$ - * Revision 1.13 2005-09-01 21:51:08 aland + * Revision 1.14 2005-11-11 00:32:59 aland + * Include files used to build the server are now + * If this is bad, we can easily change it in the future to something + * like . + * + * Also, updated rlm_sqlippool to build with the recent cleanups. + * + * The work was done via a Perl script, and the server rebuilt & + * tested to be sure it works. + * + * Revision 1.13 2005/09/01 21:51:08 aland * s/->strvalue/->vp_strvalue/g * * Update libradius.h with a union of data, so that we can move diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c index f962189..ad1d886 100644 --- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c +++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c @@ -21,7 +21,7 @@ * Copyright 2003 Alan DeKok */ -#include "autoconf.h" +#include #include "eap_tls.h" #ifdef HAVE_OPENSSL_RAND_H diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c index 45515c0..20d651d 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c @@ -20,7 +20,7 @@ * Copyright 2003 Alan DeKok */ -#include "autoconf.h" +#include #include "eap_ttls.h" diff --git a/src/modules/rlm_example/rlm_example.c b/src/modules/rlm_example/rlm_example.c index 839d23c..689fd6a 100644 --- a/src/modules/rlm_example/rlm_example.c +++ b/src/modules/rlm_example/rlm_example.c @@ -21,14 +21,14 @@ * Copyright 2000 your name */ -#include "autoconf.h" +#include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_exec/exec.c b/src/modules/rlm_exec/exec.c index 65a99c1..b9454f7 100644 --- a/src/modules/rlm_exec/exec.c +++ b/src/modules/rlm_exec/exec.c @@ -21,7 +21,7 @@ */ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -45,8 +45,8 @@ static const char rcsid[] = "$Id$"; # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -#include "radiusd.h" -#include "rad_assert.h" +#include +#include #define MAX_ARGV (256) /* diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c index 8940c3d..d2f9f2a 100644 --- a/src/modules/rlm_exec/rlm_exec.c +++ b/src/modules/rlm_exec/rlm_exec.c @@ -21,15 +21,15 @@ * Copyright 2002 Alan DeKok */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_expiration/rlm_expiration.c b/src/modules/rlm_expiration/rlm_expiration.c index fd7558d..cee5a26 100644 --- a/src/modules/rlm_expiration/rlm_expiration.c +++ b/src/modules/rlm_expiration/rlm_expiration.c @@ -21,16 +21,16 @@ * Copyright 2004 Kostas Kalevras */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_expr/paircmp.c b/src/modules/rlm_expr/paircmp.c index d597cc7..e3fb501 100644 --- a/src/modules/rlm_expr/paircmp.c +++ b/src/modules/rlm_expr/paircmp.c @@ -23,13 +23,13 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" +#include /* diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c index 6e7a6c0..6bdecd4 100644 --- a/src/modules/rlm_expr/rlm_expr.c +++ b/src/modules/rlm_expr/rlm_expr.c @@ -21,15 +21,15 @@ * Copyright 2002 Alan DeKok */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_fastusers/rlm_fastusers.c b/src/modules/rlm_fastusers/rlm_fastusers.c index d67e502..ceaa28a 100644 --- a/src/modules/rlm_fastusers/rlm_fastusers.c +++ b/src/modules/rlm_fastusers/rlm_fastusers.c @@ -22,7 +22,7 @@ * Copyright 2000 Jeff Carneal */ -#include "autoconf.h" +#include #include #include @@ -37,8 +37,8 @@ #include #include -#include "radiusd.h" -#include "modules.h" +#include +#include struct fastuser_instance { char *compat_mode; diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c index 1dbaedc..8fdb292 100644 --- a/src/modules/rlm_files/rlm_files.c +++ b/src/modules/rlm_files/rlm_files.c @@ -23,7 +23,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -34,8 +34,8 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "modules.h" +#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 5356319..bb8eb7a 100644 --- a/src/modules/rlm_ippool/rlm_ippool.c +++ b/src/modules/rlm_ippool/rlm_ippool.c @@ -56,7 +56,7 @@ */ #include "config.h" -#include "autoconf.h" +#include #include #include @@ -79,9 +79,9 @@ #include #endif -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #include "../../include/md5.h" #include diff --git a/src/modules/rlm_ippool/rlm_ippool_tool.c b/src/modules/rlm_ippool/rlm_ippool_tool.c index 0c9cd6e..592a1df 100755 --- a/src/modules/rlm_ippool/rlm_ippool_tool.c +++ b/src/modules/rlm_ippool/rlm_ippool_tool.c @@ -53,7 +53,7 @@ SUCH DAMAGE. */ -#include "autoconf.h" +#include #include #include #include @@ -65,8 +65,8 @@ #include #include #include "../../include/md5.h" -#include "missing.h" -#include "libradius.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 ff7928a..544344c 100644 --- a/src/modules/rlm_krb5/rlm_krb5.c +++ b/src/modules/rlm_krb5/rlm_krb5.c @@ -25,14 +25,14 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" +#include +#include /* krb5 includes */ #include diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c index a9d2110..52611c0 100644 --- a/src/modules/rlm_ldap/rlm_ldap.c +++ b/src/modules/rlm_ldap/rlm_ldap.c @@ -19,7 +19,7 @@ */ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -41,10 +41,10 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "conffile.h" -#include "modules.h" -#include "rad_assert.h" +#include +#include +#include +#include #ifndef HAVE_PTHREAD_H /* diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c index eb7f6a4..8b2c18f 100755 --- a/src/modules/rlm_linelog/rlm_linelog.c +++ b/src/modules/rlm_linelog/rlm_linelog.c @@ -21,7 +21,7 @@ * Copyright 2004 Alan DeKok */ -#include "autoconf.h" +#include #include #include @@ -34,9 +34,9 @@ #include #endif -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c index 54a4ac0..f4830cd 100644 --- a/src/modules/rlm_logintime/rlm_logintime.c +++ b/src/modules/rlm_logintime/rlm_logintime.c @@ -21,16 +21,16 @@ * Copyright 2004 Kostas Kalevras */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_logintime/timestr.c b/src/modules/rlm_logintime/timestr.c index 655b354..b787bcf 100644 --- a/src/modules/rlm_logintime/timestr.c +++ b/src/modules/rlm_logintime/timestr.c @@ -23,14 +23,14 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" +#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 e074cb1..9f420e6 100644 --- a/src/modules/rlm_mschap/rlm_mschap.c +++ b/src/modules/rlm_mschap/rlm_mschap.c @@ -42,20 +42,20 @@ /* MPPE support from Takahiro Wagatsuma */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" +#include +#include -#include "md4.h" -#include "md5.h" -#include "sha1.h" -#include "rad_assert.h" +#include +#include +#include +#include #include "smbdes.h" diff --git a/src/modules/rlm_mschap/smbencrypt.c b/src/modules/rlm_mschap/smbencrypt.c index 601a580..ae00e1d 100644 --- a/src/modules/rlm_mschap/smbencrypt.c +++ b/src/modules/rlm_mschap/smbencrypt.c @@ -19,13 +19,13 @@ * Copyright 2002 3APA3A for FreeRADIUS project */ -#include "autoconf.h" +#include #include #include #include #include -#include "md4.h" +#include #include "smbdes.h" diff --git a/src/modules/rlm_otp/otp_pwe.c b/src/modules/rlm_otp/otp_pwe.c index 64d4f39..0eac7fc 100644 --- a/src/modules/rlm_otp/otp_pwe.c +++ b/src/modules/rlm_otp/otp_pwe.c @@ -29,7 +29,7 @@ #ifdef FREERADIUS #define _LRAD_MD4_H #define _LRAD_SHA1_H -#include "rad_assert.h" +#include #endif #include "otp.h" #include "otp_pwe.h" diff --git a/src/modules/rlm_otp/otp_rad.h b/src/modules/rlm_otp/otp_rad.h index 09ce0c5..dfad2d3 100644 --- a/src/modules/rlm_otp/otp_rad.h +++ b/src/modules/rlm_otp/otp_rad.h @@ -23,8 +23,8 @@ #ifndef OTP_RAD_H #define OTP_RAD_H -#include "autoconf.h" -#include "radiusd.h" +#include +#include #define OTP_LOG_DEBUG L_DBG #define OTP_LOG_ERR L_ERR #define OTP_LOG_AUTH L_AUTH @@ -37,7 +37,7 @@ extern int otp_gen_state(char **, unsigned char **, int32_t, int32_t, const unsigned char [16]); /* otp_pwe.c */ -#include "libradius.h" /* VALUE_PAIR */ +#include /* VALUE_PAIR */ struct otp_pwe_cmp_t { const REQUEST *request; const otp_option_t *inst; diff --git a/src/modules/rlm_otp/otp_rlm.c b/src/modules/rlm_otp/otp_rlm.c index 4a74acb..a138408 100644 --- a/src/modules/rlm_otp/otp_rlm.c +++ b/src/modules/rlm_otp/otp_rlm.c @@ -49,7 +49,7 @@ #include "otp.h" #ifdef FREERADIUS -#include "modules.h" +#include #endif static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_pam/rlm_pam.c b/src/modules/rlm_pam/rlm_pam.c index 737d13e..2ac6801 100644 --- a/src/modules/rlm_pam/rlm_pam.c +++ b/src/modules/rlm_pam/rlm_pam.c @@ -28,7 +28,7 @@ * Copyright 1999 miguel a.l. paraz */ -#include "autoconf.h" +#include #include "config.h" @@ -49,8 +49,8 @@ #include #endif -#include "radiusd.h" -#include "modules.h" +#include +#include typedef struct rlm_pam_t { const char *pam_auth_name; diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c index 7a561d5..44f342b 100644 --- a/src/modules/rlm_pap/rlm_pap.c +++ b/src/modules/rlm_pap/rlm_pap.c @@ -21,7 +21,7 @@ * Copyright 2001 Kostas Kalevras */ -#include "autoconf.h" +#include #include #include @@ -29,9 +29,9 @@ #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#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 298ee03..6779d11 100644 --- a/src/modules/rlm_passwd/rlm_passwd.c +++ b/src/modules/rlm_passwd/rlm_passwd.c @@ -21,9 +21,9 @@ #include #include #include -#include "autoconf.h" -#include "radiusd.h" -#include "modules.h" +#include +#include +#include struct mypasswd { diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c index 4b849dd..1ef0999 100644 --- a/src/modules/rlm_perl/rlm_perl.c +++ b/src/modules/rlm_perl/rlm_perl.c @@ -21,15 +21,15 @@ * Copyright 2002 Boian Jordanov */ -#include "autoconf.h" +#include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #ifdef DEBUG #undef DEBUG diff --git a/src/modules/rlm_policy/parse.c b/src/modules/rlm_policy/parse.c index 129ad2e..e699976 100644 --- a/src/modules/rlm_policy/parse.c +++ b/src/modules/rlm_policy/parse.c @@ -30,7 +30,7 @@ #endif #endif -#include +#include const LRAD_NAME_NUMBER policy_return_codes[] = { { "reject", RLM_MODULE_REJECT }, diff --git a/src/modules/rlm_policy/rlm_policy.c b/src/modules/rlm_policy/rlm_policy.c index e905f4e..53bd061 100644 --- a/src/modules/rlm_policy/rlm_policy.c +++ b/src/modules/rlm_policy/rlm_policy.c @@ -22,8 +22,8 @@ #include "rlm_policy.h" -#include "modules.h" -#include "conffile.h" +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_policy/rlm_policy.h b/src/modules/rlm_policy/rlm_policy.h index 3eb54bb..de94023 100644 --- a/src/modules/rlm_policy/rlm_policy.h +++ b/src/modules/rlm_policy/rlm_policy.h @@ -22,7 +22,7 @@ #ifndef _RLM_POLICY_H #define _RLM_POLICY_H -#include "autoconf.h" +#include #ifdef HAVE_SYS_TYPES_H #include @@ -31,11 +31,11 @@ #include #include -#include "radiusd.h" -#include "modules.h" -#include "modcall.h" +#include +#include +#include -#include "rad_assert.h" +#include /* * Internal lexer. diff --git a/src/modules/rlm_preprocess/rlm_preprocess.c b/src/modules/rlm_preprocess/rlm_preprocess.c index 1f929dd..2d84d8a 100644 --- a/src/modules/rlm_preprocess/rlm_preprocess.c +++ b/src/modules/rlm_preprocess/rlm_preprocess.c @@ -25,7 +25,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -34,9 +34,9 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "modules.h" -#include "rad_assert.h" +#include +#include +#include typedef struct rlm_preprocess_t { char *huntgroup_file; diff --git a/src/modules/rlm_protocol_filter/rlm_protocol_filter.c b/src/modules/rlm_protocol_filter/rlm_protocol_filter.c index 2ee767d..b70a7f5 100755 --- a/src/modules/rlm_protocol_filter/rlm_protocol_filter.c +++ b/src/modules/rlm_protocol_filter/rlm_protocol_filter.c @@ -20,14 +20,14 @@ * Copyright 2004 Cladju Consulting, Inc. */ -#include "autoconf.h" +#include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c index 96a6d5a..f112c4f 100644 --- a/src/modules/rlm_python/rlm_python.c +++ b/src/modules/rlm_python/rlm_python.c @@ -23,14 +23,14 @@ #include -#include "autoconf.h" +#include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c index 2380f50..adc88b0 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp.c +++ b/src/modules/rlm_radutmp/rlm_radutmp.c @@ -21,7 +21,7 @@ * FIXME add copyrights */ -#include "autoconf.h" +#include #include #include @@ -35,10 +35,10 @@ #include "config.h" -#include "radiusd.h" -#include "radutmp.h" -#include "modules.h" -#include "rad_assert.h" +#include +#include +#include +#include #define LOCK_LEN sizeof(struct radutmp) diff --git a/src/modules/rlm_radutmp/rlm_radutmp2.c b/src/modules/rlm_radutmp/rlm_radutmp2.c index 960758d..cd6940d 100644 --- a/src/modules/rlm_radutmp/rlm_radutmp2.c +++ b/src/modules/rlm_radutmp/rlm_radutmp2.c @@ -20,7 +20,7 @@ * Copyright 2000,2001,2002,2003,2004 The FreeRADIUS server project */ -#include "autoconf.h" +#include #include #include @@ -34,10 +34,10 @@ #include "config.h" -#include "radiusd.h" -#include "radutmp.h" -#include "modules.h" -#include "rad_assert.h" +#include +#include +#include +#include #define LOCK_LEN sizeof(struct radutmp) diff --git a/src/modules/rlm_realm/rlm_realm.c b/src/modules/rlm_realm/rlm_realm.c index 42fd34f..e6eda2e 100644 --- a/src/modules/rlm_realm/rlm_realm.c +++ b/src/modules/rlm_realm/rlm_realm.c @@ -21,7 +21,7 @@ * FIXME add copyrights */ -#include "autoconf.h" +#include #include #include @@ -35,8 +35,8 @@ #include #endif -#include "radiusd.h" -#include "modules.h" +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_sim_files/rlm_sim_files.c b/src/modules/rlm_sim_files/rlm_sim_files.c index 0259d03..1f76025 100644 --- a/src/modules/rlm_sim_files/rlm_sim_files.c +++ b/src/modules/rlm_sim_files/rlm_sim_files.c @@ -55,7 +55,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include @@ -66,8 +66,8 @@ static const char rcsid[] = "$Id$"; #include #include -#include "radiusd.h" -#include "modules.h" +#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 51a30cd..8fce723 100644 --- a/src/modules/rlm_smb/rfcnb-util.c +++ b/src/modules/rlm_smb/rfcnb-util.c @@ -25,8 +25,8 @@ #include -#include "autoconf.h" -#include "libradius.h" +#include +#include #include "std-includes.h" #include "rfcnb-priv.h" #include "rfcnb-util.h" diff --git a/src/modules/rlm_smb/rlm_smb.c b/src/modules/rlm_smb/rlm_smb.c index 0d814e1..a0dec12 100644 --- a/src/modules/rlm_smb/rlm_smb.c +++ b/src/modules/rlm_smb/rlm_smb.c @@ -21,14 +21,14 @@ * Copyright 2002 Alan DeKok */ -#include "autoconf.h" +#include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #include "valid.h" diff --git a/src/modules/rlm_sql/Makefile.in b/src/modules/rlm_sql/Makefile.in index f094cf8..d16566f 100644 --- a/src/modules/rlm_sql/Makefile.in +++ b/src/modules/rlm_sql/Makefile.in @@ -1,8 +1,8 @@ TARGET = @targetname@ SRCS = rlm_sql.c sql.c -HEADERS = rlm_sql.h +HEADERS = rlm_sql.h rlm_sql_conf.h RLM_INSTALL = install-drivers -RLM_CFLAGS = $(INCLTDL) +RLM_CFLAGS = $(INCLTDL) -I$(top_builddir)/src/modules/rlm_sql RLM_LIBS = $(LIBLTDL) RLM_SUBDIRS = drivers 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 6001a96..673b4c2 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 @@ -28,14 +28,14 @@ * by Joerg Wendland */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" +#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 11dedab..f6a9c2c 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 @@ -21,7 +21,7 @@ * Copyright 2000 Jeff Carneal */ -#include "autoconf.h" +#include #include #include @@ -32,7 +32,7 @@ #include #include -#include "radiusd.h" +#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 c866800..9488b3e 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 @@ -22,14 +22,14 @@ * Copyright 2000 Alan DeKok */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" +#include #include "config.h" 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 4e1dcf0..78002ea 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 @@ -19,7 +19,7 @@ * Copyright 2000 David Kerry */ -#include "autoconf.h" +#include #include #include @@ -27,7 +27,7 @@ #include #include -#include "radiusd.h" +#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 332b078..6bc90f4 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 @@ -39,14 +39,14 @@ /* Modification of rlm_sql_mysql to handle postgres */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" +#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 6ff4d65..718b814 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 @@ -20,14 +20,14 @@ * Copyright 2000 Mattias Sjostrom */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" +#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 0d7b50d..8b7382f 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 @@ -19,11 +19,11 @@ * Copyright 2000 Dmitri Ageev */ -#include "autoconf.h" +#include #include #include -#include "radiusd.h" +#include #include #include "rlm_sql.h" diff --git a/src/modules/rlm_sql/drivers/rules.mak b/src/modules/rlm_sql/drivers/rules.mak index 1645a64..4b195c8 100644 --- a/src/modules/rlm_sql/drivers/rules.mak +++ b/src/modules/rlm_sql/drivers/rules.mak @@ -37,7 +37,7 @@ all: dynamic ####################################################################### STATIC_OBJS = $(SRCS:.c=.o) DYNAMIC_OBJS = $(SRCS:.c=.lo) -CFLAGS += -I../.. -I../../../../include +CFLAGS += -I../.. -I$(top_builddir)/src/ ####################################################################### # diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index 922adae..0de4694 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -26,7 +26,7 @@ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -42,11 +42,10 @@ static const char rcsid[] = #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include #include "rlm_sql.h" -#include "rad_assert.h" +#include static char *allowed_chars = NULL; diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h index ead8c4b..df5b193 100644 --- a/src/modules/rlm_sql/rlm_sql.h +++ b/src/modules/rlm_sql/rlm_sql.h @@ -15,7 +15,6 @@ #include #include "conf.h" -#include "conffile.h" #define SQLSOCK_LOCKED 0 #define SQLSOCK_UNLOCKED 1 diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c index b4f0cb4..f0b1a0b 100644 --- a/src/modules/rlm_sql/sql.c +++ b/src/modules/rlm_sql/sql.c @@ -24,7 +24,7 @@ * Copyright 2001 Chad Miller */ -#include "autoconf.h" +#include #include #include @@ -45,8 +45,8 @@ #include #include -#include "radiusd.h" -#include "conffile.h" +#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 03da5a7..7068c26 100644 --- a/src/modules/rlm_sql_log/rlm_sql_log.c +++ b/src/modules/rlm_sql_log/rlm_sql_log.c @@ -23,17 +23,17 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include "autoconf.h" +#include #include #include #include #include -#include "libradius.h" -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include +#include static const char rcsid[] = "$Id$"; diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c index 874f8dc..bdbd191 100644 --- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c +++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c @@ -24,16 +24,16 @@ /* This module is based directly on the rlm_counter module */ -#include "autoconf.h" +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #define MAX_QUERY_LEN 1024 diff --git a/src/modules/rlm_sqlippool/Makefile.in b/src/modules/rlm_sqlippool/Makefile.in index a1c0810..4394b6a 100644 --- a/src/modules/rlm_sqlippool/Makefile.in +++ b/src/modules/rlm_sqlippool/Makefile.in @@ -4,8 +4,8 @@ INCLUDE += -I/usr/local/include/ TARGET = @targetname@ SRCS = rlm_sqlippool.c ip_set.c -HEADERS = rlm_sql.h ip_set.h -RLM_CFLAGS = @sqlippool_cflags@ +HEADERS = ip_set.h +RLM_CFLAGS = @sqlippool_cflags@ -I$(top_builddir)/src/modules/rlm_sql RLM_LIBS = @sqlippool_ldflags@ RLM_INSTALL = diff --git a/src/modules/rlm_sqlippool/conf.h b/src/modules/rlm_sqlippool/conf.h deleted file mode 100644 index 25fbeef..0000000 --- a/src/modules/rlm_sqlippool/conf.h +++ /dev/null @@ -1,100 +0,0 @@ -#ifndef SQL_CONF_H -#define SQL_CONF_H -/*************************************************************************** -* conf.h rlm_sql - FreeRADIUS SQL Module * -* * -* Configuration options for the SQL module * -* * -* Mike Machado * -***************************************************************************/ - -typedef struct sql_config { - char *sql_driver; - char *sql_server; - char *sql_port; - char *sql_login; - char *sql_password; - char *sql_db; - char *sql_acct_table; - char *sql_acct_table2; - char *sql_authcheck_table; - char *sql_authreply_table; - char *sql_groupcheck_table; - char *sql_groupreply_table; - char *sql_usergroup_table; - char *sql_nas_table; - char *sql_dict_table; - char *query_user; - char *default_profile; - char *nas_query; - char *authorize_check_query; - char *authorize_reply_query; - char *authorize_group_check_query; - char *authorize_group_reply_query; - char *accounting_onoff_query; - char *accounting_update_query; - char *accounting_update_query_alt; - char *accounting_start_query; - char *accounting_start_query_alt; - char *accounting_stop_query; - char *accounting_stop_query_alt; - char *simul_count_query; - char *simul_verify_query; - char *groupmemb_query; - int sqltrace; - int do_clients; - int read_groups; - char *tracefile; - char *xlat_name; - int deletestalesessions; - int num_sql_socks; - int connect_failure_retry_delay; - char *sql_postauth_table; - char *postauth_query; - char *allowed_chars; - - /* individual driver config */ - void *localcfg; - -} SQL_CONFIG; - - -#define CHECKRAD1 "/usr/sbin/checkrad" -#define CHECKRAD2 "/usr/local/sbin/checkrad" - -/* Hack for funky ascend ports on MAX 4048 (and probably others) - The "NAS-Port-Id" value is "xyyzz" where "x" = 1 for digital, 2 for analog; - "yy" = line number (1 for first PRI/T1/E1, 2 for second, so on); - "zz" = channel number (on the PRI or Channelized T1/E1). - This should work with normal terminal servers, unless you have a TS with - more than 9999 ports ;^). - The "ASCEND_CHANNELS_PER_LINE" is the number of channels for each line into - the unit. For my US/PRI that's 23. A US/T1 would be 24, and a - European E1 would be 30 (I think ... never had one ;^). - This will NOT change the "NAS-Port-Id" reported in the detail log. This - is simply to fix the dynamic IP assignments a la Cistron. - WARNING: This hack works for me, but I only have one PRI!!! I've not - tested it on 2 or more (or with models other than the Max 4048) - Use at your own risk! - -- dgreer@austintx.com -*/ - -#define ASCEND_PORT_HACK -#define ASCEND_CHANNELS_PER_LINE 23 -#define CISCO_ACCOUNTING_HACK - -/* SQL defines */ -#define MAX_QUERY_LEN 4096 -#define SQL_LOCK_LEN MAX_QUERY_LEN -#define SQLTRACEFILE RADLOG_DIR "/sqltrace.sql" - -/* SQL Errors */ -#define SQL_DOWN 1 /* for re-connect */ - -#define MAX_COMMUNITY_LEN 50 -#define MAX_SQL_SOCKS 256 -#define MAX_TABLE_LEN 20 -#define MAX_AUTH_QUERY_LEN 256 -#define AUTH_STRING_LEN 128 - -#endif /* SQL_CONF_H */ diff --git a/src/modules/rlm_sqlippool/ip_set.c b/src/modules/rlm_sqlippool/ip_set.c index ee7140f..e7deca8 100644 --- a/src/modules/rlm_sqlippool/ip_set.c +++ b/src/modules/rlm_sqlippool/ip_set.c @@ -8,17 +8,17 @@ #if 0 #include "config.h" -#include "autoconf.h" -#include "libradius.h" +#include +#include #include #include #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" +#include +#include +#include #endif #include diff --git a/src/modules/rlm_sqlippool/rlm_sql.h b/src/modules/rlm_sqlippool/rlm_sql.h deleted file mode 100644 index ead8c4b..0000000 --- a/src/modules/rlm_sqlippool/rlm_sql.h +++ /dev/null @@ -1,89 +0,0 @@ -/*************************************************************************** -* rlm_sql.h rlm_sql - FreeRADIUS SQL Module * -* * -* Header for main SQL module file * -* * -* Mike Machado * -***************************************************************************/ -#ifndef _RLM_SQL_H -#define _RLM_SQL_H - -#ifdef HAVE_PTHREAD_H -#include -#endif - -#include - -#include "conf.h" -#include "conffile.h" - -#define SQLSOCK_LOCKED 0 -#define SQLSOCK_UNLOCKED 1 - -#define PW_ITEM_CHECK 0 -#define PW_ITEM_REPLY 1 - -typedef char** SQL_ROW; - -typedef struct sql_socket { - int id; -#ifdef HAVE_PTHREAD_H - pthread_mutex_t mutex; -#endif - struct sql_socket *next; - enum { sockconnected, sockunconnected } state; - - void *conn; - SQL_ROW row; -} SQLSOCK; - -typedef struct rlm_sql_module_t { - const char *name; - int (*sql_init_socket)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_destroy_socket)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_query)(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *query); - int (*sql_select_query)(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *query); - int (*sql_store_result)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_num_fields)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_num_rows)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_fetch_row)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_free_result)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - char *(*sql_error)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_close)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_finish_query)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_finish_select_query)(SQLSOCK *sqlsocket, SQL_CONFIG *config); - int (*sql_affected_rows)(SQLSOCK *sqlsocket, SQL_CONFIG *config); -} rlm_sql_module_t; - -typedef struct sql_inst { - time_t connect_after; - SQLSOCK *sqlpool; - SQLSOCK *last_used; - SQL_CONFIG *config; - - lt_dlhandle handle; - rlm_sql_module_t *module; -} SQL_INST; - -typedef struct sql_grouplist { - char groupname[MAX_STRING_LEN]; - struct sql_grouplist *next; -} SQL_GROUPLIST; - - -int sql_init_socketpool(SQL_INST * inst); -void sql_poolfree(SQL_INST * inst); -int sql_close_socket(SQL_INST *inst, SQLSOCK * sqlsocket); -SQLSOCK *sql_get_socket(SQL_INST * inst); -int sql_release_socket(SQL_INST * inst, SQLSOCK * sqlsocket); -int sql_userparse(VALUE_PAIR ** first_pair, SQL_ROW row); -int sql_read_realms(SQLSOCK * sqlsocket); -int sql_getvpdata(SQL_INST * inst, SQLSOCK * sqlsocket, VALUE_PAIR **pair, char *query); -int sql_read_naslist(SQLSOCK * sqlsocket); -int sql_read_clients(SQLSOCK * sqlsocket); -int sql_dict_init(SQLSOCK * sqlsocket); -void query_log(REQUEST *request, SQL_INST * inst, char *querystr); -int rlm_sql_select_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query); -int rlm_sql_query(SQLSOCK *sqlsocket, SQL_INST *inst, char *query); -int rlm_sql_fetch_row(SQLSOCK *sqlsocket, SQL_INST *inst); -#endif diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c index ba94728..5ea7b0b 100644 --- a/src/modules/rlm_sqlippool/rlm_sqlippool.c +++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c @@ -7,8 +7,8 @@ */ #include "config.h" -#include "autoconf.h" -#include "libradius.h" +#include +#include #include #include @@ -16,10 +16,9 @@ #include #include -#include "radiusd.h" -#include "modules.h" -#include "conffile.h" -#include "modpriv.h" +#include +#include +#include #include "rlm_sql.h" #include "ip_set.h" @@ -494,18 +493,20 @@ static int sqlippool_initialize_range(void * instance) { uint32_t ip; uint32_t h_ip; /* ip in host order */ + lrad_ipaddr_t ipaddr; ip_buffer_len = sqlippool_queryn_fetch(ip_buffer, sizeof(ip_buffer), sqlsocket, instance); if (ip_buffer_len == 0) break; - ip = ip_addr(ip_buffer); - if (ip == INADDR_NONE) { + + if (ip_hton(ip_buffer, AF_INET, &ipaddr) < 0) { radlog(L_ERR, "sqlippool_initialize_range: invalid IP number in pool"); /* XXX store and delete */ continue; } + ip = ipaddr.ipaddr.ip4addr.s_addr; h_ip = ntohl(ip); ip_set_add(&ips, h_ip); @@ -736,6 +737,7 @@ static int sqlippool_postauth(void *instance, REQUEST * request) rlm_sqlippool_t * data = (rlm_sqlippool_t *) instance; char allocation[MAX_STRING_LEN]; int allocation_len; + lrad_ipaddr_t ipaddr; uint32_t ip_allocation; VALUE_PAIR * vp; SQLSOCK * sqlsocket; @@ -812,8 +814,7 @@ static int sqlippool_postauth(void *instance, REQUEST * request) return RLM_MODULE_NOOP; } - ip_allocation = ip_addr(allocation); - if (ip_allocation == INADDR_NONE) + if (ip_hton(allocation, AF_INET, &ipaddr) < 0) { /* * Invalid IP number - run INIT-DELETE and complain @@ -835,6 +836,7 @@ static int sqlippool_postauth(void *instance, REQUEST * request) sql_release_socket(data->sql_inst, sqlsocket); return RLM_MODULE_NOOP; } + ip_allocation = ipaddr.ipaddr.ip4addr.s_addr; /* * UPDATE diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c index 6c98bc4..1d2f3c1 100644 --- a/src/modules/rlm_unix/rlm_unix.c +++ b/src/modules/rlm_unix/rlm_unix.c @@ -25,7 +25,7 @@ */ static const char rcsid[] = "$Id$"; -#include "autoconf.h" +#include #include #include @@ -50,9 +50,9 @@ static const char rcsid[] = "$Id$"; # include #endif -#include "radiusd.h" -#include "modules.h" -#include "sysutmp.h" +#include +#include +#include static char trans[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/src/modules/rules.mak b/src/modules/rules.mak index a7edaeb..c38388c 100644 --- a/src/modules/rules.mak +++ b/src/modules/rules.mak @@ -42,7 +42,7 @@ STATIC_OBJS += $(SRCS:.c=.o) STATIC_OBJS += $(SRCS:.cpp=.o) DYNAMIC_OBJS += $(SRCS:.c=.lo) DYNAMIC_OBJS += $(SRCS:.cpp=.lo) -CFLAGS += -I$(RLM_DIR)../../include +CFLAGS += -I$(top_builddir)/src ####################################################################### # -- 2.1.4