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

cvs at eggheads.org cvs at eggheads.org
Sun Oct 31 08:40:49 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2010-10-31 14:40:48 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     THANKS doc/Changes1.8 src/dcc.c src/patch.h

Log message:

Fixed dcc_telnet_pass() to not use a constant string with fingerprint authentication, because strip_telnet() may attempt to write to it later.

---------------------- diff included ----------------------
Index: eggdrop1.8/THANKS
diff -u eggdrop1.8/THANKS:1.6 eggdrop1.8/THANKS:1.7
--- eggdrop1.8/THANKS:1.6	Mon Oct 25 09:56:36 2010
+++ eggdrop1.8/THANKS	Sun Oct 31 08:40:38 2010
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.6 2010/10/25 15:56:36 pseudo Exp $:
+$Id: THANKS,v 1.7 2010/10/31 14:40:38 pseudo Exp $:
 
 Eggdrop Developers and Contributors
 Last revised: October 25, 2010
@@ -235,7 +235,7 @@
 Flattie
                flyin lion
 foxmulder
-Fraggle        Jérôme Benoit                   jerome.benoit at grenouille.com
+Fraggle        Jérôme Benoit                 jerome.benoit at grenouille.com
 Freeder                                        freeder at techmonkeys.org
 fuchs          Bjoern Krombholz                bjkro at gmx.de
 FumBa
@@ -252,6 +252,7 @@
 goo
 GoodGuy
 Gord-          Gordon Lloyd Goldberg           ggold at panix.com
+grawity        Mantas Mikulenas                grawity at nullroute.eu.org
 GregMo         Greg Mosier                     me at gregmo.us
 grnbrg         Brian Greenberg                 grnbrg at grnbrg.org 
 GSCEGO
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.32 eggdrop1.8/doc/Changes1.8:1.33
--- eggdrop1.8/doc/Changes1.8:1.32	Fri Oct 29 14:53:43 2010
+++ eggdrop1.8/doc/Changes1.8	Sun Oct 31 08:40:38 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.32 2010/10/29 20:53:43 pseudo Exp $
+$Id: Changes1.8,v 1.33 2010/10/31 14:40:38 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,10 @@
 
 1.8.0 (CVS):
 
+  - Fixed dcc_telnet_pass() to not use a constant string with fingerprint
+    authentication, because strip_telnet() may attempt to write to it later.
+    Found by: grawity / Patch by: pseudo
+
   - Modified tcl_channel_get to return a flat list of all channel settings
     and their values when called without a setting argument.
   - Added two new Tcl commands: [chansettype] returning setting types and
Index: eggdrop1.8/src/dcc.c
diff -u eggdrop1.8/src/dcc.c:1.5 eggdrop1.8/src/dcc.c:1.6
--- eggdrop1.8/src/dcc.c:1.5	Wed Oct 20 07:07:13 2010
+++ eggdrop1.8/src/dcc.c	Sun Oct 31 08:40:38 2010
@@ -4,7 +4,7 @@
  *   disconnect on a dcc socket
  *   ...and that's it!  (but it's a LOT)
  *
- * $Id: dcc.c,v 1.5 2010/10/20 13:07:13 pseudo Exp $
+ * $Id: dcc.c,v 1.6 2010/10/31 14:40:38 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1540,10 +1540,12 @@
     /* Get the fingerprint of the user, if set */
     uf = get_user(&USERENTRY_FPRINT, dcc[idx].user);
     if (cf && uf && !strcasecmp(cf, uf)) {
+      char fakepass[2] = "+";
+
       if (!glob_bot(fr))
         dprintf(idx, "Used your fingerprint for automatic authentication.\n");
       dcc[idx].status |= STAT_FPRINT;
-      dcc_chat_pass(idx, "+", 1);
+      dcc_chat_pass(idx, fakepass, 1);
       return;
     /* Required? */
     } else if (tls_auth == 2) {
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.21 eggdrop1.8/src/patch.h:1.22
--- eggdrop1.8/src/patch.h:1.21	Fri Oct 29 14:53:43 2010
+++ eggdrop1.8/src/patch.h	Sun Oct 31 08:40:38 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.21 2010/10/29 20:53:43 pseudo Exp $
+ * $Id: patch.h,v 1.22 2010/10/31 14:40:38 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1288385057");            /* current unixtime */
+patch("1288535360");            /* current unixtime */
 /*
  *
  *
  */
-patch("getudefs");
+patch("fakepass");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list