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

cvs at eggheads.org cvs at eggheads.org
Tue Nov 23 17:25:36 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2010-11-23 23:25:34 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     doc/Changes1.8 src/patch.h src/tls.c src/mod/share.mod/share.c

Log message:

Fixed a dumb mistake in the previous patch.

---------------------- diff included ----------------------
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.38 eggdrop1.8/doc/Changes1.8:1.39
--- eggdrop1.8/doc/Changes1.8:1.38	Tue Nov 23 10:36:23 2010
+++ eggdrop1.8/doc/Changes1.8	Tue Nov 23 17:25:24 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.38 2010/11/23 16:36:23 pseudo Exp $
+$Id: Changes1.8,v 1.39 2010/11/23 23:25:24 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -7,7 +7,7 @@
 1.8.0 (CVS):
 
   - Fixed a problem with sharing causing starttls to fail.
-    Found by dr1
+    Found by: dr1
   - Moved STARTTLS early in the bot link process and synchronized the
     handshake.
   - Made it possible for ssl handshakes to complete even without data to be
Index: eggdrop1.8/src/mod/share.mod/share.c
diff -u eggdrop1.8/src/mod/share.mod/share.c:1.5 eggdrop1.8/src/mod/share.mod/share.c:1.6
--- eggdrop1.8/src/mod/share.mod/share.c:1.5	Tue Nov 23 10:36:23 2010
+++ eggdrop1.8/src/mod/share.mod/share.c	Tue Nov 23 17:25:24 2010
@@ -1,7 +1,7 @@
 /*
  * share.c -- part of share.mod
  *
- * $Id: share.c,v 1.5 2010/11/23 16:36:23 pseudo Exp $
+ * $Id: share.c,v 1.6 2010/11/23 23:25:24 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1972,8 +1972,8 @@
           if (bi) {
 #ifdef TLS
             egg_snprintf(s2, sizeof s2, "s c BOTADDR %s %s %s%d %s%d\n",
-                         u->handle, bi->address, (bi->ssl & TLS_BOT),
-                         bi->telnet_port, (bi->ssl & TLS_RELAY),
+                         u->handle, bi->address, (bi->ssl & TLS_BOT) ? "+" : "",
+                         bi->telnet_port, (bi->ssl & TLS_RELAY) ? "+" : "",
                          bi->relay_port);
 #else
             egg_snprintf(s2, sizeof s2, "s c BOTADDR %s %s %d %d\n", u->handle,
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.26 eggdrop1.8/src/patch.h:1.27
--- eggdrop1.8/src/patch.h:1.26	Tue Nov 23 10:36:23 2010
+++ eggdrop1.8/src/patch.h	Tue Nov 23 17:25:24 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.26 2010/11/23 16:36:23 pseudo Exp $
+ * $Id: patch.h,v 1.27 2010/11/23 23:25:24 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1290530142");            /* current unixtime */
+patch("1290554653");            /* current unixtime */
 /*
  *
  *
  */
-patch("tlsandsharefix");
+patch("sharebotaddr");
 /*
  *
  *
Index: eggdrop1.8/src/tls.c
diff -u eggdrop1.8/src/tls.c:1.3 eggdrop1.8/src/tls.c:1.4
--- eggdrop1.8/src/tls.c:1.3	Tue Nov 23 10:36:23 2010
+++ eggdrop1.8/src/tls.c	Tue Nov 23 17:25:24 2010
@@ -4,7 +4,7 @@
  *   Certificate handling
  *   OpenSSL initialization and shutdown
  *
- * $Id: tls.c,v 1.3 2010/11/23 16:36:23 pseudo Exp $
+ * $Id: tls.c,v 1.4 2010/11/23 23:25:24 pseudo Exp $
  */
 /*
  * Written by Rumen Stoyanov <pseudo at egg6.net>
@@ -628,7 +628,7 @@
   }
 
   /* Display the state of the engine for debugging purposes */
-  debug1("TLS: state change: %s", SSL_state_string_long(ssl));
+  /* debug1("TLS: state change: %s", SSL_state_string_long(ssl)); */
 }
     
 /* Switch a socket to SSL communication
----------------------- End of diff -----------------------


More information about the Changes mailing list