Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-11-20 15:01:07 UTC
Modified files:
ChangeLog ircd/m_create.c
Log message:
Ignore redundant CREATEs (fixes bug #1037963).
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.509 ircu2.10/ChangeLog:1.510
--- ircu2.10/ChangeLog:1.509 Tue Nov 9 19:47:34 2004
+++ ircu2.10/ChangeLog Sat Nov 20 07:00:55 2004
@@ -1,3 +1,8 @@
+2004-11-20 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/m_create.c (ms_create): Complain if a user tries to CREATE
+ a channel they are already in, but do not add them again.
+
2004-11-09 Michael Poole <[EMAIL PROTECTED]>
* include/res.h (init_resolver): Delete, and initialize lazily.
Index: ircu2.10/ircd/m_create.c
diff -u ircu2.10/ircd/m_create.c:1.14 ircu2.10/ircd/m_create.c:1.15
--- ircu2.10/ircd/m_create.c:1.14 Tue Jan 7 19:17:19 2003
+++ ircu2.10/ircd/m_create.c Sat Nov 20 07:00:57 2004
@@ -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_create.c,v 1.14 2003/01/08 03:17:19 klmitch Exp $
+ * $Id: m_create.c,v 1.15 2004/11/20 15:00:57 entrope Exp $
*/
/*
@@ -158,7 +158,11 @@
if ((chptr = FindChannel(name)))
{
- name = chptr->chname;
+ /* Is the remote server confused? */
+ if (find_member_link(chptr, sptr)) {
+ protocol_violation(sptr, "%s tried to CREATE a channel already
joined", cli_name(sptr));
+ continue;
+ }
/* Check if we need to bounce a mode */
if (TStime() - chanTS > TS_LAG_TIME ||
----------------------- End of diff -----------------------
