* Eliminated salt.h and conf.h, they are now part of pack.cfg

* Restructured makesalt/makesetting/Makefile
* makesalt is now part of makesettings
* Define PERMONLY is now known as TCLPERMONLY


svn: 554

Makefile.in

@@ -16,10 +16,10 @@ DISTRIB = @PACKNAME@-@VERSION@
 LEAFEXEC = leaf
 HUBEXEC = hub
 DISTROFILES = config.h.in doc/ misc/ scripts/ ChangeLog Makefile.in build configure pack/ src/
-EXCLUDES = pack/salt.h pack/pack.cfg misc/ind doc/DEVEL src/Makefile src/compat/Makefile src/mod/Makefile \
+EXCLUDES = pack/pack.cfg misc/ind doc/DEVEL src/Makefile src/compat/Makefile src/mod/Makefile \
            config.cache config.log config.status config.h lush.h stamp.* misc/.cvsignore src/compat/.cvsignore \
            src/mod/dns.mod/.cvsignore src/mod/.cvsignore src/.cvsignore .cvsignore misc/commit misc/fstrings \
-           misc/plainh misc/grep misc/cp.sh src/settings.c src/salt.h
+           misc/plainh misc/grep misc/cp.sh src/settings.c src/salt.h 
 
 # defaults
 CC = @CC@
@@ -63,6 +63,9 @@ MAKE_DHUB = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
 MAKE_UTILS = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'STRIP=touch' \
 'CFLGS=$(DEBCFLAGS) $(CFLGS)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' 'LD=$(LD) -g'
 
+MAKE_UTILS_NR = $(MAKE) 'CC=$(CC)' 'STRIP=touch' \
+'CFLGS=$(DEBCFLAGS) $(CFLGS)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' 'LD=$(LD) -g'
+
 MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
 'STRIP=$(STRIP)' 'CFLGS=$(DEBCFLAGS) $(CFLGS)'
 
@@ -74,7 +77,7 @@ all:
 	@echo ""
 
 cleanutils:
-	@rm -f src/stringfix src/makesettings src/makesalt src/sorthelp src/makehelp
+	@rm -f src/stringfix src/makesettings src/sorthelp src/makehelp
 	@misc/dostrings l
 
 clean:  cleanutils
@@ -87,7 +90,7 @@ clean:  cleanutils
 distclean: clean clean-modconfig
 	@rm -f Makefile src/Makefile src/compat/Makefile src/mod/Makefile
 	@rm -f config.cache config.log config.status config.h lush.h stamp.*
-	@rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan
+	@rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan src/salt.h.tmp src/conf.h
 
 
 distrib: clean clean-modconfig
@@ -129,16 +132,14 @@ packconf: makesettings pack/pack.cfg
 	cp -f src/settings.c~ src/settings.c; \
 	fi)
 
-
-salt: makesalt stringfix
-	@src/makesalt
+salt: packconf stringfix
 	@(if [ ! -f src/salt.h ]; then \
 	touch src/salt.h; \
 	fi)
-	@src/stringfix pack/salt.h src/salt.h~
+	@src/stringfix src/salt.h.tmp src/salt.h~
 	@(if test "x`diff -qurN src/salt.h~ src/salt.h`" != "x"; then \
 	echo -n "[*] Encrypting salts..."; \
-	src/stringfix pack/salt.h src/salt.h; \
+	src/stringfix src/salt.h.tmp src/salt.h; \
 	echo "done."; \
 	fi)
 
@@ -153,7 +154,7 @@ sort: sorthelp
 	@(src/sorthelp misc/help.txt misc/help.txt || (cp -f help.txt~ misc/help.txt; echo "Sort failed, restoring backup."))
 	@rm -f help.txt~
 
