[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Tue Mar 23 09:25:40 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2010-03-23 15:25:40 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     eggdrop.conf doc/Changes1.6 src/patch.h
     src/mod/channels.mod/cmdschan.c

Log message:

Changed some eggdrop.conf settings. .set and .tcl are no longer unbound by default.
Made .+chan check if the user is permitted to set the need-* settings.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.77 eggdrop1.6/doc/Changes1.6:1.78
--- eggdrop1.6/doc/Changes1.6:1.77	Sun Mar 21 14:41:32 2010
+++ eggdrop1.6/doc/Changes1.6	Tue Mar 23 09:25:29 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.77 2010/03/21 20:41:32 pseudo Exp $
+$Id: Changes1.6,v 1.78 2010/03/23 15:25:29 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,11 @@
 
 1.6.20 (CVS):
 
+  - Changed some eggdrop.conf settings. .set and .tcl are no longer unbound
+    by default.
+  - Made .+chan check if the user is permitted to set the need-* settings.
+    Patch by: pseudo
+
   - Fixed a crash when restarting, related to bind log.
     Patch by: pseudo
 
Index: eggdrop1.6/eggdrop.conf
diff -u eggdrop1.6/eggdrop.conf:1.62 eggdrop1.6/eggdrop.conf:1.63
--- eggdrop1.6/eggdrop.conf:1.62	Tue Jan 26 03:39:59 2010
+++ eggdrop1.6/eggdrop.conf	Tue Mar 23 09:25:29 2010
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- This should contain a fully qualified path to your Eggdrop executable.
 #
-# $Id: eggdrop.conf,v 1.62 2010/01/26 09:39:59 pseudo Exp $
+# $Id: eggdrop.conf,v 1.63 2010/03/23 15:25:29 pseudo Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -132,7 +132,7 @@
 # This creates a logfile named lamest.log containing joins, parts,
 # netsplits, kicks, bans, mode changes, and public chat on the
 # channel #lamest.
-logfile jpk #lamest "logs/lamest.log"
+#logfile jpk #lamest "logs/lamest.log"
 
 # Use this feature to timestamp entries in the log file.
 set log-time 1
@@ -286,7 +286,7 @@
 set ident-timeout 5
 
 # Define here whether or not a +o user still needs the +p flag to dcc the bot.
-set require-p 0
+set require-p 1
 
 # If you want people allow to telnet in and type 'NEW' to become a new user,
 # set this to 1. This is similar to the 'hello' msg command. The protect-telnet
@@ -319,7 +319,7 @@
 
 # Set here the amount of seconds before giving up on hostname/address
 # lookup (you might want to increase this if you are on a slow network).
-set resolve-timeout 15
+set resolve-timeout 7
 
 
 ##### MORE ADVANCED SETTINGS #####
@@ -380,14 +380,17 @@
 # kill signal. Otherwise, the Eggdrop will just save its userfile and rehash.
 set die-on-sigterm 1
 
-# Comment these two lines if you wish to enable the .tcl and .set commands.
+# Uncomment these two lines if you wish to disable the .tcl and .set commands.
 # If you select your owners wisely, you should be okay enabling these.
-unbind dcc n tcl *dcc:tcl
-unbind dcc n set *dcc:set
+#unbind dcc n tcl *dcc:tcl
+#unbind dcc n set *dcc:set
 
 # If you enable this setting, only permanent owners (owner setting) will be
 # able to use .tcl and .set. Moreover, if you want only let permanent owners
 # use .dump, then set this to 2.
+# WARNING: setting this to 0 is a security risk, don't do it unless you trust
+# your owners enough to give them shell access to the account the bot is
+# running on. 
 set must-be-owner 1
 
 # Comment out this line to add the 'simul' partyline command (owners can
@@ -491,7 +494,7 @@
 # The following settings are used as default values when you .+chan #chan or .tcl
 # channel add #chan. Look in the section below for explanation of every option.
 
-set global-flood-chan 10:60
+set global-flood-chan 15:60
 set global-flood-deop 3:10
 set global-flood-kick 3:10
 set global-flood-join 5:60
@@ -517,7 +520,7 @@
         -protectfriends +protectops
         -revenge        -revengebot
         -secret         -seen
-        +shared         +statuslog
+        +shared         -statuslog
         +userbans       +userexempts
         +userinvites    -protecthalfops
         -autohalfop
@@ -1013,7 +1016,7 @@
 loadmodule irc
 
 # Set this to 1 if you want to bounce all server bans.
-set bounce-bans 1
+set bounce-bans 0
 
 # Set this to 1 if you want to bounce all server exemptions (+e modes).
 # This is disabled if use-exempts is disabled.
@@ -1302,7 +1305,7 @@
 
 # Set this to 1 if you want the bot to let people know hourly if they have
 # any notes.
-set notify-users 1
+set notify-users 0
 
 # Set this to 1 if you want the bot to let people know on join if they have
 # any notes.
Index: eggdrop1.6/src/mod/channels.mod/cmdschan.c
diff -u eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.81 eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.82
--- eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.81	Thu Feb 18 07:03:04 2010
+++ eggdrop1.6/src/mod/channels.mod/cmdschan.c	Tue Mar 23 09:25:29 2010
@@ -2,7 +2,7 @@
  * cmdschan.c -- part of channels.mod
  *   commands from a user via dcc that cause server interaction
  *
- * $Id: cmdschan.c,v 1.81 2010/02/18 13:03:04 pseudo Exp $
+ * $Id: cmdschan.c,v 1.82 2010/03/23 15:25:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1173,6 +1173,8 @@
 
 static void cmd_pls_chan(struct userrec *u, int idx, char *par)
 {
+  int i, argc;
+  EGG_CONST char **argv;
   char *chname;
   struct chanset_t *chan;
 
@@ -1196,6 +1198,24 @@
     return;
   }
 
+  if (Tcl_SplitList(NULL, par, &argc, &argv ) == TCL_ERROR) {
+    dprintf(idx, "Invalid channel options.\n");
+    return;
+  }
+  for (i = 0; i < argc; i++) {
+    if (argv[i][0] == '-' || argv[i][0] == '+')
+      continue;
+    if (!strncmp(argv[i], "need-", 5) && (!(u->flags & USER_OWNER) ||
+        (!isowner(dcc[idx].nick) && must_be_owner))) {
+      dprintf(idx, "Due to security concerns, only permanent owners can set "
+                   "the need-* modes.\n");
+      Tcl_Free((char *) argv);
+      return;
+    }
+    i++;
+  }
+  Tcl_Free((char *) argv);
+    
   if (tcl_channel_add(0, chname, par) == TCL_ERROR)
     dprintf(idx, "Invalid channel or channel options.\n");
   else
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1245 eggdrop1.6/src/patch.h:1.1246
--- eggdrop1.6/src/patch.h:1.1245	Sun Mar 21 14:41:32 2010
+++ eggdrop1.6/src/patch.h	Tue Mar 23 09:25:29 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1245 2010/03/21 20:41:32 pseudo Exp $
+ * $Id: patch.h,v 1.1246 2010/03/23 15:25:29 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1269203816");            /* current unixtime */
+patch("1269357654");            /* current unixtime */
 /*
  *
  *
  */
-patch("bindlogfix");
+patch("plschanfix");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list