9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config.h delenda est

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-19 19:14:26 -05:00
parent fe4224394e
commit 9b8e9eb321
34 changed files with 203 additions and 336 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/client.h
View file

@ -26,11 +26,7 @@
#ifndef INCLUDED_client_h #ifndef INCLUDED_client_h
#define INCLUDED_client_h #define INCLUDED_client_h
#include "config.h" #include "defaults.h"
#if !defined(CONFIG_CHARYBDIS_LEVEL_1)
#error Incorrect config.h for this revision of ircd.
#endif
#include "ircd_defs.h" #include "ircd_defs.h"
#include "channel.h" #include "channel.h"

107
include/config.h
View file

@ -1,107 +0,0 @@
/*
* ircd-ratbox: A slightly useful ircd.
* config.h: The ircd compile-time-configurable header.
*
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2004 ircd-ratbox development team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*/
#ifndef INCLUDED_config_h
#define INCLUDED_config_h
#include "setup.h"
/*
* Directory paths and filenames for UNIX systems.
* IRCD_PREFIX is set using ./configure --prefix, see INSTALL.
* The other defaults should be fine.
*
* NOTE: CHANGING THESE WILL NOT ALTER THE DIRECTORY THAT FILES WILL
* BE INSTALLED TO. IF YOU CHANGE THESE, DO NOT USE MAKE INSTALL,
* BUT COPY THE FILES MANUALLY TO WHERE YOU WANT THEM.
*
* IRCD_PREFIX = prefix for all directories,
* DPATH = root directory of installation,
* BINPATH = directory for binary files,
* ETCPATH = directory for configuration files,
* LOGPATH = directory for logfiles,
* MODPATH = directory for modules,
* AUTOMODPATH = directory for autoloaded modules
*/
/* dirs */
#define DPATH IRCD_PREFIX
#define BINPATH IRCD_PREFIX "/bin/"
#define MODPATH MODULE_DIR
#define AUTOMODPATH MODULE_DIR "/autoload/"
#define ETCPATH ETC_DIR
#define LOGPATH LOG_DIR
#define UHPATH HELP_DIR "/users"
#define HPATH HELP_DIR "/opers"
/* files */
#define SPATH BINPATH "/" PROGRAM_PREFIX "charybdis" /* ircd executable */
#define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */
#define MPATH ETCPATH "/ircd.motd" /* MOTD file */
#define LPATH LOGPATH "/ircd.log" /* ircd logfile */
#define PPATH PKGRUNDIR "/ircd.pid" /* pid file */
#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
#define DBPATH PKGLOCALSTATEDIR "/ban.db" /* bandb file */
/* HANGONGOODLINK and HANGONRETRYDELAY
* Often net breaks for a short time and it's useful to try to
* establishing the same connection again faster than CONNECTFREQUENCY
* would allow. But, to keep trying on bad connection, we require
* that connection has been open for certain minimum time
* (HANGONGOODLINK) and we give the net few seconds to steady
* (HANGONRETRYDELAY). This latter has to be long enough that the
* other end of the connection has time to notice it broke too.
*/
#define HANGONRETRYDELAY 60 /* Recommended value: 30-60 seconds */
#define HANGONGOODLINK 3600 /* Recommended value: 30-60 minutes */
/* KILLCHASETIMELIMIT -
* Max time from the nickname change that still causes KILL
* automatically to switch for the current nick of that user. (seconds)
*/
#define KILLCHASETIMELIMIT 90 /* Recommended value: 90 */
/* CHARYBDIS_SOMAXCONN
* Use SOMAXCONN if OS has it, otherwise use this value for the
* listen(); backlog. 5 for AIX/SUNOS, 25 for other OSs.
*/
#define CHARYBDIS_SOMAXCONN 25
/* MAX_BUFFER
* The amount of fds to reserve for clients exempt from limits
* and dns lookups.
*/
#define MAX_BUFFER 60
/* ----------------------------------------------------------------
* STOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOP
* ----------------------------------------------------------------
* The options below this line should NOT be modified.
* ----------------------------------------------------------------
*/
#define CONFIG_CHARYBDIS_LEVEL_2
#include "defaults.h"
#endif /* INCLUDED_config_h */

107
include/config.h.dist
View file

