Committer  : klmitch
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Commit time: 2005-09-16 14:12:15 UTC

Modified files:
     ChangeLog ircd/m_join.c

Log message:

Author: Kev <[EMAIL PROTECTED]>
Log message:

Fix bug #1291029 (protocol violations caused by remote users performing
/join 0)

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.701 ircu2.10/ChangeLog:1.702
--- ircu2.10/ChangeLog:1.701    Wed Sep 14 18:17:02 2005
+++ ircu2.10/ChangeLog  Fri Sep 16 07:12:05 2005
@@ -1,3 +1,10 @@
+2005-09-16  Kevin L. Mitchell  <[EMAIL PROTECTED]>
+
+       * ircd/m_join.c (last0): fix problem leading to protocol
+       violations on certain combinations of /join 0 from remote servers
+       (probably from local users, too) [bug #1291029]; remove redundant
+       !IsChannelChar() check
+
 2005-09-14  Michael Poole <[EMAIL PROTECTED]>
 
        * doc/readme.cvs: Document the branching scheme for 2.10.12.
Index: ircu2.10/ircd/m_join.c
diff -u ircu2.10/ircd/m_join.c:1.33 ircu2.10/ircd/m_join.c:1.34
--- ircu2.10/ircd/m_join.c:1.33 Tue Sep 13 08:17:46 2005
+++ ircu2.10/ircd/m_join.c      Fri Sep 16 07:12:05 2005
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: m_join.c,v 1.33 2005/09/13 15:17:46 entrope Exp $
+ * $Id: m_join.c,v 1.34 2005/09/16 14:12:05 klmitch Exp $
  */
 
 #include "config.h"
@@ -60,10 +60,10 @@
   int join0 = 0;
 
   for (p = chanlist; p[0]; p++) /* find last "JOIN 0" */
-    if (p[0] == '0' && (p[1] == ',' || p[1] == '\0' || !IsChannelChar(p[1]))) {
-      if (*++p == ',')
+    if (p[0] == '0' && (p[1] == ',' || p[1] == '\0')) {
+      if (p[1] == ',')
         p++;
-      chanlist = p;
+      chanlist = p + 1;
       join0 = 1;
     } else {
       while (p[0] != ',' && p[0] != '\0') /* skip past channel name */
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
Patches@undernet.org
http://undernet.sbg.org/mailman/listinfo/patches

Reply via email to