Should be unsigned long for A

[irc/quakenet/snircd.git] / ircd / gline.c

diff --git a/ircd/gline.c b/ircd/gline.c
index 7ca09042ffaab5a866f58efde170bc2f91d8956d..1cd9e0838a529104235b31fba15dffc767878d3e 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -19,7 +19,7 @@
  */
 /** @file
  * @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.61 2005/09/22 20:42:21 entrope Exp $
+ * @version $Id: gline.c,v 1.61.2.1 2006/06/09 02:12:25 entrope Exp $
  */
 #include "config.h"
 
@@ -223,32 +223,18 @@ do_gline(struct Client *cptr, struct Client *sptr, struct Gline *gline)
     struct Channel *chptr,*nchptr;
     struct Membership *member,*nmember;
 
-    if (string_has_wildcards(gline->gl_user)) {
-      for(chptr=GlobalChannelList;chptr;chptr=nchptr) {
-        nchptr=chptr->next;
-        if (match(gline->gl_user, chptr->chname))
-           continue;
-        for (member=chptr->members;member;member=nmember) {
-          nmember=member->next_member;
-          if (!MyUser(member->user) || IsZombie(member) || IsAnOper(member->user))
-            continue;
-          sendcmdto_serv_butone(&me, CMD_KICK, NULL, "%H %C :Badchanneled (%s)", chptr, member->user, gline->gl_reason);
-          sendcmdto_channel_butserv_butone(&me, CMD_KICK, chptr, NULL, 0, "%H %C :Badchanneled (%s)", chptr, member->user, gline->gl_reason);
-          make_zombie(member, member->user, &me, &me, chptr);
-          retval=1;
-        }
-      }      
-    } else {
-      if ((chptr=FindChannel(gline->gl_user))) {
-        for (member=chptr->members;member;member=nmember) {
-          nmember=member->next_member;
-          if (!MyUser(member->user) || IsZombie(member) || IsAnOper(member->user))
-            continue;
-          sendcmdto_serv_butone(&me, CMD_KICK, NULL, "%H %C :Badchanneled (%s)", chptr, member->user, gline->gl_reason);
-          sendcmdto_channel_butserv_butone(&me, CMD_KICK, chptr, NULL, 0, "%H %C :Badchanneled (%s)", chptr, member->user, gline->gl_reason);
-          make_zombie(member, member->user, &me, &me, chptr);
-          retval=1;
-        }
+    for(chptr=GlobalChannelList;chptr;chptr=nchptr) {
+      nchptr=chptr->next;
+      if (match(gline->gl_user, chptr->chname))
+        continue;
+      for (member=chptr->members;member;member=nmember) {
+        nmember=member->next_member;
+        if (!MyUser(member->user) || IsZombie(member) || IsAnOper(member->user))
+          continue;
+        sendcmdto_serv_butone(&me, CMD_KICK, NULL, "%H %C :Badchanneled (%s)", chptr, member->user, gline->gl_reason);
+        sendcmdto_channel_butserv_butone(&me, CMD_KICK, chptr, NULL, 0, "%H %C :Badchanneled (%s)", chptr, member->user, gline->gl_reason);
+        make_zombie(member, member->user, &me, &me, chptr);
+        retval=1;
       }
     }
   } else {
@@ -752,6 +738,31 @@ gline_find(char *userhost, unsigned int flags)
   return gline;
 }
 
+struct Gline *
+gline_lookup_badchan(char *userhost, unsigned int flags)
+{
+  struct Gline *gline;
+  struct Gline *sgline;
+
+  if (flags & (GLINE_BADCHAN | GLINE_ANY)) {
+    for (gline = BadChanGlineList; gline; gline = sgline) {
+      sgline = gline->gl_next;
+
+      if (gline->gl_expire <= CurrentTime)
+        gline_free(gline);
+      else if ((flags & GLINE_GLOBAL && gline->gl_flags & GLINE_LOCAL) ||
+               (flags & GLINE_LASTMOD && !gline->gl_lastmod))
+        continue;
+      else if ((flags & GLINE_EXACT ? ircd_strcmp(gline->gl_user, userhost) :
+                match(gline->gl_user, userhost)) == 0)
+        if (GlineIsActive(gline))
+          return gline;
+    }
+  }
+
+  return 0;
+}
+
 /** Find a matching G-line for a user.
  * @param[in] cptr Client to compare against.
  * @param[in] flags Bitwise combination of GLINE_GLOBAL and/or
@@ -973,7 +984,9 @@ gline_stats(struct Client *sptr, const struct StatDesc *sd,
                  gline->gl_user,
                  gline->gl_host ? "@" : "",
                  gline->gl_host ? gline->gl_host : "",
-                gline->gl_expire + TSoffset, gline->gl_reason);
+                gline->gl_expire + TSoffset,
+                 GlineIsActive(gline) ? '+' : '-',
+                 gline->gl_reason);
   }
 }