[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Fri Oct 19 01:02:00 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-19 06:01:32 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     eggdrop.complete.conf doc/html/egg-core.html
     doc/html/mod-server.html doc/settings/core.settings
     doc/settings/mod.server src/flags.c src/modules.c
     src/mod/module.h src/mod/server.mod/server.c
     src/mod/server.mod/servmsg.c

Log message:

* removed use-console-r since we have debug-output
* removed +r as a log option we tell people about since it used for debugging purposes like +v and the others.
* made sure I didn't commit the wrong files this time <g>

---------------------- diff included ----------------------
Index: eggdrop1.7/doc/html/egg-core.html
diff -u eggdrop1.7/doc/html/egg-core.html:1.16 eggdrop1.7/doc/html/egg-core.html:1.17
--- eggdrop1.7/doc/html/egg-core.html:1.16	Fri Oct 19 00:26:32 2001
+++ eggdrop1.7/doc/html/egg-core.html	Fri Oct 19 01:01:20 2001
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: egg-core.html,v 1.16 2001/10/19 05:26:32 guppy Exp $ -->
+<!-- $Id: egg-core.html,v 1.17 2001/10/19 06:01:20 guppy Exp $ -->
 
 <html>
   <head>
@@ -223,8 +223,6 @@
            b information about bot linking and userfile sharing<br>
            c commands people use (via msg or dcc)<br>
            x file transfers and file-area commands<br>
-           r (if use-console-r enabled) EVERYTHING sent to the bot by the
-          server<br>
            o other: misc info, errors -- IMPORTANT STUFF<br>
            w wallops: msgs between IRCops (be sure to set the bot +w)</p>
 
Index: eggdrop1.7/doc/html/mod-server.html
diff -u eggdrop1.7/doc/html/mod-server.html:1.12 eggdrop1.7/doc/html/mod-server.html:1.13
--- eggdrop1.7/doc/html/mod-server.html:1.12	Wed Oct 10 08:15:59 2001
+++ eggdrop1.7/doc/html/mod-server.html	Fri Oct 19 01:01:20 2001
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-server.html,v 1.12 2001/10/10 13:15:59 tothwolf Exp $ -->
+<!-- $Id: mod-server.html,v 1.13 2001/10/19 06:01:20 guppy Exp $ -->
 
 <html>
   <head>
@@ -197,19 +197,6 @@
           you&#39;re going to dump large chunks of text to people over irc,
           you will probably want to raise this -- most people are fine at 300
           though</p>
-        </dd>
-
-        <dt><strong><em>set use-console-r 0</em></strong></dt>
-
-        <dd>
-          <p>This setting allows you the logging of all information got from
-          a server, via console mode &#39;r&#39;</p>
-
-          <p>NOTE: This is a large security hole, allowing people to see
-          passwords. This is now restricted to +n users only. Please choose
-          your owners with care.</p>
-
-          <p>Valid settings are 0 and 1.</p>
         </dd>
 
         <dt><strong><em>set debug-output 0</em></strong></dt>
Index: eggdrop1.7/doc/settings/core.settings
diff -u eggdrop1.7/doc/settings/core.settings:1.12 eggdrop1.7/doc/settings/core.settings:1.13
--- eggdrop1.7/doc/settings/core.settings:1.12	Fri Oct 19 00:26:32 2001
+++ eggdrop1.7/doc/settings/core.settings	Fri Oct 19 01:01:20 2001
@@ -104,7 +104,6 @@
       b  information about bot linking and userfile sharing
       c  commands people use (via msg or dcc)
       x  file transfers and file-area commands
-      r  (if use-console-r enabled) EVERYTHING sent to the bot by the server
       o  other: misc info, errors -- IMPORTANT STUFF
       w  wallops: msgs between IRCops (be sure to set the bot +w)
     There are others, but you probably shouldnt log them, it'd be
Index: eggdrop1.7/doc/settings/mod.server
diff -u eggdrop1.7/doc/settings/mod.server:1.11 eggdrop1.7/doc/settings/mod.server:1.12
--- eggdrop1.7/doc/settings/mod.server:1.11	Sun Aug 12 22:58:29 2001
+++ eggdrop1.7/doc/settings/mod.server	Fri Oct 19 01:01:20 2001
@@ -107,15 +107,6 @@
     want to raise this -- most people are fine at 300 though
 
 
-set use-console-r 0
-    This setting allows you the logging of all information got from a server,
-    via console mode 'r'
-    NOTE: This is a large security hole, allowing people to see passwords.
-    This is now restricted to +n users only. Please choose your owners with
-    care.
-    Valid settings are 0 for OFF and 1 ON.
-
-
 set debug-output 0
     This setting allows you the logging of all information sent to a server,
     via console mode 'v'
Index: eggdrop1.7/eggdrop.complete.conf
diff -u eggdrop1.7/eggdrop.complete.conf:1.47 eggdrop1.7/eggdrop.complete.conf:1.48
--- eggdrop1.7/eggdrop.complete.conf:1.47	Fri Oct 19 00:26:31 2001
+++ eggdrop1.7/eggdrop.complete.conf	Fri Oct 19 01:01:20 2001
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- set that to the directory eggdrop is in i.e. "#! /home/lamest/egg/eggdrop"
 #
-# $Id: eggdrop.complete.conf,v 1.47 2001/10/19 05:26:31 guppy Exp $
+# $Id: eggdrop.complete.conf,v 1.48 2001/10/19 06:01:20 guppy Exp $
 #
 # This config file includes all possible options you can
 # use to configure your bot properly.
@@ -75,7 +75,6 @@
 #   b  information about bot linking and userfile sharing
 #   c  commands people use (via msg or dcc)
 #   x  file transfers and file-area commands
-#   r  (if use-console-r defined) EVERYTHING sent to the bot by the server
 #   o  other: misc info, errors -- IMPORTANT STUFF
 #   w  wallops: msgs between IRCops (be sure to set the bot +w)
 # There are others, but you probably shouldn't log them, it'd be rather
@@ -731,13 +730,6 @@
 # [0/1] check for stoned servers? (i.e. Where the server connection has
 # died, but eggdrop hasn't been notified yet).
 set check-stoned 1
-
-# [0/1] enable console mode 'r'?  this mode shows every raw message from the
-# server to owners with console 'r' selected -- will take a bit more CPU.
-# NOTE: This is a large security hole, allowing people to see mis-sent
-#       messages to the bot containing passwords
-# This is now restricted to +n users only. Please choose your owners with care.
-set use-console-r 0
 
 # [0/1] enable logging of all information sent *to* a server, via console mode 'v'
 # NOTE: This is a large security hole, allowing people to see passwords.
Index: eggdrop1.7/src/flags.c
diff -u eggdrop1.7/src/flags.c:1.22 eggdrop1.7/src/flags.c:1.23
--- eggdrop1.7/src/flags.c:1.22	Thu Oct 11 13:24:01 2001
+++ eggdrop1.7/src/flags.c	Fri Oct 19 01:01:21 2001
@@ -2,7 +2,7 @@
  * flags.c -- handles:
  *   all the flag matching/conversion functions in one neat package :)
  *
