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

[Entrope]

Committer  : entrope
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Commit time: 2004-06-23 03:13:49 UTC

Modified files:
     ircd/s_conf.c ircd/gline.c ChangeLog

Log message:

forward port Alex Badea's gline patch from 2.10.11

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.426 ircu2.10/ChangeLog:1.427
--- ircu2.10/ChangeLog:1.426    Mon Jun 14 18:20:36 2004
+++ ircu2.10/ChangeLog  Tue Jun 22 20:13:38 2004
@@ -1,3 +1,11 @@
+2004-06-18  Alex Badea  <[EMAIL PROTECTED]>
+
+       * ircd/gline.c (gline_lookup): only return a gline if it's
+       active
+
+       * ircd/s_conf.c (find_kill): don't check for active gline,
+       since gline_lookup does now
+
 2002-11-11  hikari <[EMAIL PROTECTED]>
        * ircd/ircd.c: added call to irc_crypt_init() - someone hurry up and 
        modularise :P
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.45 ircu2.10/ircd/gline.c:1.46
--- ircu2.10/ircd/gline.c:1.45  Sat May 15 19:33:46 2004
+++ ircu2.10/ircd/gline.c       Tue Jun 22 20:13:38 2004
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: gline.c,v 1.45 2004/05/16 02:33:46 entrope Exp $
+ * $Id: gline.c,v 1.46 2004/06/23 03:13:38 entrope Exp $
  */
 #include "config.h"
 
@@ -656,7 +656,8 @@
       Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
       if (match(gline->gl_user+2, cli_info(cptr)) != 0)
         continue;
-
+      if (!GlineIsActive(gline))
+        continue;
       return gline;
     }
     else {
@@ -671,6 +672,8 @@
       else {
         if (match(gline->gl_host, (cli_user(cptr))->realhost) != 0) 
           continue;
+        if (!GlineIsActive(gline))
+          continue;
       }
     }
     return gline;
Index: ircu2.10/ircd/s_conf.c
diff -u ircu2.10/ircd/s_conf.c:1.54 ircu2.10/ircd/s_conf.c:1.55
--- ircu2.10/ircd/s_conf.c:1.54 Sun May 16 06:56:04 2004
+++ ircu2.10/ircd/s_conf.c      Tue Jun 22 20:13:38 2004
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: s_conf.c,v 1.54 2004/05/16 13:56:04 entrope Exp $
+ * $Id: s_conf.c,v 1.55 2004/06/23 03:13:38 entrope Exp $
  */
 #include "config.h"
 
@@ -1211,15 +1211,13 @@
         send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", deny->message);
     }
   }
-  else if ((agline = gline_lookup(cptr, 0)) && GlineIsActive(agline)) {
+  else if ((agline = gline_lookup(cptr, 0))) {
     /*
      * find active glines
      * added a check against the user's IP address to find_gline() -Kev
      */
     send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", 
GlineReason(agline));
   }
-  else
-    agline = 0;          /* if a gline was found, it was inactive */
 
   if (deny)
     return -1;
----------------------- End of diff -----------------------