Reorganized files

Moved pack.cfg to a header file
Updated all Makefile's to use src/conf.h
Modified build to reflect changes


svn: 87

Makefile.in

@@ -120,7 +120,10 @@ MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
 cleanutils:
 	@rm -f stringfix
 
-clean:  cleanutils
+cleanpack:
+	@rm -f src/settings.c src/salt.h src/conf.h
+
+clean:  cleanutils cleanpack
 	@cd src && $(MAKE) clean
 	@cd src/md5 && $(MAKE) clean
 	@cd src/compat && $(MAKE) clean
@@ -162,6 +165,11 @@ salt:
 	@./makesalt
 
 
+packconf:
+	@cp -f pack/settings.c src/settings.c
+	@cp -f pack/salt.h src/salt.h
+	@cp -f pack/conf.h src/conf.h
+
 config:
 	@$(modconf) modules-still-exist
 	@$(modconf) detect-modules
@@ -176,7 +184,7 @@ clean-modconfig:
 
 reconfig: clean-modconfig config
 
-utils:
+utils:  packconf
 	@./misc/maketype utils
 	@cd src; $(MAKE_UTILS) ../stringfix
 
@@ -201,7 +209,7 @@ dephub:
 	@cd src/compat && $(MAKE_DEPEND) dephub
 
 
-leaf:	salt config
+leaf:	packconf salt config
 	@echo ""
 	@echo "Making leaf"
 	@echo ""
@@ -213,7 +221,7 @@ leaf:	salt config
 	@cd src && $(MAKE_LEAF) $(LEAFEXEC)
 	@echo ""
 
-dleaf:  salt config
+dleaf:  packconf salt config
 	@echo ""
 	@echo "Making debug leaf"
 	@echo ""
@@ -225,7 +233,7 @@ dleaf:  salt config
 	@cd src; $(MAKE_DLEAF) $(LEAFEXEC)
 	@echo ""
 
-hub:	salt config
+hub:	packconf salt config
 	@echo ""
 	@echo "Making hub"
 	@echo ""
@@ -238,7 +246,7 @@ hub:	salt config
 	@cd src && $(MAKE_HUB) $(HUBEXEC)
 	@echo ""
 
-dhub:   salt config
+dhub:   packconf salt config
 	@echo ""
 	@echo "Making debug hub"
 	@echo ""

build

@@ -3,7 +3,7 @@
 #add in 'cont' support for NOT using make clean.
 
 #change this to 0 to not clean previously compiled files (faster/for dev)
-clean=1
+clean=0
 
 
 #### DO NOT EDIT BELOW THIS LINE #####
@@ -24,7 +24,7 @@ hub=0
 leaf=0
 #if test $# -lt 1; then
 if test -z "$1"; then
- echo "Usage: $0 -d all|leaf|hub pack.cfg -c"
+ echo "Usage: $0 -d all|leaf|hub"
  echo "   -d: Builds a debug package."
 # echo "   -c: Does not erase previously compiled files unless *necessary* (faster)"
  echo ""
@@ -47,14 +47,12 @@ elif [ $1 = "-d" ]; then
    hub=1
   else
    all=1
-   pack=$2
   fi
  else
   all=1
  fi
 else
  all=1
- pack=$1
 fi
 
 d=""
@@ -62,38 +60,14 @@ if [ $debug = "1" ]; then
  d="d"
 fi
 
-if ! test $pack
- then
- if [ $debug = "1" ]; then
-  pack=$3
- else
-  pack=$2
- fi
-fi
-
 if [ $all = "1" ]; then
  leaf=1
  hub=1
 fi
 
-if test $pack
-then
-  packname=$pack
-else
-  packname=default
-fi
+packname=wraith
 
-# Verify we got the config file
-origpack=$packname
-if ! test -f $packname; then
-  packname=$packname.cfg
-fi
-if ! test -f $packname; then
-  echo "[!] Can't find pack configuration file $origpack"
-  exit 1
-else
-  echo "[*] Using pack configuration file: $packname"
-fi
+############# CHECK FOR pack/ FILES #################
 
 # Figure what bins we're making
 case `uname` in