- * $Id: flags.c,v 1.22 2001/10/11 18:24:01 tothwolf Exp $
+ * $Id: flags.c,v 1.23 2001/10/19 06:01:21 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -26,13 +26,9 @@
 #include "main.h"
 
 
-extern int		 use_console_r, debug_output, require_p, noshare,
-			 allow_dk_cmds;
+extern int		 debug_output, require_p, noshare, allow_dk_cmds;
 extern struct dcc_t	*dcc;
 
-int	use_console_r = 0;	/* Allow users to set their console +r	*/
-
-
 int logmodes(char *s)
 {
   int i;
@@ -70,7 +66,7 @@
       break;
     case 'r':
     case 'R':
-      res |= use_console_r ? LOG_RAW : 0;
+      res |= debug_output ? LOG_RAW : 0;
       break;
     case 'w':
     case 'W':
@@ -150,7 +146,7 @@
     *p++ = 'o';
   if (x & LOG_BOTS)
     *p++ = 'b';
-  if ((x & LOG_RAW) && use_console_r)
+  if ((x & LOG_RAW) && debug_output)
     *p++ = 'r';
   if (x & LOG_FILES)
     *p++ = 'x';
@@ -208,7 +204,7 @@
     i += my_strcpy(s + i, "misc, ");
   if (x & LOG_BOTS)
     i += my_strcpy(s + i, "bots, ");
-  if ((x & LOG_RAW) && use_console_r)
+  if ((x & LOG_RAW) && debug_output)
     i += my_strcpy(s + i, "raw, ");
   if (x & LOG_FILES)
     i += my_strcpy(s + i, "files, ");
Index: eggdrop1.7/src/mod/module.h
diff -u eggdrop1.7/src/mod/module.h:1.69 eggdrop1.7/src/mod/module.h:1.70
--- eggdrop1.7/src/mod/module.h:1.69	Thu Oct 18 20:55:06 2001
+++ eggdrop1.7/src/mod/module.h	Fri Oct 19 01:01:21 2001
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.69 2001/10/19 01:55:06 tothwolf Exp $
+ * $Id: module.h,v 1.70 2001/10/19 06:01:21 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -195,7 +195,7 @@
 #define max_dcc (*(int *)global[100])
 #define require_p (*(int *)global[101])
 #define ignore_time (*(int *)(global[102]))
-#define use_console_r (*(int *)(global[103]))
+/* #define use_console_r (*(int *)(global[103])) */
 /* 104 - 107 */
 #define reserved_port_min (*(int *)(global[104]))
 #define reserved_port_max (*(int *)(global[105]))
Index: eggdrop1.7/src/mod/server.mod/server.c
diff -u eggdrop1.7/src/mod/server.mod/server.c:1.91 eggdrop1.7/src/mod/server.mod/server.c:1.92
--- eggdrop1.7/src/mod/server.mod/server.c:1.91	Thu Oct 18 20:55:08 2001
+++ eggdrop1.7/src/mod/server.mod/server.c	Fri Oct 19 01:01:21 2001
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.91 2001/10/19 01:55:08 tothwolf Exp $
+ * $Id: server.c,v 1.92 2001/10/19 06:01:21 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1283,7 +1283,6 @@
 
 static tcl_ints my_tcl_ints[] =
 {
-  {"use-console-r",		NULL,				1},
   {"server-timeout",		&server_timeout,		0},
   {"server-online",		(int *) &server_online,		2},
   {"never-give-up",		&never_give_up,			0},
@@ -1837,7 +1836,6 @@
   add_help_reference("server.help");
   my_tcl_strings[0].buf = botname;
   add_tcl_strings(my_tcl_strings);
-  my_tcl_ints[0].val = &use_console_r;
   add_tcl_ints(my_tcl_ints);
   add_tcl_commands(my_tcl_cmds);
   add_tcl_coups(my_tcl_coups);
Index: eggdrop1.7/src/mod/server.mod/servmsg.c
diff -u eggdrop1.7/src/mod/server.mod/servmsg.c:1.79 eggdrop1.7/src/mod/server.mod/servmsg.c:1.80
--- eggdrop1.7/src/mod/server.mod/servmsg.c:1.79	Thu Oct 18 20:55:08 2001
+++ eggdrop1.7/src/mod/server.mod/servmsg.c	Fri Oct 19 01:01:22 2001
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.79 2001/10/19 01:55:08 tothwolf Exp $
+ * $Id: servmsg.c,v 1.80 2001/10/19 06:01:22 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -951,17 +951,12 @@
     from = newsplit(&msg);
   }
   code = newsplit(&msg);
-  if (use_console_r) {
-    if (!strcmp(code, "PRIVMSG") ||
-	!strcmp(code, "NOTICE")) {
-      if (!match_ignore(from))
-	putlog(LOG_RAW, "*", "[@] %s %s %s", from, code, msg);
-    } else
-      putlog(LOG_RAW, "*", "[@] %s %s %s", from, code, msg);
-  }
+  if (debug_output)
+    putlog(LOG_RAW, "*", "[@] %s %s %s", from, code, msg);
+
   /* This has GOT to go into the raw binding table, * merely because this
    * is less effecient.
-  */
+   */
   check_tcl_raw(from, code, msg);
 }
 
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.76 eggdrop1.7/src/modules.c:1.77
--- eggdrop1.7/src/modules.c:1.76	Thu Oct 18 20:55:05 2001
+++ eggdrop1.7/src/modules.c	Fri Oct 19 01:01:21 2001
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.76 2001/10/19 01:55:05 tothwolf Exp $
+ * $Id: modules.c,v 1.77 2001/10/19 06:01:21 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -45,7 +45,7 @@
 			 userfile[], ver[], notify_new[], helpdir[],
 			 version[], quit_msg[];
 extern int	 noshare, dcc_total, egg_numver, userfile_perm,
-			 use_console_r, ignore_time, must_be_owner,
+			 ignore_time, must_be_owner,
 			 debug_output, gban_total, make_userfile,
 			 gexempt_total, ginvite_total, default_flags,
 			 require_p, max_dcc, share_greet, password_timeout,
@@ -272,7 +272,7 @@
   (Function) & max_dcc,		 /* int					*/
   (Function) & require_p,	 /* int					*/
   (Function) & ignore_time,	 /* int					*/
-  (Function) & use_console_r,	 /* int					*/
+  (Function) 0,
   /* 104 - 107 */
   (Function) & reserved_port_min,
   (Function) & reserved_port_max,
----------------------- End of diff -----------------------



More information about the Changes mailing list