[cvslog] (2003-01-29 21:39:45 UTC) Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Wed Jan 29 15:40:01 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2003-01-29 21:39:45 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     eggdrop.conf lib/eggdrop/module.h modules/server/servsock.c
     src/dcc.c src/flags.c src/misc.c src/modules.c src/tcl.c

Log message:

* Renamed debug_output to raw_log.

---------------------- diff included ----------------------
Index: eggdrop1.7/eggdrop.conf
diff -u eggdrop1.7/eggdrop.conf:1.3 eggdrop1.7/eggdrop.conf:1.4
--- eggdrop1.7/eggdrop.conf:1.3	Fri Dec 27 17:07:53 2002
+++ eggdrop1.7/eggdrop.conf	Wed Jan 29 15:39:34 2003
@@ -2,7 +2,7 @@
 # ^- set that to the directory eggdrop is in i.e. "#! /home/lamest/egg/eggdrop"
 #  Make sure you preload a config parser using the -p<name> parameter.
 #
-# $Id: eggdrop.conf,v 1.3 2002/12/27 23:07:53 wcc Exp $
+# $Id: eggdrop.conf,v 1.4 2003/01/29 21:39:34 wcc Exp $
 #
 # This config file includes all possible options you can
 # use to configure your bot properly.
@@ -77,6 +77,14 @@
 # There are others, but you probably shouldn't log them, it'd be rather
 # unethical ;)
 
+# [0/1] enables certain console/logging flags which can be used to see all
+# information sent to and from the server, also botnet and share traffic.
+# NOTE: This is a large security hole, allowing people to see passwords and
+# other information they shouldn't otherwise really see. These flags are
+# restricted to +n users only. Please choose your owners carefully when you
+# enable this option.
+set raw_log 0
+
 # maximum number of logfiles to allow - this can be increased if needed
 # (don't decrease this)
 set max_logs 5
@@ -250,14 +258,6 @@
 # because you're behind a firewall, or for other security reasons, set it
 # here.
 #set reserved_portrange 2010:2020
-
-# [0/1] enables certain console/logging flags which can be used to see all
-# information sent to and from the server, also botnet and share traffic.
-# NOTE: This is a large security hole, allowing people to see passwords and
-# other information they shouldn't otherwise really see. These flags are
-# restricted to +n users only. Please choose your owners carefully when you
-# enable this option.
-set debug_output 0
 
 # temporary ignores will last how many minutes?
 set ignore_time 15
Index: eggdrop1.7/lib/eggdrop/module.h
diff -u eggdrop1.7/lib/eggdrop/module.h:1.36 eggdrop1.7/lib/eggdrop/module.h:1.37
--- eggdrop1.7/lib/eggdrop/module.h:1.36	Wed Jan 29 01:42:49 2003
+++ eggdrop1.7/lib/eggdrop/module.h	Wed Jan 29 15:39:35 2003
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 /*
- * $Id: module.h,v 1.36 2003/01/29 07:42:49 wcc Exp $
+ * $Id: module.h,v 1.37 2003/01/29 21:39:35 wcc Exp $
  */
 
 #ifndef _EGG_MOD_MODULE_H
@@ -179,7 +179,7 @@
 /* 104 - 107 */
 #define reserved_port_min (*(int *)(egg->global[104]))
 #define reserved_port_max (*(int *)(egg->global[105]))
-#define debug_output (*(int *)(egg->global[106]))
+#define raw_log (*(int *)(egg->global[106]))
 #define noshare (*(int *)(egg->global[107]))
 /* 108 - 111 */
 /* 108: gban_total -- UNUSED (Eule) */
Index: eggdrop1.7/modules/server/servsock.c
diff -u eggdrop1.7/modules/server/servsock.c:1.4 eggdrop1.7/modules/server/servsock.c:1.5
--- eggdrop1.7/modules/server/servsock.c:1.4	Fri Oct 11 04:00:35 2002
+++ eggdrop1.7/modules/server/servsock.c	Wed Jan 29 15:39:35 2003
@@ -129,7 +129,7 @@
 
 	/* This would be a good place to put an SFILT bind, so that scripts
 		and other modules can modify text sent from the server. */