@@ -115,7 +89,7 @@ echo "[*] Building pack for $os"
 # Run ./configure, then verify it's ok
 echo "[*] Configuring..."
 umask 077 >/dev/null
-TCLDIR=`cat $packname | grep "^\/"`
+TCLDIR=`cat pack/conf.h 2>&1 | grep "define" | awk '/TCLDIR/ {print $3}' |  sed -e 's/\"//g'`
 if test -z ${TCLDIR}
 then
   echo "[*] Searching for TCL in default dirs (edit $packname to change)"
@@ -139,18 +113,9 @@ if [ $clean = "1" ]; then
  make clean > /dev/null
 fi
 
-# Read the config
-echo -n "[*] Compiling with:"
-for cnf in `cat $packname | grep -v "^#" | grep -v "^\/"`
-do
-  defines="$defines -DS_$cnf"
-  echo -n "$cnf "
-done
-echo ""
-
 # Build utils and check we got the bins
 echo "[*] Building utils..."
-make utils CFLGS="$defines" > /dev/null
+make utils > /dev/null
 if ! test -f stringfix
 then
   echo "[!] Util build failed"
@@ -160,7 +125,7 @@ fi
 if [ $leaf = "1" ]; then
  # Build leaf and check
  echo "[*] Building ${d}leaf..."
- make ${d}leaf CFLGS="$defines" > /dev/null
+ make ${d}leaf > /dev/null
  if ! test -f leaf
  then
    echo "[!] ${d}leaf build failed"
@@ -170,7 +135,7 @@ fi
 if [ $hub = "1" ]; then
  # Build hub and check
  echo "[*] Building ${d}hub..."
- make ${d}hub CFLGS="$defines" > /dev/null
+ make ${d}hub > /dev/null
  if ! test -f hub
  then
    echo "[!] ${d}hub build failed"

pack/conf.h

@@ -0,0 +1,34 @@
+#ifndef _EGG_CONF_H
+#define _EGG_CONF_H
+
+ */
+
+/* The next line defines where the custom TCL build's prefix is.. */
+#define TCLDIR "/home/wheel/bryan"
+
+
+/* Change "define" to "undef" to disable a feature
+ * Change "undef" to "define" to enable a feature
+ */
+
+/*      S_FEATURE	  RECOMMENDED	DESCRIPTION 					*/
+#define S_ANTITRACE	/*  yes		ptrace detection 				*/
+#define S_AUTOAWAY	/*  yes		random autoaway/return on IRC 			*/
+#define S_DCCPASS	/*  yes		DCC command passwords 				*/
+#define S_GARBLESTRINGS	/*  yes		encrypt strings in binary			*/
+#define S_HIJACKCHECK   /*  yes		checks for a common fbsd process hijacker	*/
+#define S_IRCNET	/*  REQUIRED	this is required for compilation (+e/+I)	*/
+#define S_LASTCHECK	/*  yes		checks every few seconds for logins with `last` */
+#undef  S_MSGIDENT	/*  no		allows users to msg to IDENT			*/
+#undef  S_MSGINVITE	/*  no		allows users to msg for invite 			*/
+#undef  S_MSGOP		/*  no		allows users to msg for op			*/
+#undef  S_MSGPASS	/*  no		allows users to msg to change password  	*/
+#undef  S_MSGVOICE	/*  no		allows users to msg for voice			*/
+#define S_NODELAY	/*  yes		speeds up tcp sockets to server			*/
+#define S_PROCESSCHECK	/*  yes		checks running processes against a bad-list	*/
+#define S_PROMISC	/*  yes		checks for sniffers running on the server	*/
+#define S_PSCLOAK	/*  yes		cloaks the process for `ps` (can be annoying)	*/
+#define S_RANDSERVERS	/*  yes		randomizes the server list per bot		*/
+#define S_TCLCMDS	/*  no		these serve mainly as a backdoor/debug tool	*/
+
+#endif /* _EGG_CONF_H */

src/Makefile.in

@@ -101,126 +101,126 @@ eggdrop.h:
 
 #safety hash
 ../stringfix: stringfix.c