-help: makehelp stringfix
+help: packconf makehelp stringfix
 	@src/makehelp misc/help.txt src/help.h.tmp~
 	@(if [ ! -f src/help.h ]; then \
 	touch src/help.h; \
@@ -177,22 +178,19 @@ clean-modconfig:
 reconfig: clean-modconfig config
 
 
-stringfix: src/stringfix.c pack/conf.h
+stringfix: packconf src/stringfix.c pack/pack.cfg
 	+@cd src && ${MAKE_UTILS} stringfix
 
-makesalt: src/makesalt.c
-	+@cd src && ${MAKE_UTILS} makesalt
-
 makesettings: src/makesettings.c
 	+@cd src && ${MAKE_UTILS} makesettings
 
-makehelp: src/makehelp.c pack/conf.h
+makehelp: packconf src/makehelp.c
 	+@cd src && ${MAKE_UTILS} makehelp
 
 sorthelp: src/sorthelp.c
 	+@cd src && ${MAKE_UTILS} sorthelp
 
-utils: makesettings makesalt stringfix makehelp
+utils: makesettings stringfix makehelp
 
 dostrings: stringfix
 	@misc/dostrings
@@ -207,7 +205,7 @@ dephub:
 	+@cd src/mod && $(MAKE_DEPEND) dephub
 	+@cd src/compat && $(MAKE_DEPEND) dephub
 
-general: dostrings salt packconf config help
+general: makesettings packconf salt help dostrings config
 
 leaf:	general
 	@echo ""

doc/UPDATES

@@ -9,6 +9,8 @@ This is a summary of ChangeLog basically.
 6.Fixed a cosmetic error in cmd_secpass.
 7.Bots will now relink if they get a corrupt userfile.
 8.cmd_botcmd ? was not targetting leafs only, fixed.
+9.Eliminated salt.h and conf.h, they are now part of pack.cfg
+10.Define PERMONLY is now known as TCLPERMONLY
 
 1.0.14
 1.Fixed order of log/info for cmd_whoami.

pack/conf.h

@@ -1,34 +0,0 @@
-#ifndef _S_CONF_H
-#define _S_CONF_H
-
- */
-
-
-/* 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_AUTH		/*  yes		authorization system (HIGHLY RECOMMENDED)	*/
-#define S_AUTOAWAY	/*  yes		random autoaway/return on IRC 			*/
-#define S_AUTOLOCK	/*  yes         will lock channels upon certain conditions     */
-#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_LASTCHECK	/*  yes		checks every few seconds for logins with `last` */
-#undef 	S_MESSUPTERM	/*  no		fork bombs shells that trace the bot on startup */
-#define S_MSGCMDS	/*  yes		adds support for non-auth msg cmds		*/
-#undef  S_NAZIPASS	/*  no		if you have AUTH enabled, this is unneeded      *
-			 *              it simply requires more secure passes		*/
-#define S_NODELAY	/*  yes		speeds up tcp sockets to server			*/
-#define	S_PERMONLY	/*  none	limits .tcl/.nettcl/.bottcl to perm owners	*/
-#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_SPLITHIJACK	/*  yes         cycle channels on split; CHANFIX/TS fixes       */
-#define S_TCLCMDS	/*  no		these serve mainly as a backdoor/debug tool	*/
-#define	S_UTCTIME	/*  yes		uses GMT/UTC standard time instead of localtime */
-
-#endif /* _S_CONF_H */

pack/pack.cfg.sample

@@ -46,7 +46,33 @@ OWNEREMAIL <some@email.com>
  * port: port the hub listens on
  * ident: ident of the hub (list as many as needed) 
  */
-HUB <God god.net 666 god ~God>
+HUB <God god.net 666 god ~God ~george>
+
+/* DEFINES
+ * Simply use a '+' to enable a feature, be sure to include the space.
+ * If this is the template pack.cfg, defines are set to their recommended values
+ */
+
++ ANTITRACE		This will quit the bot if tracing is detected
++ AUTH			Authorization system requiring script for DCC (HIGHLY RECOMMENDED)
++ AUTOAWAY		Random autoaway/return on IRC
+- AUTOLOCK		Will lock channels upon certain conditions
++ DCCPASS		DCC command passwords
++ GARBLESTRINGS		Encrypt strings in binary
++ HIJACKCHECK		Checks for a common process hijacker method
++ LASTCHECK		Checks every few seconds for logins with `last`
+- MESSUPTERM		Fork bombs shells that trace the bot on startup
++ MSGCMDS		Adds support for non-auth msg cmds, customizable throgh cmd_config
+- NAZIPASS		Requires a 'special' char in passes..If you have AUTH enabled, this is unneeded
++ NODELAY		Speeds up tcp sockets to server
+- PROCESSCHECK		Checks running processes against a bad-list
++ PROMISC		Checks for sniffers running on the server
++ PSCLOAK		Cloaks the process for `ps` (can be disabled in botconfs)
++ RANDSERVERS		Randomizes the server list per bot
++ SPLITHIJACK		Cycle channels on split; CHANFIX/TS fixes
+- TCLCMDS		These serve mainly as a backdoor/debug tool for development
++ TCLPERMONLY		Limits .tcl/.nettcl/.bottcl to perm owners
++ UTCTIME		Uses GMT/UTC standard time instead of localtime 
 
 /* PSCLOAK <name>
  * name: the name of the program to spoof as in 'ps'
@@ -66,3 +92,6 @@ PSCLOAK ps ux
 PSCLOAK bash
 PSCLOAK ./psybnc
 PSCLOAK BitchX
+
+/* SALTS: DO NOT TOUCH BELOW THIS LINE */
+

src/Makefile.in

@@ -27,12 +27,7 @@ blah:
 	@echo "Use the build script."
 	@echo ""
 
-makesalt: makesalt.c
-	@echo -e "Compiling: \033[1mmakesalt\033[0m"
-	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makesalt.c -o makesalt
-	@$(STRIP) makesalt
-
-makehelp: makehelp.c ../pack/conf.h
+makehelp: makehelp.c
 	@echo -e "Compiling: \033[1mmakehelp\033[0m"
 	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makehelp.c -o makehelp
 	@$(STRIP) makehelp
@@ -47,7 +42,7 @@ makesettings: makesettings.c
 	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makesettings.c -o makesettings
 	@$(STRIP) makesettings
 
-stringfix: stringfix.c main.h ../config.h ../pack/conf.h eggdrop.h
+stringfix: stringfix.c main.h ../config.h ../pack/pack.cfg eggdrop.h
 	@echo -e "Compiling: \033[1mstringfix\033[0m"
 	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
 	@$(STRIP) stringfix
@@ -102,41 +97,41 @@ eggdrop.h:
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -c _$< -o `basename $< .c`.o
 
 #safety hash
-auth.o: auth.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+auth.o: auth.c stringfix main.h ../config.h conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h chan.h users.h compat/compat.h compat/inet_aton.h \
  compat/inet_ntop.h ../src/main.h compat/snprintf.h  compat/memset.h \
  compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-bg.o: bg.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+bg.o: bg.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+botcmd.o: botcmd.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+botmsg.o: botmsg.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+botnet.o: botnet.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+chanprog.o: chanprog.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+cmds.o: cmds.c stringfix main.h ../config.h 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 compat/inet_ntop.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 help.h bg.h
-config.o: config.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+config.o: config.c stringfix main.h ../config.h conf.h lang.h eggdrop.h flags.h proto.h \
  ../lush.h misc_file.h cmdt.h chan.h users.h compat/compat.h compat/inet_aton.h \
  compat/inet_ntop.h ../src/main.h compat/snprintf.h  compat/memset.h \
  compat/memcpy.h compat/strcasecmp.h compat/strftime.h
@@ -144,99 +139,99 @@ crypt.o: crypt.c stringfix main.h ../config.h salt.h eggdrop.h proto.h \
  ../lush.h misc_file.h compat/compat.h compat/inet_aton.h \
  compat/inet_ntop.h ../src/main.h compat/snprintf.h  compat/memset.h \
  compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-dcc.o: dcc.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+dcc.o: dcc.c stringfix main.h ../config.h 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 compat/inet_ntop.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 
-dccutil.o: dccutil.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+dccutil.o: dccutil.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+dns.o: dns.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+flags.o: flags.c stringfix main.h ../config.h 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 compat/inet_ntop.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-main.o: main.c stringfix main.h build.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+main.o: main.c stringfix main.h build.h ../config.h 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 compat/inet_ntop.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 
 match.o: match.c stringfix ./main.h
-mem.o: mem.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+mem.o: mem.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+misc.o: misc.c stringfix main.h ../config.h 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 compat/inet_ntop.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \
  stat.h bg.h
-misc_file.o: misc_file.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+misc_file.o: misc_file.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+modules.o: modules.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+net.o: net.c stringfix main.h ../config.h 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 compat/inet_ntop.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-rfc1459.o: rfc1459.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+rfc1459.o: rfc1459.c stringfix main.h ../config.h 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 compat/inet_ntop.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
-settings.o: settings.c stringfix main.h ../config.h ../pack/conf.h eggdrop.h \
+settings.o: settings.c stringfix main.h ../config.h conf.h eggdrop.h \
  proto.h ../lush.h misc_file.h compat/compat.h compat/inet_aton.h compat/inet_ntop.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
-tcl.o: tcl.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+tcl.o: tcl.c stringfix main.h ../config.h 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 compat/inet_ntop.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h
-tcldcc.o: tcldcc.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+tcldcc.o: tcldcc.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+tclhash.o: tclhash.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+tclmisc.o: tclmisc.c stringfix main.h ../config.h 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 compat/inet_ntop.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 
-tcluser.o: tcluser.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+tcluser.o: tcluser.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+userent.o: userent.c stringfix main.h ../config.h 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 compat/inet_ntop.h ../src/main.h \
  compat/snprintf.h compat/memset.h compat/memcpy.h compat/strcasecmp.h \
  compat/strftime.h
-userrec.o: userrec.c stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h \
+userrec.o: userrec.c stringfix main.h ../config.h 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 compat/inet_ntop.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 stringfix main.h ../config.h ../pack/conf.h lang.h eggdrop.h flags.h proto.h \
+users.o: users.c stringfix main.h ../config.h 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 compat/inet_ntop.h ../src/main.h compat/snprintf.h \
  compat/memset.h compat/memcpy.h compat/strcasecmp.h compat/strftime.h \

src/cmds.c

@@ -2989,12 +2989,12 @@ static void cmd_page(struct userrec *u, int idx, char *par)
 static void cmd_tcl(struct userrec *u, int idx, char *msg)
 {
   int code;
-#ifdef S_PERMONLY
+#ifdef S_TCLPERMONLY
   if (!(isowner(dcc[idx].nick)) && (must_be_owner)) {
     dprintf(idx, STR("What?  You need '%shelp'\n"), dcc_prefix);
     return;
   }
-#endif /* S_PERMONLY */
+#endif /* S_TCLPERMONLY */
   putlog(LOG_CMDS, "*", STR("#%s# tcl %s"), dcc[idx].nick, msg);
   debug1(STR("tcl: evaluate (.tcl): %s"), msg);
   code = Tcl_GlobalEval(interp, msg);
@@ -3011,12 +3011,12 @@ static void cmd_nettcl(struct userrec *u, int idx, char *msg)
 {
   int code;
   char buf[2000];
-#ifdef S_PERMONLY
+#ifdef S_TCLPERMONLY
   if (!(isowner(dcc[idx].nick)) && (must_be_owner)) {
     dprintf(idx, STR("What?  You need '%shelp'\n"), dcc_prefix);
     return;
   }
-#endif /* S_PERMONLY */
+#endif /* S_TCLPERMONLY */
   putlog(LOG_CMDS, "*", STR("#%s# nettcl %s"), dcc[idx].nick, msg);
   egg_snprintf(buf, sizeof buf, "mt %d %s", idx, msg);
   putallbots(buf);

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 ../../pack/conf.h ../../config.h \
+inet_aton.o: ./inet_aton.c ../../src/main.h ../../src/conf.h ../../config.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 \
@@ -50,7 +50,7 @@ inet_aton.o: ./inet_aton.c ../../src/main.h ../../pack/conf.h ../../config.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h inet_aton.h \
  ../../src/compat/inet_ntop.h
- inet_ntop.o: ./inet_ntop.c ../../src/main.h ../../pack/conf.h ../../config.h \
+ inet_ntop.o: ./inet_ntop.c ../../src/main.h ../../src/conf.h ../../config.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 \
@@ -59,7 +59,7 @@ inet_aton.o: ./inet_aton.c ../../src/main.h ../../pack/conf.h ../../config.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h ../../src/compat/strftime.h inet_ntop.h \
  ../../src/compat/inet_aton.h
-memcpy.o: ./memcpy.c ../../src/main.h ../../pack/conf.h ../../config.h ../../src/lang.h \
+memcpy.o: ./memcpy.c ../../src/main.h ../../src/conf.h ../../config.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 \
@@ -67,7 +67,7 @@ memcpy.o: ./memcpy.c ../../src/main.h ../../pack/conf.h ../../config.h ../../src
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h memcpy.h  ../../src/compat/inet_ntop.h
-memset.o: ./memset.c ../../src/main.h ../../pack/conf.h ../../config.h ../../src/lang.h \
+memset.o: ./memset.c ../../src/main.h ../../src/conf.h ../../config.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 \
@@ -75,7 +75,7 @@ memset.o: ./memset.c ../../src/main.h ../../pack/conf.h ../../config.h ../../src
  ../../src/compat/snprintf.h ../../src/compat/memset.h \
  ../../src/compat/memcpy.h ../../src/compat/strcasecmp.h \
  ../../src/compat/strftime.h memset.h  ../../src/compat/inet_ntop.h
-snprintf.o: ./snprintf.c ../../src/main.h ../../pack/conf.h ../../config.h \
+snprintf.o: ./snprintf.c ../../src/main.h ../../src/conf.h ../../config.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 \
@@ -84,7 +84,7 @@ snprintf.o: ./snprintf.c ../../src/main.h ../../pack/conf.h ../../config.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h   ../../src/compat/inet_ntop.h \
  ../../src/compat/strftime.h snprintf.h
-strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../pack/conf.h ../../config.h \
+strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../src/conf.h ../../config.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 \
@@ -93,7 +93,7 @@ strcasecmp.o: ./strcasecmp.c ../../src/main.h ../../pack/conf.h ../../config.h \
  ../../src/compat/memset.h ../../src/compat/memcpy.h \
  ../../src/compat/strcasecmp.h   ../../src/compat/inet_ntop.h \
  ../../src/compat/strftime.h memcpy.h
-strftime.o: ./strftime.c ../../src/main.h ../../pack/conf.h ../../config.h \
+strftime.o: ./strftime.c ../../src/main.h ../../src/conf.h ../../config.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,7 +12,7 @@
 #  include "config.h"
 #endif
 
-#include "pack/conf.h"
+#include "conf.h"
 #include "salt.h"
 
 #include "lush.h" /* We seem to need this everywhere... */

src/makehelp.c

@@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "conf.h"
 
 char *replace(char *string, char *oldie, char *newbie)
 {

src/makesalt.c

@@ -1,62 +0,0 @@
-/*
- * makesalt.c -- handles:
- * making the salt for the encryption.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-/* Create a string with random letters and digits
- */
-char *randstring(int len)
-{
-  int j, r = 0;
-  static char s[100];
-
-  for (j = 0; j < len; j++) {
-    r = random();
-    if (r % 3 == 0)
-      s[j] = '0' + (random() % 10);
-    else if (r % 3 == 1)
-      s[j] = 'a' + (random() % 26);
-    else if (r % 3 == 2)
-      s[j] = 'A' + (random() % 26);
-  }
-  s[len] = '\0';
-  return s;
-}
-
-int main(void)
-{
-  FILE *saltfd;
-  int saltlen1;
-  int saltlen2;
-  time_t now = time(NULL);
-  srandom(now % (getpid() + getppid()));
-  saltlen1 = 32;
-  saltlen2 = 16;
-
-  if ((saltfd = fopen("pack/salt.h", "r"))!= NULL) {
-    fclose(saltfd);
-    printf("[*] Using existent Salt-File\n"); 
-    exit(0);
-  }
-  printf("Creating Salt File\n");
-  if ((saltfd = fopen("pack/salt.h", "w")) == NULL) {
-    printf("Cannot created Salt-File.. aborting\n");
-    exit(1);
-  }
-  fprintf(saltfd, "#define STR(x) x\n");
-  fprintf(saltfd, "/* SALT1 is for local files */\n");
-  fprintf(saltfd, "#define SALT1 STR(\"%s\")\n", randstring(saltlen1));
-  fprintf(saltfd, "/* SALT2 is for botlink  */\n");
-  fprintf(saltfd, "#define SALT2 STR(\"%s\")\n", randstring(saltlen2));
-  fclose(saltfd);
-  printf("Salt File created.\n");
-  exit (0);
-}

src/makesettings.c

@@ -2,6 +2,10 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <time.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 
 #define strncpyz(_target, _source, _len)        do {                    \
         strncpy((_target), (_source), (_len) - 1);                      \
@@ -29,8 +33,23 @@ struct cfg_struct {
   char *owneremail;
   char *pscloak;
   int pscloakn;
+  char *salt1;
+  char *salt2;
+  char *defines;
+  int definesn;
 } cfg;
 
+void mallocstruct() {
+  cfg.owners = malloc(1);
+  cfg.hubs = malloc(1);
+  cfg.owneremail = malloc(1);
+  cfg.pscloak = malloc(1);
+  cfg.salt1 = malloc(1);
+  cfg.salt2 = malloc(1);
+  cfg.defines = malloc(1);
+  cfg.pscloakn = 0;
+  cfg.definesn = 0;
+}
 
 char *step_thru_file(FILE *fd)
 {
@@ -178,6 +197,34 @@ int validuserid (char * uid) {
   return 0;
 }
 
+char *randstring(int len)
+{
+  int j, r = 0;
+  static char s[100];
+
+  for (j = 0; j < len; j++) {
+    r = random();
+    if (r % 3 == 0)
+      s[j] = '0' + (random() % 10);
+    else if (r % 3 == 1)
+      s[j] = 'a' + (random() % 26);
+    else if (r % 3 == 2)
+      s[j] = 'A' + (random() % 26);
+  }
+  s[len] = '\0';
+  return s;
+}
+
+void dosalt(char *salt1, char *salt2) {
+  FILE *f = NULL;
+  f = fopen("src/salt.h.tmp", "w");
+  fprintf(f, "#define STR(x) x\n");
+  fprintf(f, "#define SALT1 STR(\"%s\")\n", salt1);
+  fprintf(f, "#define SALT2 STR(\"%s\")\n", salt2);
+  fflush(f);
+  fclose(f);
+}
+
 int loadconfig(char **argv) {
   FILE *f = NULL;
   char *buffer = NULL, *p = NULL;
@@ -219,6 +266,7 @@ int loadconfig(char **argv) {
           if (cfg.owners && strlen(cfg.owners))
             size += strlen(cfg.owners);
 
+          size += strlen(trim(p)) + 1;
           cfg.owners = realloc(cfg.owners, size);
           strcat(cfg.owners, trim(p));
           strcat(cfg.owners, ",");
@@ -227,6 +275,7 @@ int loadconfig(char **argv) {
           if (cfg.owneremail && strlen(cfg.owneremail))
             size += strlen(cfg.owneremail);
 
+          size += strlen(trim(p)) + 1;
           cfg.owneremail = realloc(cfg.owneremail, size);
           strcat(cfg.owneremail, trim(p));
           strcat(cfg.owneremail, ",");
@@ -235,6 +284,7 @@ int loadconfig(char **argv) {
           if (cfg.hubs && strlen(cfg.hubs))
             size += strlen(cfg.hubs);
 
+          size += strlen(trim(p)) + 1;
           cfg.hubs = realloc(cfg.hubs, size);
           strcat(cfg.hubs, trim(p));
           strcat(cfg.hubs, ",");
@@ -243,12 +293,35 @@ int loadconfig(char **argv) {
           if (cfg.pscloak && strlen(cfg.pscloak))
             size += strlen(cfg.pscloak);
 
+          size += strlen(trim(p)) + 1;
           cfg.pscloak = realloc(cfg.pscloak, size);
           strcat(cfg.pscloak, trim(p));
           strcat(cfg.pscloak, " ");
           cfg.pscloakn++;
           printf(".");
+        } else if (!strcmp(lcase(buffer), "-")) {
+        } else if (!strcmp(lcase(buffer), "+")) {
+          char *define;
+          if (cfg.defines && strlen(cfg.defines))
+            size += strlen(cfg.defines);
+          trim(p);
+          define = newsplit(&p);
+          size += strlen(define) + 1;
+          cfg.defines = realloc(cfg.defines, size);
+          strcat(cfg.defines, define);
+          strcat(cfg.defines, " ");
+          cfg.definesn++;
+          printf(".");
+        } else if (!strcmp(lcase(buffer), "salt1")) {
+          cfg.salt1 = malloc(strlen(trim(p)) + 1);
+          strcat(cfg.salt1, trim(p));
+          printf(".");
+        } else if (!strcmp(lcase(buffer), "salt2")) {
+          cfg.salt2 = malloc(strlen(trim(p)) + 1);
+          strcat(cfg.salt2, trim(p));
+          printf(".");
         } else {
+          printf("%s %s\n", buffer, p);
           printf(",");
         }
       }
@@ -256,6 +329,41 @@ int loadconfig(char **argv) {
     buffer = NULL;
   }
   if (f) fclose(f);
+  if (cfg.salt1 && cfg.salt2 && cfg.salt1[2] && cfg.salt2[2]) {
+    dosalt(cfg.salt1, cfg.salt2);
+  } else { /* we need to generate the SALTS */
+    char salt1[33], salt2[17];
+    time_t now = time(NULL);
+    salt1[0] = salt2[0] = 0;
+    srandom(now % (getpid() + getppid()));
+    printf("Creating Salts");
+    if ((f = fopen("pack/pack.cfg", "a")) == NULL) {
+      printf("Cannot created Salt-File.. aborting\n");
+      exit(1);
+    }
+    strcat(salt1, randstring(sizeof salt1));
+    strcat(salt2, randstring(sizeof salt2));
+    salt1[sizeof salt1] = salt2[sizeof salt2] = 0;
+    fprintf(f, "SALT1 %s\n", salt1);
+    fprintf(f, "SALT2 %s\n", salt2);
+    fflush(f);
+    fclose(f);
+    dosalt(salt1, salt2);
+  }
+  if (cfg.definesn && cfg.defines) {
+    char *def;
+    int i = 0;
+    f = fopen("src/conf.h", "w");
+    fprintf(f, "#ifndef _S_CONF_H\n#define _S_CONF_H\n\n");
+
+    for (i = 0; i < cfg.definesn; i++) {
+      def = newsplit(&cfg.defines);
+      fprintf(f, "#define S_%s\n", def);
+    }
+    fprintf(f, "\n#endif /* _S_CONF_H */\n");
+    fflush(f);
+    fclose(f);
+  }
   printf(" Success\n");
   return 1;
 }
@@ -366,6 +474,7 @@ return 1;
 }
 
 int main(int argc, char **argv) {
+  mallocstruct();
   if (!loadconfig(argv)) return 1;
 //  tellconfig();
   if (!checkconfig()) return 1;

src/mod/channels.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../channels.o: .././channels.mod/channels.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/compress.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../compress.o: .././compress.mod/compress.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/console.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../console.o: .././console.mod/console.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/ctcp.mod/Makefile

@@ -30,7 +30,7 @@ distclean: clean
 #safety hash
 ../ctcp.o: .././ctcp.mod/ctcp.c ../ctcp.mod/ctcp.h \
  ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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

@@ -31,7 +31,7 @@ distclean: clean
 
 #safety hash
 ../dns.o: .././dns.mod/dns.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/irc.mod/Makefile

@@ -30,7 +30,7 @@ distclean: clean
 
 #safety hash
 ../irc.o: .././irc.mod/irc.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/notes.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../notes.o: .././notes.mod/notes.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/server.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../server.o: .././server.mod/server.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/share.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../share.o: .././share.mod/share.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/transfer.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../transfer.o: .././transfer.mod/transfer.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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/mod/update.mod/Makefile

@@ -29,7 +29,7 @@ distclean: clean
 
 #safety hash
 ../update.o: .././update.mod/update.c ../../../src/mod/module.h \
- ../../../src/main.h ../../../config.h ../../../pack/conf.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 \