ircd: fix up some iwarn() calls which referred to L_MAIN

[solanum.git] / include / config.h.dist

diff --git a/include/config.h.dist b/include/config.h.dist
index daa8652a660edf0acc8432f478e74586ceeb2d8d..f143506e8e24e3e577ce57fb13949f398f6545ce 100644 (file)
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: config.h 3354 2007-04-03 09:21:31Z nenolod $
  */
 
 #ifndef INCLUDED_config_h
@@ -50,7 +48,6 @@
 /* dirs */
 #define DPATH   IRCD_PREFIX
 #define BINPATH IRCD_PREFIX "/bin/"
-#define LIBPATH IRCD_PREFIX "/lib/"
 #define MODPATH MODULE_DIR
 #define AUTOMODPATH MODULE_DIR "/autoload/"
 #define ETCPATH ETC_DIR 
@@ -59,19 +56,13 @@
 #define HPATH  HELP_DIR "/opers"
 
 /* files */
-#define SPATH    BINPATH "/ircd"                  /* ircd executable */
-#define LIPATH   LIBPATH "/libircd" SHARED_SUFFIX  /* ircd library */
-#define SLPATH   BINPATH "/servlink"              /* servlink executable */
-#define CPATH    ETCPATH "/ircd.conf"             /* ircd.conf file */
-#define KPATH    ETCPATH "/kline.conf"            /* kline file */
-#define DLPATH   ETCPATH "/dline.conf"            /* dline file */
-#define XPATH   ETCPATH "/xline.conf"             /* xline file */
-#define RESVPATH ETCPATH "/resv.conf"             /* resv file */
-#define RPATH    ETCPATH "/ircd.rsa"              /* ircd rsa private keyfile */
-#define MPATH    ETCPATH "/ircd.motd"             /* MOTD file */
-#define LPATH    LOGPATH "/ircd.log"              /* ircd logfile */
-#define PPATH    ETCPATH "/ircd.pid"              /* pid file */
-#define OPATH    ETCPATH "/opers.motd"            /* oper MOTD file */
+#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 */
 
 /* IGNORE_BOGUS_TS
  * Ignore bogus timestamps from other servers. Yes this will desync
@@ -100,11 +91,11 @@
  */
 #define KILLCHASETIMELIMIT 90  /* Recommended value: 90 */
 
-/* RATBOX_SOMAXCONN
+/* 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 RATBOX_SOMAXCONN 25
+#define CHARYBDIS_SOMAXCONN 25
 
 /* MAX_BUFFER
  * The amount of fds to reserve for clients exempt from limits
@@ -119,7 +110,7 @@
  * ----------------------------------------------------------------
  */
 
-#define CONFIG_RATBOX_LEVEL_2
+#define CONFIG_CHARYBDIS_LEVEL_2
 
 #include "defaults.h"
 #endif /* INCLUDED_config_h */