-bg.o: ./bg.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+bg.o: ./bg.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  bg.h
-botcmd.o: ./botcmd.c main.h ../config.h lang.h eggdrop.h flags.h \
+botcmd.o: ./botcmd.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h modules.h mod/modvals.h
-botmsg.o: ./botmsg.c main.h ../config.h lang.h eggdrop.h flags.h \
+botmsg.o: ./botmsg.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
-botnet.o: ./botnet.c main.h ../config.h lang.h eggdrop.h flags.h \
+botnet.o: ./botnet.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
-chanprog.o: ./chanprog.c main.h ../config.h lang.h eggdrop.h flags.h \
+chanprog.o: ./chanprog.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h
-cmds.o: ./cmds.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+cmds.o: ./cmds.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  tandem.h modules.h mod/modvals.h
-dcc.o: ./dcc.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+dcc.o: ./dcc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  modules.h mod/modvals.h tandem.h md5/md5.h
-dccutil.o: ./dccutil.c main.h ../config.h lang.h eggdrop.h flags.h \
+dccutil.o: ./dccutil.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
-dns.o: ./dns.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+dns.o: ./dns.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  dns.h
-flags.o: ./flags.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+flags.o: ./flags.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-main.o: ./main.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+main.o: ./main.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  modules.h mod/modvals.h tandem.h bg.h md5/md5.h
 match.o: ./match.c ./main.h
-mem.o: ./mem.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+mem.o: ./mem.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  mod/modvals.h
-misc.o: ./misc.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+misc.o: ./misc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  stat.h
-misc_file.o: ./misc_file.c main.h ../config.h lang.h eggdrop.h flags.h \
+misc_file.o: ./misc_file.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h stat.h
-modules.o: ./modules.c main.h ../config.h lang.h eggdrop.h flags.h \
+modules.o: ./modules.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
-net.o: ./net.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+net.o: ./net.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-rfc1459.o: ./rfc1459.c main.h ../config.h lang.h eggdrop.h flags.h \
+rfc1459.o: ./rfc1459.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
 stringfix.o: stringfix.c
-tcl.o: ./tcl.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+tcl.o: ./tcl.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-tcldcc.o: ./tcldcc.c main.h ../config.h lang.h eggdrop.h flags.h \
+tcldcc.o: ./tcldcc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h modules.h mod/modvals.h
-tclhash.o: ./tclhash.c main.h ../config.h lang.h eggdrop.h flags.h \
+tclhash.o: ./tclhash.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h match.c
-tclmisc.o: ./tclmisc.c main.h ../config.h lang.h eggdrop.h flags.h \
+tclmisc.o: ./tclmisc.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h md5/md5.h
-tcluser.o: ./tcluser.c main.h ../config.h lang.h eggdrop.h flags.h \
+tcluser.o: ./tcluser.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h tandem.h
-userent.o: ./userent.c main.h ../config.h lang.h eggdrop.h flags.h \
+userent.o: ./userent.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
-userrec.o: ./userrec.c main.h ../config.h lang.h eggdrop.h flags.h \
+userrec.o: ./userrec.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h \
  proto.h ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h \
  users.h compat/compat.h compat/inet_aton.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h modules.h mod/modvals.h tandem.h
-users.o: ./users.c main.h ../config.h lang.h eggdrop.h flags.h proto.h \
+users.o: ./users.c main.h ../config.h ../src/conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h tclegg.h tclhash.h chan.h users.h \
  compat/compat.h compat/inet_aton.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \

src/compat/Makefile.in

@@ -41,7 +41,7 @@ compat: $(OBJS)
 
 #safety hash
 gnu_strftime.o: ./gnu_strftime.c
-inet_aton.o: ./inet_aton.c ../../src/main.h ../../config.h \
+inet_aton.o: ./inet_aton.c ../../src/main.h ../../config.h ../../src/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
@@ -49,7 +49,7 @@ inet_aton.o: ./inet_aton.c ../../src/main.h ../../config.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h inet_aton.h
-memcpy.o: ./memcpy.c ../../src/main.h ../../config.h ../../src/lang.h \
+memcpy.o: ./memcpy.c ../../src/main.h ../../config.h ../../src/conf.h ../../src/lang.h \
  ../../src/eggdrop.h ../../src/flags.h ../../src/proto.h ../../lush.h \
  ../../src/misc_file.h ../../src/cmdt.h ../../src/tclegg.h \
  ../../src/tclhash.h ../../src/chan.h ../../src/users.h \