@ -1,107 +0,0 @@
/*
* ircd-ratbox: A slightly useful ircd.
* config.h: The ircd compile-time-configurable header.
*
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2004 ircd-ratbox development team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*/
#ifndef INCLUDED_config_h
#define INCLUDED_config_h
#include "setup.h"
/*
* Directory paths and filenames for UNIX systems.
* IRCD_PREFIX is set using ./configure --prefix, see INSTALL.
* The other defaults should be fine.
*
* NOTE: CHANGING THESE WILL NOT ALTER THE DIRECTORY THAT FILES WILL
* BE INSTALLED TO. IF YOU CHANGE THESE, DO NOT USE MAKE INSTALL,
* BUT COPY THE FILES MANUALLY TO WHERE YOU WANT THEM.
*
* IRCD_PREFIX = prefix for all directories,
* DPATH = root directory of installation,
* BINPATH = directory for binary files,
* ETCPATH = directory for configuration files,
* LOGPATH = directory for logfiles,
* MODPATH = directory for modules,
* AUTOMODPATH = directory for autoloaded modules
*/
/* dirs */
#define DPATH IRCD_PREFIX
#define BINPATH IRCD_PREFIX "/bin/"
#define MODPATH MODULE_DIR
#define AUTOMODPATH MODULE_DIR "/autoload/"
#define ETCPATH ETC_DIR
#define LOGPATH LOG_DIR
#define UHPATH HELP_DIR "/users"
#define HPATH HELP_DIR "/opers"
/* files */
#define SPATH BINPATH "/" PROGRAM_PREFIX "charybdis" /* ircd executable */
#define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */
#define MPATH ETCPATH "/ircd.motd" /* MOTD file */
#define LPATH LOGPATH "/ircd.log" /* ircd logfile */
#define PPATH PKGRUNDIR "/ircd.pid" /* pid file */
#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
#define DBPATH PKGLOCALSTATEDIR "/ban.db" /* bandb file */
/* HANGONGOODLINK and HANGONRETRYDELAY
* Often net breaks for a short time and it's useful to try to
* establishing the same connection again faster than CONNECTFREQUENCY
* would allow. But, to keep trying on bad connection, we require
* that connection has been open for certain minimum time
* (HANGONGOODLINK) and we give the net few seconds to steady
* (HANGONRETRYDELAY). This latter has to be long enough that the
* other end of the connection has time to notice it broke too.
*/
#define HANGONRETRYDELAY 60 /* Recommended value: 30-60 seconds */
#define HANGONGOODLINK 3600 /* Recommended value: 30-60 minutes */
/* KILLCHASETIMELIMIT -
* Max time from the nickname change that still causes KILL
* automatically to switch for the current nick of that user. (seconds)
*/
#define KILLCHASETIMELIMIT 90 /* Recommended value: 90 */
/* CHARYBDIS_SOMAXCONN
* Use SOMAXCONN if OS has it, otherwise use this value for the
* listen(); backlog. 5 for AIX/SUNOS, 25 for other OSs.
*/
#define CHARYBDIS_SOMAXCONN 25
/* MAX_BUFFER
* The amount of fds to reserve for clients exempt from limits
* and dns lookups.
*/
#define MAX_BUFFER 60
/* ----------------------------------------------------------------
* STOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOPSTOP
* ----------------------------------------------------------------
* The options below this line should NOT be modified.
* ----------------------------------------------------------------
*/
#define CONFIG_CHARYBDIS_LEVEL_2
#include "defaults.h"
#endif /* INCLUDED_config_h */

68
include/defaults.h
View file

@ -25,10 +25,13 @@
#ifndef INCLUDED_defaults_h #ifndef INCLUDED_defaults_h
#define INCLUDED_defaults_h #define INCLUDED_defaults_h
/* this file is included (only) at the end of config.h, to supply default /* /!\ DANGER WILL ROBINSON! DANGER! /!\
* values for things which are now configurable at runtime. *
* Do not mess with these values unless you know what you are doing!
*/ */
#include "setup.h"
/* /*
* First, set other fd limits based on values from user * First, set other fd limits based on values from user
*/ */
@ -59,5 +62,64 @@
#define JOIN_LEAVE_COUNT_EXPIRE_TIME 120 #define JOIN_LEAVE_COUNT_EXPIRE_TIME 120
#define MIN_SPAM_NUM 5 #define MIN_SPAM_NUM 5
#define MIN_SPAM_TIME 60 #define MIN_SPAM_TIME 60
#define CONFIG_CHARYBDIS_LEVEL_1
/*
* Directory paths and filenames for UNIX systems.
* IRCD_PREFIX is set using ./configure --prefix, see INSTALL.
*
* IRCD_PREFIX = prefix for all directories,
* DPATH = root directory of installation,
* BINPATH = directory for binary files,
* ETCPATH = directory for configuration files,
* LOGPATH = directory for logfiles,
* MODPATH = directory for modules,
* AUTOMODPATH = directory for autoloaded modules
*/
#define DPATH IRCD_PREFIX
#define BINPATH IRCD_PREFIX "/bin/"
#define MODPATH MODULE_DIR
#define AUTOMODPATH MODULE_DIR "/autoload/"
#define ETCPATH ETC_DIR
#define LOGPATH LOG_DIR
#define UHPATH HELP_DIR "/users"
#define HPATH HELP_DIR "/opers"
#define SPATH BINPATH "/" PROGRAM_PREFIX "charybdis" /* ircd executable */
#define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */
#define MPATH ETCPATH "/ircd.motd" /* MOTD file */
#define LPATH LOGPATH "/ircd.log" /* ircd logfile */
#define PPATH PKGRUNDIR "/ircd.pid" /* pid file */
#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
#define DBPATH PKGLOCALSTATEDIR "/ban.db" /* bandb file */
/* HANGONGOODLINK and HANGONRETRYDELAY
* Often net breaks for a short time and it's useful to try to
* establishing the same connection again faster than CONNECTFREQUENCY
* would allow. But, to keep trying on bad connection, we require
* that connection has been open for certain minimum time
* (HANGONGOODLINK) and we give the net few seconds to steady
* (HANGONRETRYDELAY). This latter has to be long enough that the
* other end of the connection has time to notice it broke too.
*/
#define HANGONRETRYDELAY 60 /* Recommended value: 30-60 seconds */
#define HANGONGOODLINK 3600 /* Recommended value: 30-60 minutes */
/* KILLCHASETIMELIMIT -
* Max time from the nickname change that still causes KILL
* automatically to switch for the current nick of that user. (seconds)
*/
#define KILLCHASETIMELIMIT 90 /* Recommended value: 90 */
/* MAX_BUFFER
* The amount of fds to reserve for clients exempt from limits
* and dns lookups.
*/
#define MAX_BUFFER 60
/* CHARYBDIS_SOMAXCONN
* Use SOMAXCONN if OS has it, otherwise use this value for the
* listen(); backlog. 5 for AIX/SUNOS, 25 for other OSs.
*/
#define CHARYBDIS_SOMAXCONN 25
#endif /* INCLUDED_defaults_h */ #endif /* INCLUDED_defaults_h */

