[cvslog] (2002-10-23 04:11:43 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Tue Oct 22 23:12:00 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-10-23 04:11:43 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/mod/irc.mod/chan.c

Log message:

Don't ban users when not going to kick in refresh_ban_kick(). Patch by Eule.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.422 eggdrop1.6/doc/UPDATES1.6:1.423
--- eggdrop1.6/doc/UPDATES1.6:1.422	Tue Oct 22 23:06:22 2002
+++ eggdrop1.6/doc/UPDATES1.6	Tue Oct 22 23:11:33 2002
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.422 2002/10/23 04:06:22 wcc Exp $
+$Id: UPDATES1.6,v 1.423 2002/10/23 04:11:33 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.13
 Found by  Fixed by  What...
+          Eule      don't ban users when not going to kick in refresh_ban_kick()
           Eule      added a stacking limit for fastdeq
           Borodulin fixed a UTF problem with scandinavian characters
           Eule      made the modes-per-line limit definable in src/chan.h
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.99 eggdrop1.6/src/mod/irc.mod/chan.c:1.100
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.99	Fri Sep 27 14:30:02 2002
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Tue Oct 22 23:11:33 2002
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.99 2002/09/27 19:30:02 stdarg Exp $
+ * $Id: chan.c,v 1.100 2002/10/23 04:11:33 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -408,7 +408,7 @@
   int			 cycle;
 
   m = ismember(chan, nick);
-  if (!m)
+  if (!m || chan_sentkick(m))
     return;
   /* Check global bans in first cycle and channel bans
      in second cycle. */
@@ -422,17 +422,18 @@
 	sprintf(s, "%s!%s", m->nick, m->userhost);
 	get_user_flagrec(m->user ? m->user : get_user_by_host(s), &fr,
 			 chan->dname);
-	if (!glob_friend(fr) && !chan_friend(fr))
+	if (!glob_friend(fr) && !chan_friend(fr)) {
 	  add_mode(chan, '-', 'o', nick);	/* Guess it can't hurt.	*/
-	check_exemptlist(chan, user);
-	do_mask(chan, chan->channel.ban, b->mask, 'b');
-	b->lastactive = now;
-	if (b->desc && b->desc[0] != '@')
-	  egg_snprintf(c, sizeof c, "%s%s", IRC_PREBANNED, b->desc);
-	else
-	  c[0] = 0;
-	kick_all(chan, b->mask, c[0] ? c : IRC_YOUREBANNED, 0);
-	return;					/* Drop out on 1st ban.	*/
+	  check_exemptlist(chan, user);
+	  do_mask(chan, chan->channel.ban, b->mask, 'b');
+	  b->lastactive = now;
+	  if (b->desc && b->desc[0] != '@')
+	    egg_snprintf(c, sizeof c, "%s%s", IRC_PREBANNED, b->desc);
+	  else
+	    c[0] = 0;
+	  kick_all(chan, b->mask, c[0] ? c : IRC_YOUREBANNED, 0);
+	  return;					/* Drop out on 1st ban.	*/
+	}
       }
     }
   }
----------------------- End of diff -----------------------



More information about the Changes mailing list