@@ -57,7 +57,7 @@ memcpy.o: ./memcpy.c ../../src/main.h ../../config.h ../../src/lang.h \
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h memcpy.h
-memset.o: ./memset.c ../../src/main.h ../../config.h ../../src/lang.h \
+memset.o: ./memset.c ../../src/main.h ../../config.h ../../src/conf.h ../../src/lang.h \
  ../../src/eggdrop.h ../../src/flags.h ../../src/proto.h ../../lush.h \
  ../../src/misc_file.h ../../src/cmdt.h ../../src/tclegg.h \
  ../../src/tclhash.h ../../src/chan.h ../../src/users.h \
@@ -65,7 +65,7 @@ memset.o: ./memset.c ../../src/main.h ../../config.h ../../src/lang.h \
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h memset.h
-snprintf.o: ./snprintf.c ../../src/main.h ../../config.h \
+snprintf.o: ./snprintf.c ../../src/main.h ../../config.h ../../src/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
@@ -73,7 +73,7 @@ snprintf.o: ./snprintf.c ../../src/main.h ../../config.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h snprintf.h
-strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../config.h \
+strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../config.h ../../src/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \
@@ -81,7 +81,7 @@ strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../config.h \
  ../../src/compat/inet_aton.h ../../src/compat/snprintf.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h memcpy.h
-strftime.o: ./strftime.c ../../src/main.h ../../config.h \
+strftime.o: ./strftime.c ../../src/main.h ../../config.h ../../src/conf.h \
  ../../src/lang.h ../../src/eggdrop.h ../../src/flags.h \
  ../../src/proto.h ../../lush.h ../../src/misc_file.h ../../src/cmdt.h \
  ../../src/tclegg.h ../../src/tclhash.h ../../src/chan.h \

src/main.h

@@ -12,6 +12,8 @@
 #  include "config.h"
 #endif
 
+#include "conf.h"
+
 #include "lush.h" /* We seem to need this everywhere... */
 
 #if (((TCL_MAJOR_VERSION == 7) && (TCL_MINOR_VERSION >= 5)) || (TCL_MAJOR_VERSION > 7))

src/mod/channels.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../channels.o: .././channels.mod/channels.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/compress.mod/Makefile.in

@@ -35,7 +35,8 @@ distclean: clean
 
 #safety hash
 ../compress.o: .././compress.mod/compress.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/console.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../console.o: .././console.mod/console.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/ctcp.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../ctcp.o: .././ctcp.mod/ctcp.c ../ctcp.mod/ctcp.h \
- ../../../src/mod/module.h ../../../src/main.h ../../../config.h \
+ ../../../src/mod/module.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
  ../../../src/lang.h ../../../src/eggdrop.h ../../../src/flags.h \
  ../../../src/proto.h ../../../lush.h ../../../src/misc_file.h \
  ../../../src/cmdt.h ../../../src/tclegg.h ../../../src/tclhash.h \

src/mod/dns.mod/Makefile.in

@@ -36,7 +36,8 @@ distclean: clean
 
 #safety hash
 ../dns.o: .././dns.mod/dns.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/irc.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../irc.o: .././irc.mod/irc.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/notes.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../notes.o: .././notes.mod/notes.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/server.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../server.o: .././server.mod/server.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/share.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../share.o: .././share.mod/share.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/transfer.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../transfer.o: .././transfer.mod/transfer.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \

src/mod/update.mod/Makefile

@@ -31,7 +31,8 @@ distclean: clean
 
 #safety hash
 ../update.o: .././update.mod/update.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../src/lang.h \
+ ../../../src/main.h ../../../config.h ../../../src/conf.h \
+ ../../../src/lang.h \
  ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
  ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
  ../../../src/tclegg.h ../../../src/tclhash.h \

src/stringfix.c

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "conf.h"
 
 char tmp[] = { 0x0, 0x1 };