2
include/ircd.h
View file

@ -25,7 +25,7 @@
#ifndef INCLUDED_ircd_h #ifndef INCLUDED_ircd_h
#define INCLUDED_ircd_h #define INCLUDED_ircd_h
#include "config.h" #include "defaults.h"
struct Client; struct Client;
struct rb_dlink_list; struct rb_dlink_list;

6
include/ircd_defs.h
View file

@ -35,7 +35,7 @@
#ifndef INCLUDED_ircd_defs_h #ifndef INCLUDED_ircd_defs_h
#define INCLUDED_ircd_defs_h #define INCLUDED_ircd_defs_h
#include "config.h" #include "defaults.h"
/* For those unfamiliar with GNU format attributes, a is the 1 based /* For those unfamiliar with GNU format attributes, a is the 1 based
* argument number of the format string, and b is the 1 based argument * argument number of the format string, and b is the 1 based argument
@ -56,10 +56,6 @@
#define IRC_DEPRECATED #define IRC_DEPRECATED
#endif #endif
#if !defined(CONFIG_CHARYBDIS_LEVEL_1)
# error Incorrect config.h for this revision of ircd.
#endif
#define HOSTLEN 63 /* Length of hostname. Updated to */ #define HOSTLEN 63 /* Length of hostname. Updated to */
/* comply with RFC1123 */ /* comply with RFC1123 */

2
include/m_info.h
View file

