[Patches] [CVS] Module ircu2.10: Change committed

[Entrope]

Committer  : entrope
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Commit time: 2005-02-19 05:30:56 UTC

Modified files:
     ChangeLog ircd/channel.c

Log message:

Fix another SILENCE crash.

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.551 ircu2.10/ChangeLog:1.552
--- ircu2.10/ChangeLog:1.551    Fri Feb 18 20:45:53 2005
+++ ircu2.10/ChangeLog  Fri Feb 18 21:30:37 2005
@@ -3,6 +3,8 @@
        * ircd/IPcheck.c (ip_registry_find): Use canonical form of IP
        address to look up and compare against hash entries.
 
+       * ircd/channel.c (apply_ban): Do not free a succesful BAN_DEL ban.
+
        * ircd/ircd_parser.y (clientblock): Stash IP string in aconf->name.
        (clienthost): Split hosts that contain '@' into username and host.
        (clientip): Split IPs that contain '@' into username and IP.
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.116 ircu2.10/ircd/channel.c:1.117
--- ircu2.10/ircd/channel.c:1.116       Fri Jan 14 12:11:54 2005
+++ ircu2.10/ircd/channel.c     Fri Feb 18 21:30:44 2005
@@ -19,7 +19,7 @@
  */
 /** @file
  * @brief Channel management and maintanance
- * @version $Id: channel.c,v 1.116 2005/01/14 20:11:54 entrope Exp $
+ * @version $Id: channel.c,v 1.117 2005/02/19 05:30:44 entrope Exp $
  */
 #include "config.h"
 
@@ -2729,12 +2729,14 @@
         remove_count++;
       }
     }
+    if (remove_count)
+        return 0;
+    /* If no matches were found, fail. */
     if (do_free)
       free_ban(newban);
     else
       MyFree(newban->banstr);
-    /* If no matches were found, fail. */
-    return remove_count ? 0 : 3;
+    return 3;
   }
   if (do_free)
     free_ban(newban);
----------------------- End of diff -----------------------