-	if (debug_output) {
+	if (raw_log) {
 		putlog(LOG_RAW, "*", "[@] %s", text);
 	}
 
Index: eggdrop1.7/src/dcc.c
diff -u eggdrop1.7/src/dcc.c:1.95 eggdrop1.7/src/dcc.c:1.96
--- eggdrop1.7/src/dcc.c:1.95	Thu Jan  2 15:33:16 2003
+++ eggdrop1.7/src/dcc.c	Wed Jan 29 15:39:35 2003
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: dcc.c,v 1.95 2003/01/02 21:33:16 wcc Exp $";
+static const char rcsid[] = "$Id: dcc.c,v 1.96 2003/01/29 21:39:35 wcc Exp $";
 #endif
 
 #include "main.h"
@@ -55,7 +55,7 @@
 extern struct chanset_t	*chanset;
 extern time_t		 now;
 extern int		 egg_numver, connect_timeout, conmask, backgrd,
-			 make_userfile, default_flags, debug_output,
+			 make_userfile, default_flags, raw_log,
 			 ignore_time, par_telnet_flood;
 extern char		 botnetnick[], ver[], origbotname[], notify_new[];
 
Index: eggdrop1.7/src/flags.c
diff -u eggdrop1.7/src/flags.c:1.34 eggdrop1.7/src/flags.c:1.35
--- eggdrop1.7/src/flags.c:1.34	Thu Jan  2 15:33:16 2003
+++ eggdrop1.7/src/flags.c	Wed Jan 29 15:39:35 2003
@@ -23,7 +23,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: flags.c,v 1.34 2003/01/02 21:33:16 wcc Exp $";
+static const char rcsid[] = "$Id: flags.c,v 1.35 2003/01/29 21:39:35 wcc Exp $";
 #endif
 
 #include <ctype.h>
@@ -36,7 +36,7 @@
 #include "irccmp.h"		/* irccmp				*/
 #include "flags.h"		/* prototypes				*/
 
-extern int		 debug_output, noshare, allow_dk_cmds;
+extern int		 raw_log, noshare, allow_dk_cmds;
 
 typedef struct {
 	int flag;
@@ -71,7 +71,7 @@
 	{0}
 };
 
-#define NEEDS_DEBUG_OUTPUT (LOG_RAW|LOG_SRVOUT|LOG_BOTNET|LOG_BOTSHARE)
+#define NEEDS_RAW_LOG (LOG_RAW|LOG_SRVOUT|LOG_BOTNET|LOG_BOTSHARE)
 
 int logmodes(char *s)
 {
@@ -97,7 +97,7 @@
 
 	for (mapping = logmode_mappings; mapping->type; mapping++) {
 		if (x & mapping->flag) {
-			if ((mapping->flag & NEEDS_DEBUG_OUTPUT) && !debug_output) continue;
+			if ((mapping->flag & NEEDS_RAW_LOG) && !raw_log) continue;
 			*p++ = mapping->c;
 		}
 	}
@@ -115,7 +115,7 @@
 	*s = 0;
 	for (mapping = logmode_mappings; mapping->type; mapping++) {
 		if (x & mapping->flag) {
-			if ((mapping->flag & NEEDS_DEBUG_OUTPUT) && !debug_output) continue;
+			if ((mapping->flag & NEEDS_RAW_LOG) && !raw_log) continue;
 			strcat(s, mapping->type);
 			strcat(s, ", ");
 		}
Index: eggdrop1.7/src/misc.c
diff -u eggdrop1.7/src/misc.c:1.71 eggdrop1.7/src/misc.c:1.72
--- eggdrop1.7/src/misc.c:1.71	Thu Jan  2 15:33:16 2003
+++ eggdrop1.7/src/misc.c	Wed Jan 29 15:39:35 2003
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: misc.c,v 1.71 2003/01/02 21:33:16 wcc Exp $";
+static const char rcsid[] = "$Id: misc.c,v 1.72 2003/01/29 21:39:35 wcc Exp $";
 #endif
 
 #include "main.h"
@@ -56,7 +56,7 @@
 
 
 int	 conmask = LOG_MODES | LOG_CMDS | LOG_MISC; /* Console mask */
-int	 debug_output = 0;	/* Disply output to server to LOG_SERVEROUT */
+int	 raw_log = 0;	/* Disply output to server to LOG_SERVEROUT */
 
 struct help_list_t {
   struct help_list_t *next;
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.125 eggdrop1.7/src/modules.c:1.126
--- eggdrop1.7/src/modules.c:1.125	Wed Jan 29 01:42:50 2003
+++ eggdrop1.7/src/modules.c	Wed Jan 29 15:39:35 2003
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: modules.c,v 1.125 2003/01/29 07:42:50 wcc Exp $";
+static const char rcsid[] = "$Id: modules.c,v 1.126 2003/01/29 21:39:35 wcc Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -76,7 +76,7 @@
 			 version[], quit_msg[];
 extern int	 noshare, dcc_total, egg_numver, userfile_perm,
 			 ignore_time, learn_users,
-			 debug_output, make_userfile, default_flags,
+			 raw_log, make_userfile, default_flags,
 			 max_dcc, share_greet, password_timeout,
 			 use_invites, use_exempts, force_expire, do_restart,
 			 protect_readonly, reserved_port_min, reserved_port_max,
@@ -299,7 +299,7 @@
   /* 104 - 107 */
   (Function) & reserved_port_min,
   (Function) & reserved_port_max,
-  (Function) & debug_output,	 /* int					*/
+  (Function) & raw_log,	 	 /* int					*/
   (Function) & noshare,		 /* int					*/
   /* 108 - 111 */
   (Function) 0, /* gban_total -- UNUSED! (Eule)				*/
Index: eggdrop1.7/src/tcl.c
diff -u eggdrop1.7/src/tcl.c:1.89 eggdrop1.7/src/tcl.c:1.90
--- eggdrop1.7/src/tcl.c:1.89	Wed Jan 29 01:42:50 2003
+++ eggdrop1.7/src/tcl.c	Wed Jan 29 15:39:35 2003
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: tcl.c,v 1.89 2003/01/29 07:42:50 wcc Exp $";
+static const char rcsid[] = "$Id: tcl.c,v 1.90 2003/01/29 21:39:35 wcc Exp $";
 #endif
 
 #include <stdlib.h>		/* getenv()				*/
@@ -60,7 +60,7 @@
 		moddir[], tempdir[], owner[], network[], botnetnick[],
 		bannerfile[], egg_version[], natip[], configfile[],
 		textdir[], myip6[], pid_file[];
-extern int	die_on_sighup, die_on_sigterm, dcc_total, debug_output,
+extern int	die_on_sighup, die_on_sigterm, dcc_total, raw_log,
 		identtimeout, egg_numver,
 		userfile_perm, default_uflags, strict_host;
 extern struct dcc_t	*dcc;
@@ -300,7 +300,7 @@
   {"die_on_sighup",		&die_on_sighup,		1},
   {"die_on_sigterm",		&die_on_sigterm,	1},
   {"remote_boots",		&remote_boots,		1},
-  {"debug_output",		&debug_output,		1},
+  {"raw_log",			&raw_log,		1},
   {"allow_dk_cmds",		&allow_dk_cmds,		0},
   {"use_exempts",		&use_exempts,		0},			/* Jason/drummer */
   {"use_invites",		&use_invites,		0},			/* Jason/drummer */
----------------------- End of diff -----------------------



More information about the Changes mailing list