@ -25,7 +25,7 @@
#ifndef INCLUDED_m_info_h #ifndef INCLUDED_m_info_h
#define INCLUDED_m_info_h #define INCLUDED_m_info_h
#include "config.h" #include "defaults.h"
typedef struct Information typedef struct Information
{ {

2
include/modules.h
View file

@ -25,7 +25,7 @@
#ifndef INCLUDED_modules_h #ifndef INCLUDED_modules_h
#define INCLUDED_modules_h #define INCLUDED_modules_h
#include "serno.h" #include "serno.h"
#include "config.h" #include "defaults.h"
#include "setup.h" #include "setup.h"
#include "parse.h" #include "parse.h"

2
include/msg.h
View file

@ -25,7 +25,7 @@
#ifndef INCLUDED_msg_h #ifndef INCLUDED_msg_h
#define INCLUDED_msg_h #define INCLUDED_msg_h
#include "config.h" #include "defaults.h"
#include "msgbuf.h" #include "msgbuf.h"
struct Client; struct Client;

1
include/newconf.h
View file

@ -1,5 +1,4 @@
/* This code is in the public domain. /* This code is in the public domain.
* $Nightmare: nightmare/include/config.h,v 1.32.2.2.2.2 2002/07/02 03:41:28 ejb Exp $
*/ */
#ifndef _NEWCONF_H_INCLUDED #ifndef _NEWCONF_H_INCLUDED

2
include/numeric.h
View file

@ -25,7 +25,7 @@
#ifndef INCLUDED_numeric_h #ifndef INCLUDED_numeric_h
#define INCLUDED_numeric_h #define INCLUDED_numeric_h
#include "config.h" #include "defaults.h"
#include "messages.h" #include "messages.h"
/* /*

2
include/s_assert.h
View file

@ -26,7 +26,7 @@
#ifndef INCLUDED_s_assert_h #ifndef INCLUDED_s_assert_h
#define INCLUDED_s_assert_h #define INCLUDED_s_assert_h
#include "config.h" #include "defaults.h"
#ifdef SOFT_ASSERT #ifdef SOFT_ASSERT

2
include/s_serv.h
View file

@ -25,7 +25,7 @@
#ifndef INCLUDED_serv_h #ifndef INCLUDED_serv_h
#define INCLUDED_serv_h #define INCLUDED_serv_h
#include "config.h" #include "defaults.h"
#include "capability.h" #include "capability.h"
/* /*

2
include/s_user.h
View file

@ -25,7 +25,7 @@
#ifndef INCLUDED_s_user_h #ifndef INCLUDED_s_user_h
#define INCLUDED_s_user_h #define INCLUDED_s_user_h
#include "config.h" #include "defaults.h"
struct Client; struct Client;
struct User; struct User;

1
include/send.h
View file

@ -27,7 +27,6 @@
#include "rb_lib.h" #include "rb_lib.h"
#include "ircd_defs.h" #include "ircd_defs.h"
#include "config.h" /* HAVE_STDARG_H */
struct Client; struct Client;
struct Channel; struct Channel;

1
include/stdinc.h
View file

@ -22,7 +22,6 @@
*/ */
#include "rb_lib.h" #include "rb_lib.h"
#include "config.h" /* Gotta pull in the autoconf stuff */
#include "ircd_defs.h" /* Needed for some reasons here -- dwr */ #include "ircd_defs.h" /* Needed for some reasons here -- dwr */
/* AIX requires this to be the first thing in the file. */ /* AIX requires this to be the first thing in the file. */

2
ircd/class.c
View file

@ -23,7 +23,7 @@
*/ */
#include "stdinc.h" #include "stdinc.h"
#include "config.h" #include "defaults.h"
#include "class.h" #include "class.h"
#include "client.h" #include "client.h"

2
ircd/client.c
View file

@ -23,7 +23,7 @@
* USA * USA
*/ */
#include "stdinc.h" #include "stdinc.h"
#include "config.h" #include "defaults.h"
#include "client.h" #include "client.h"
#include "class.h" #include "class.h"

2
ircd/ircd.c
View file

@ -26,7 +26,7 @@
#include "rb_lib.h" #include "rb_lib.h"
#include "stdinc.h" #include "stdinc.h"
#include "setup.h" #include "setup.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "channel.h" #include "channel.h"
#include "class.h" #include "class.h"

184
ircd/ircd_lexer.c
View file

@ -7,8 +7,8 @@
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 35 #define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
@ -46,7 +46,6 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t; typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t; typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t; typedef uint32_t flex_uint32_t;
typedef uint64_t flex_uint64_t;
#else #else
typedef signed char flex_int8_t; typedef signed char flex_int8_t;
typedef short int flex_int16_t; typedef short int flex_int16_t;
@ -54,7 +53,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t; typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t; typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t; typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */ /* Limits of integral types. */
#ifndef INT8_MIN #ifndef INT8_MIN
@ -85,6 +83,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
#ifdef __cplusplus #ifdef __cplusplus
@ -141,7 +141,15 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */ /* Size of default input buffer. */
#ifndef YY_BUF_SIZE #ifndef YY_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
#define YY_BUF_SIZE 32768
#else
#define YY_BUF_SIZE 16384 #define YY_BUF_SIZE 16384
#endif /* __ia64__ */
#endif #endif
/* The state buf must be large enough to hold one state per character in the main buffer. /* The state buf must be large enough to hold one state per character in the main buffer.
@ -167,6 +175,7 @@ extern FILE *yyin, *yyout;
#define EOB_ACT_LAST_MATCH 2 #define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n) #define YY_LESS_LINENO(n)
#define YY_LINENO_REWIND_TO(ptr)
/* Return all but the first "n" matched characters back to the input stream. */ /* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \ #define yyless(n) \
@ -332,7 +341,7 @@ void yyfree (void * );
/* Begin user sect3 */ /* Begin user sect3 */
#define yywrap(n) 1 #define yywrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR; typedef unsigned char YY_CHAR;
@ -346,11 +355,17 @@ extern int yylineno;
int yylineno = 1; int yylineno = 1;
extern char *yytext; extern char *yytext;
#ifdef yytext_ptr
#undef yytext_ptr
#endif
#define yytext_ptr yytext #define yytext_ptr yytext
static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_get_previous_state (void );
static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
static int yy_get_next_buffer (void ); static int yy_get_next_buffer (void );
#if defined(__GNUC__) && __GNUC__ >= 3
__attribute__((__noreturn__))
#endif
static void yy_fatal_error (yyconst char msg[] ); static void yy_fatal_error (yyconst char msg[] );
/* Done after the current pattern has been matched and before the /* Done after the current pattern has been matched and before the
@ -359,7 +374,7 @@ static void yy_fatal_error (yyconst char msg[] );
#define YY_DO_BEFORE_ACTION \ #define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \ (yytext_ptr) = yy_bp; \
(yytext_ptr) -= (yy_more_len); \ (yytext_ptr) -= (yy_more_len); \
yyleng = (yy_size_t) (yy_cp - (yytext_ptr)); \ yyleng = (size_t) (yy_cp - (yytext_ptr)); \
(yy_hold_char) = *yy_cp; \ (yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \ *yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp; (yy_c_buf_p) = yy_cp;
@ -382,7 +397,7 @@ static yyconst flex_int16_t yy_accept[47] =
0, 1, 0, 1, 8, 0 0, 1, 0, 1, 8, 0
} ; } ;
static yyconst flex_int32_t yy_ec[256] = static yyconst YY_CHAR yy_ec[256] =
{ 0, { 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@ -414,7 +429,7 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1 1, 1, 1, 1, 1
} ; } ;
static yyconst flex_int32_t yy_meta[34] = static yyconst YY_CHAR yy_meta[34] =
{ 0, { 0,
1, 1, 2, 1, 1, 1, 1, 1, 3, 3, 1, 1, 2, 1, 1, 1, 1, 1, 3, 3,
1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3,
@ -422,7 +437,7 @@ static yyconst flex_int32_t yy_meta[34] =
3, 3, 1 3, 3, 1
} ; } ;
static yyconst flex_int16_t yy_base[54] = static yyconst flex_uint16_t yy_base[54] =
{ 0, { 0,
0, 28, 81, 104, 78, 0, 10, 0, 31, 64, 0, 28, 81, 104, 78, 0, 10, 0, 31, 64,
56, 0, 20, 24, 0, 12, 104, 0, 104, 22, 56, 0, 20, 24, 0, 12, 104, 0, 104, 22,
@ -442,7 +457,7 @@ static yyconst flex_int16_t yy_def[54] =
46, 46, 46 46, 46, 46
} ; } ;
static yyconst flex_int16_t yy_nxt[138] = static yyconst flex_uint16_t yy_nxt[138] =
{ 0, { 0,
4, 5, 6, 7, 8, 4, 9, 10, 11, 23, 4, 5, 6, 7, 8, 4, 9, 10, 11, 23,
4, 4, 17, 17, 17, 17, 26, 13, 44, 44, 4, 4, 17, 17, 17, 17, 26, 13, 44, 44,
@ -513,8 +528,9 @@ char *yytext;
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA * USA
*
*/ */
#line 26 "ircd_lexer.l" #line 25 "ircd_lexer.l"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -529,7 +545,7 @@ char *yytext;
#include "stdinc.h" #include "stdinc.h"
#include "ircd_defs.h" #include "ircd_defs.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "logger.h" #include "logger.h"
#include "s_conf.h" #include "s_conf.h"
#include "newconf.h" #include "newconf.h"
@ -563,7 +579,7 @@ char linebuf[512];
#define YY_INPUT(buf,result,max_size) \ #define YY_INPUT(buf,result,max_size) \
if (!(result = conf_fgets(buf, max_size, conf_fbfile_in))) \ if (!(result = conf_fgets(buf, max_size, conf_fbfile_in))) \
YY_FATAL_ERROR("input in flex scanner failed"); YY_FATAL_ERROR("input in flex scanner failed");
#line 569 "ircd_lexer.c" #line 583 "ircd_lexer.c"
#define INITIAL 0 #define INITIAL 0
@ -596,11 +612,11 @@ void yyset_extra (YY_EXTRA_TYPE user_defined );
FILE *yyget_in (void ); FILE *yyget_in (void );
void yyset_in (FILE * in_str ); void yyset_in (FILE * _in_str );
FILE *yyget_out (void ); FILE *yyget_out (void );
void yyset_out (FILE * out_str ); void yyset_out (FILE * _out_str );
yy_size_t yyget_leng (void ); yy_size_t yyget_leng (void );
@ -608,7 +624,7 @@ char *yyget_text (void );
int yyget_lineno (void ); int yyget_lineno (void );
void yyset_lineno (int line_number ); void yyset_lineno (int _line_number );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
@ -622,6 +638,10 @@ extern int yywrap (void );
#endif #endif
#endif #endif
#ifndef YY_NO_UNPUT
#endif
#ifndef yytext_ptr #ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ); static void yy_flex_strncpy (char *,yyconst char *,int );
#endif #endif
@ -642,7 +662,12 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */ /* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE #ifndef YY_READ_BUF_SIZE
#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
#define YY_READ_BUF_SIZE 16384
#else
#define YY_READ_BUF_SIZE 8192 #define YY_READ_BUF_SIZE 8192
#endif /* __ia64__ */
#endif #endif
/* Copy whatever the last rule matched to the standard output. */ /* Copy whatever the last rule matched to the standard output. */
@ -650,7 +675,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's, /* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite(). * we now use fwrite().
*/ */
#define ECHO fwrite( yytext, yyleng, 1, yyout ) #define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif #endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@ -661,7 +686,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \ { \
int c = '*'; \ int c = '*'; \
yy_size_t n; \ size_t n; \
for ( n = 0; n < max_size && \ for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \ buf[n] = (char) c; \
@ -729,7 +754,7 @@ extern int yylex (void);
/* Code executed at the end of each rule. */ /* Code executed at the end of each rule. */
#ifndef YY_BREAK #ifndef YY_BREAK
#define YY_BREAK break; #define YY_BREAK /*LINTED*/break;
#endif #endif
#define YY_RULE_SETUP \ #define YY_RULE_SETUP \
@ -739,13 +764,9 @@ extern int yylex (void);
*/ */
YY_DECL YY_DECL
{ {
register yy_state_type yy_current_state; yy_state_type yy_current_state;
register char *yy_cp, *yy_bp; char *yy_cp, *yy_bp;
register int yy_act; int yy_act;
#line 83 "ircd_lexer.l"
#line 751 "ircd_lexer.c"
if ( !(yy_init) ) if ( !(yy_init) )
{ {
@ -773,7 +794,12 @@ YY_DECL
yy_load_buffer_state( ); yy_load_buffer_state( );
} }
while ( 1 ) /* loops until end-of-file is reached */ {
#line 82 "ircd_lexer.l"
#line 801 "ircd_lexer.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{ {
(yy_more_len) = 0; (yy_more_len) = 0;
if ( (yy_more_flag) ) if ( (yy_more_flag) )
@ -795,7 +821,7 @@ YY_DECL
yy_match: yy_match:
do do
{ {
register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
(yy_last_accepting_state) = yy_current_state; (yy_last_accepting_state) = yy_current_state;
@ -836,39 +862,39 @@ do_action: /* This label is used only to access EOF actions. */
case 1: case 1:
YY_RULE_SETUP YY_RULE_SETUP
#line 84 "ircd_lexer.l" #line 83 "ircd_lexer.l"
{ cinclude(); } { cinclude(); }
YY_BREAK YY_BREAK
case 2: case 2:
YY_RULE_SETUP YY_RULE_SETUP
#line 85 "ircd_lexer.l" #line 84 "ircd_lexer.l"
{ ccomment(); } { ccomment(); }
YY_BREAK YY_BREAK
case 3: case 3:
/* rule 3 can match eol */ /* rule 3 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 86 "ircd_lexer.l" #line 85 "ircd_lexer.l"
{ strcpy(linebuf, yytext+1); lineno++; yyless(1); } { strcpy(linebuf, yytext+1); lineno++; yyless(1); }
YY_BREAK YY_BREAK
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
#line 88 "ircd_lexer.l" #line 87 "ircd_lexer.l"
; ;
YY_BREAK YY_BREAK
case 5: case 5:
YY_RULE_SETUP YY_RULE_SETUP
#line 89 "ircd_lexer.l" #line 88 "ircd_lexer.l"
{ hashcomment(); } { hashcomment(); }
YY_BREAK YY_BREAK
case 6: case 6:
YY_RULE_SETUP YY_RULE_SETUP
#line 91 "ircd_lexer.l" #line 90 "ircd_lexer.l"
{ yylval.number = atoi(yytext); return NUMBER; } { yylval.number = atoi(yytext); return NUMBER; }
YY_BREAK YY_BREAK
case 7: case 7:
/* rule 7 can match eol */ /* rule 7 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
#line 93 "ircd_lexer.l" #line 92 "ircd_lexer.l"
{ {
if(yytext[yyleng-2] == '\\') if(yytext[yyleng-2] == '\\')
{ {
@ -916,12 +942,12 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 8: case 8:
YY_RULE_SETUP YY_RULE_SETUP
#line 139 "ircd_lexer.l" #line 138 "ircd_lexer.l"
{ return LOADMODULE; } { return LOADMODULE; }
YY_BREAK YY_BREAK
case 9: case 9:
YY_RULE_SETUP YY_RULE_SETUP
#line 140 "ircd_lexer.l" #line 139 "ircd_lexer.l"
{ {
strcpy(yylval.string, yytext); strcpy(yylval.string, yytext);
yylval.string[yyleng] = '\0'; yylval.string[yyleng] = '\0';
@ -930,24 +956,24 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 10: case 10:
YY_RULE_SETUP YY_RULE_SETUP
#line 146 "ircd_lexer.l" #line 145 "ircd_lexer.l"
{ return TWODOTS; } { return TWODOTS; }
YY_BREAK YY_BREAK
case 11: case 11:
YY_RULE_SETUP YY_RULE_SETUP
#line 147 "ircd_lexer.l" #line 146 "ircd_lexer.l"
{ return yytext[0]; } { return yytext[0]; }
YY_BREAK YY_BREAK
case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(INITIAL):
#line 148 "ircd_lexer.l" #line 147 "ircd_lexer.l"
{ if (ieof()) yyterminate(); } { if (ieof()) yyterminate(); }
YY_BREAK YY_BREAK
case 12: case 12:
YY_RULE_SETUP YY_RULE_SETUP
#line 149 "ircd_lexer.l" #line 148 "ircd_lexer.l"
ECHO; ECHO;
YY_BREAK YY_BREAK
#line 953 "ircd_lexer.c" #line 977 "ircd_lexer.c"
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
{ {
@ -1076,6 +1102,7 @@ ECHO;
"fatal flex scanner internal error--no action found" ); "fatal flex scanner internal error--no action found" );
} /* end of action switch */ } /* end of action switch */
} /* end of scanning one token */ } /* end of scanning one token */
} /* end of user's declarations */
} /* end of yylex */ } /* end of yylex */
/* yy_get_next_buffer - try to read in a new buffer /* yy_get_next_buffer - try to read in a new buffer
@ -1087,9 +1114,9 @@ ECHO;
*/ */
static int yy_get_next_buffer (void) static int yy_get_next_buffer (void)
{ {
register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
register char *source = (yytext_ptr); char *source = (yytext_ptr);
register int number_to_move, i; yy_size_t number_to_move, i;
int ret_val; int ret_val;
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@ -1118,7 +1145,7 @@ static int yy_get_next_buffer (void)
/* Try to read more data. */ /* Try to read more data. */
/* First move last chars to start of buffer. */ /* First move last chars to start of buffer. */
number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
for ( i = 0; i < number_to_move; ++i ) for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++); *(dest++) = *(source++);
@ -1138,7 +1165,7 @@ static int yy_get_next_buffer (void)
{ /* Not enough room in the buffer - grow it. */ { /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */ /* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER; YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset = int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf); (int) ((yy_c_buf_p) - b->yy_ch_buf);
@ -1221,14 +1248,14 @@ static int yy_get_next_buffer (void)
static yy_state_type yy_get_previous_state (void) static yy_state_type yy_get_previous_state (void)
{ {
register yy_state_type yy_current_state; yy_state_type yy_current_state;
register char *yy_cp; char *yy_cp;
yy_current_state = (yy_start); yy_current_state = (yy_start);
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
{ {
register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
(yy_last_accepting_state) = yy_current_state; (yy_last_accepting_state) = yy_current_state;
@ -1253,10 +1280,10 @@ static int yy_get_next_buffer (void)
*/ */
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{ {
register int yy_is_jam; int yy_is_jam;
register char *yy_cp = (yy_c_buf_p); char *yy_cp = (yy_c_buf_p);
register YY_CHAR yy_c = 1; YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
(yy_last_accepting_state) = yy_current_state; (yy_last_accepting_state) = yy_current_state;
@ -1274,6 +1301,10 @@ static int yy_get_next_buffer (void)
return yy_is_jam ? 0 : yy_current_state; return yy_is_jam ? 0 : yy_current_state;
} }
#ifndef YY_NO_UNPUT
#endif
#ifndef YY_NO_INPUT #ifndef YY_NO_INPUT
#ifdef __cplusplus #ifdef __cplusplus
static int yyinput (void) static int yyinput (void)
@ -1322,7 +1353,7 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE: case EOB_ACT_END_OF_FILE:
{ {
if ( yywrap( ) ) if ( yywrap( ) )
return 0; return EOF;
if ( ! (yy_did_buffer_switch_on_eof) ) if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE; YY_NEW_FILE;
@ -1423,7 +1454,7 @@ static void yy_load_buffer_state (void)
if ( ! b ) if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
b->yy_buf_size = size; b->yy_buf_size = (yy_size_t)size;
/* yy_ch_buf has to be 2 characters longer than the size given because /* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters. * we need to put in 2 end-of-buffer characters.
@ -1458,10 +1489,6 @@ static void yy_load_buffer_state (void)
yyfree((void *) b ); yyfree((void *) b );
} }
#ifndef __cplusplus
extern int isatty (int );
#endif /* __cplusplus */
/* Initializes or reinitializes a buffer. /* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer, * This function is sometimes called more than once on the same buffer,
* such as during a yyrestart() or at EOF. * such as during a yyrestart() or at EOF.
@ -1582,7 +1609,7 @@ static void yyensure_buffer_stack (void)
* scanner will even need a stack. We use 2 instead of 1 to avoid an * scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call. * immediate realloc on the next call.
*/ */
num_to_alloc = 1; num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*) (num_to_alloc * sizeof(struct yy_buffer_state*)
); );
@ -1599,7 +1626,7 @@ static void yyensure_buffer_stack (void)
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */ /* Increase the buffer to prepare for a possible push. */
int grow_size = 8 /* arbitrary grow size */; yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = (yy_buffer_stack_max) + grow_size; num_to_alloc = (yy_buffer_stack_max) + grow_size;
(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
@ -1666,8 +1693,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
* scan from a @e copy of @a bytes. * scan from a @e copy of @a bytes.
* @param bytes the byte buffer to scan * @param yybytes the byte buffer to scan
* @param len the number of bytes in the buffer pointed to by @a bytes. * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* *
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
@ -1675,7 +1702,8 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
{ {
YY_BUFFER_STATE b; YY_BUFFER_STATE b;
char *buf; char *buf;
yy_size_t n, i; yy_size_t n;
yy_size_t i;
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2; n = _yybytes_len + 2;
@ -1772,29 +1800,29 @@ char *yyget_text (void)
} }
/** Set the current line number. /** Set the current line number.
* @param line_number * @param _line_number line number
* *
*/ */
void yyset_lineno (int line_number ) void yyset_lineno (int _line_number )
{ {
yylineno = line_number; yylineno = _line_number;
} }
/** Set the input stream. This does not discard the current /** Set the input stream. This does not discard the current
* input buffer. * input buffer.
* @param in_str A readable stream. * @param _in_str A readable stream.
* *
* @see yy_switch_to_buffer * @see yy_switch_to_buffer
*/ */
void yyset_in (FILE * in_str ) void yyset_in (FILE * _in_str )
{ {
yyin = in_str ; yyin = _in_str ;
} }
void yyset_out (FILE * out_str ) void yyset_out (FILE * _out_str )
{ {
yyout = out_str ; yyout = _out_str ;
} }
int yyget_debug (void) int yyget_debug (void)
@ -1802,9 +1830,9 @@ int yyget_debug (void)
return yy_flex_debug; return yy_flex_debug;
} }
void yyset_debug (int bdebug ) void yyset_debug (int _bdebug )
{ {
yy_flex_debug = bdebug ; yy_flex_debug = _bdebug ;
} }
static int yy_init_globals (void) static int yy_init_globals (void)
@ -1864,7 +1892,8 @@ int yylex_destroy (void)
#ifndef yytext_ptr #ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
{ {
register int i;
int i;
for ( i = 0; i < n; ++i ) for ( i = 0; i < n; ++i )
s1[i] = s2[i]; s1[i] = s2[i];
} }
@ -1873,7 +1902,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
#ifdef YY_NEED_STRLEN #ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s ) static int yy_flex_strlen (yyconst char * s )
{ {
register int n; int n;
for ( n = 0; s[n]; ++n ) for ( n = 0; s[n]; ++n )
; ;
@ -1888,6 +1917,7 @@ void *yyalloc (yy_size_t size )
void *yyrealloc (void * ptr, yy_size_t size ) void *yyrealloc (void * ptr, yy_size_t size )
{ {
/* The cast to (char *) in the following accommodates both /* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those * implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter * that use void* generic pointers. It works with the latter
@ -1905,7 +1935,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"
#line 149 "ircd_lexer.l" #line 148 "ircd_lexer.l"

2
ircd/ircd_lexer.l
View file

@ -36,7 +36,7 @@
#include "stdinc.h" #include "stdinc.h"
#include "ircd_defs.h" #include "ircd_defs.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "logger.h" #include "logger.h"
#include "s_conf.h" #include "s_conf.h"
#include "newconf.h" #include "newconf.h"

2
ircd/ircd_parser.c
View file

@ -78,7 +78,7 @@
#include "setup.h" #include "setup.h"
#include "common.h" #include "common.h"
#include "ircd_defs.h" #include "ircd_defs.h"
#include "config.h" #include "defaults.h"
#include "client.h" #include "client.h"
#include "modules.h" #include "modules.h"
#include "newconf.h" #include "newconf.h"

2
ircd/ircd_parser.y
View file

@ -17,7 +17,7 @@
#include "setup.h" #include "setup.h"
#include "common.h" #include "common.h"
#include "ircd_defs.h" #include "ircd_defs.h"
#include "config.h" #include "defaults.h"
#include "client.h" #include "client.h"
#include "modules.h" #include "modules.h"
#include "newconf.h" #include "newconf.h"

2
ircd/match.c
View file

@ -18,7 +18,7 @@
* *
*/ */
#include "stdinc.h" #include "stdinc.h"
#include "config.h" #include "defaults.h"
#include "client.h" #include "client.h"
#include "ircd.h" #include "ircd.h"
#include "match.h" #include "match.h"

2
ircd/s_auth.c
View file

@ -34,7 +34,7 @@
* --Bleep Thomas Helvey <tomh@inxpress.net> * --Bleep Thomas Helvey <tomh@inxpress.net>
*/ */
#include "stdinc.h" #include "stdinc.h"
#include "config.h" #include "defaults.h"
#include "s_auth.h" #include "s_auth.h"
#include "s_conf.h" #include "s_conf.h"
#include "client.h" #include "client.h"

2
modules/core/m_ban.c
View file

@ -32,7 +32,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "match.h" #include "match.h"
#include "s_conf.h" #include "s_conf.h"

2
modules/m_chghost.c
View file

@ -14,7 +14,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "numeric.h" #include "numeric.h"
#include "s_conf.h" #include "s_conf.h"

2
modules/m_encap.c
View file

@ -32,7 +32,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "numeric.h" #include "numeric.h"
#include "s_serv.h" #include "s_serv.h"

2
modules/m_info.c
View file

@ -779,7 +779,7 @@ send_conf_options(struct Client *source_p)
/* /*
* Now send them a list of all our configuration options * Now send them a list of all our configuration options
* (mostly from config.h) * (mostly from defaults.h)
*/ */
for (infoptr = MyInformation; infoptr->name; infoptr++) for (infoptr = MyInformation; infoptr->name; infoptr++)
{ {

2
modules/m_operspy.c
View file

@ -32,7 +32,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "numeric.h" #include "numeric.h"
#include "s_serv.h" #include "s_serv.h"

2
modules/m_services.c
View file

@ -33,7 +33,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "numeric.h" #include "numeric.h"
#include "s_conf.h" #include "s_conf.h"

2
modules/m_signon.c
View file

@ -33,7 +33,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "numeric.h" #include "numeric.h"
#include "s_conf.h" #include "s_conf.h"

2
modules/m_tb.c
View file

@ -33,7 +33,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "ircd.h" #include "ircd.h"
#include "match.h" #include "match.h"
#include "s_conf.h" #include "s_conf.h"

2
modules/m_xline.c
View file

@ -33,7 +33,7 @@
#include "channel.h" #include "channel.h"
#include "client.h" #include "client.h"
#include "common.h" #include "common.h"
#include "config.h" #include "defaults.h"
#include "class.h" #include "class.h"
#include "ircd.h" #include "ircd.h"
#include "numeric.h" #include "numeric.h"