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

cvs at eggheads.org cvs at eggheads.org
Mon Aug 8 16:37:13 CST 2011


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2011-08-08 22:37:13 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     doc/Changes1.6 src/patch.h src/mod/dns.mod/dns.c

Log message:

Fixed a bug in the backported dns-settings patch where dns_change() would call iptostr() with inappropriate argument.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.104 eggdrop1.6/doc/Changes1.6:1.105
--- eggdrop1.6/doc/Changes1.6:1.104	Sun Jul 31 14:15:05 2011
+++ eggdrop1.6/doc/Changes1.6	Mon Aug  8 16:37:02 2011
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.104 2011/07/31 20:15:05 thommey Exp $
+$Id: Changes1.6,v 1.105 2011/08/08 22:37:02 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,12 @@
 
 1.6.21 (CVS):
 
+  - Fixed a bug in the backported dns-settings patch where dns_change()
+    would call iptostr() with inappropriate argument.
+    Fixes Trac Bug #87 "dns-servers setting on 1.6 filled with garbage if
+    not set"
+    Found by: thommey / Patch by: pseudo
+
   - Partially revert changes to vwait/update. They are back to only
     processing Tcl events for now (fileevent/after) as handling eggdrop
     events turned out to require careful examination of reentrance issues.
Index: eggdrop1.6/src/mod/dns.mod/dns.c
diff -u eggdrop1.6/src/mod/dns.mod/dns.c:1.42 eggdrop1.6/src/mod/dns.mod/dns.c:1.43
--- eggdrop1.6/src/mod/dns.mod/dns.c:1.42	Fri Apr  1 05:59:49 2011
+++ eggdrop1.6/src/mod/dns.mod/dns.c	Mon Aug  8 16:37:02 2011
@@ -4,7 +4,7 @@
  *
  * Written by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: dns.c,v 1.42 2011/04/01 11:59:49 pseudo Exp $
+ * $Id: dns.c,v 1.43 2011/08/08 22:37:02 pseudo Exp $
  */
 /*
  * Copyright (C) 1999 - 2011 Eggheads Development Team
@@ -149,8 +149,9 @@
     
     Tcl_DStringInit(&ds);
     for (i = 0; i < _res.nscount; i++) {
-      snprintf(buf, sizeof buf, "%s:%d", iptostr((struct sockaddr *)
-               &_res.nsaddr_list[i]), ntohs(_res.nsaddr_list[i].sin_port));
+      snprintf(buf, sizeof buf, "%s:%d",
+               iptostr(_res.nsaddr_list[i].sin_addr.s_addr),
+               ntohs(_res.nsaddr_list[i].sin_port));
       Tcl_DStringAppendElement(&ds, buf);
     }
     slist = Tcl_DStringValue(&ds);
@@ -226,7 +227,7 @@
     dprintf(idx, "    Async DNS resolver is active.\n");
     dprintf(idx, "    DNS server list:");
     for (i = 0; i < _res.nscount; i++)
-      dprintf(idx, " %s:%d", iptostr((struct sockaddr *) &_res.nsaddr_list[i]),
+      dprintf(idx, " %s:%d", iptostr(_res.nsaddr_list[i].sin_addr.s_addr),
               ntohs(_res.nsaddr_list[i].sin_port));
     dprintf(idx, "\n");
     dprintf(idx, "    Using %d byte%s of memory\n", size,
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1263 eggdrop1.6/src/patch.h:1.1264
--- eggdrop1.6/src/patch.h:1.1263	Sun Jul 31 14:15:06 2011
+++ eggdrop1.6/src/patch.h	Mon Aug  8 16:37:02 2011
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1263 2011/07/31 20:15:06 thommey Exp $
+ * $Id: patch.h,v 1.1264 2011/08/08 22:37:02 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1312143269");            /* current unixtime */
+patch("1312842583");            /* current unixtime */
 /*
  *
  *
  */
-patch("vwaittclonly");
+patch("dnsservers");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list