From: Perry Lorier <isomer@undernet.org>
Date: Mon, 30 Oct 2000 00:34:27 +0000 (+0000)
Subject: Author: net <simms@LUCIDA.QC.CA>
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=2df5492bb6a0ccdbbfac2445390b398544768e14

Author: net <simms@LUCIDA.QC.CA>

Log message:

Fixed bugs that Isomer left

Testing Required:
Gline random people and check that the right people are disconnected


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@302 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index b6ea829..94cc930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-30  net <simms@lucida.qc.ca>
+	
+	* ircd/gline.c: Fixed various bugs Isomer left behind.
+
 2000-10-26  Kevin L. Mitchell  <klmitch@mit.edu>
 
 	* ircd/m_join.c (m_join): reply on attempt to join a BADCHANed
diff --git a/ircd/gline.c b/ircd/gline.c
index bc18f39..3de628d 100644
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -168,16 +168,16 @@ do_gline(struct Client *cptr, struct Client *sptr, struct Gline *gline)
 	continue;
 	
       if (acptr->user->username && 
-          match(gline->gl_user, acptr->user->username) == 0)
-          continue;
+          match (gline->gl_user, acptr->user->username) != 0)
+               continue;
           
       if (GlineIsIpMask(gline)) {
         Debug((DEBUG_DEBUG,"IP gline: %08x %08x/%i",cptr->ip.s_addr,gline->ipnum.s_addr,gline->bits));
-        if ((cptr->ip.s_addr & NETMASK(gline->bits)) != gline->ipnum.s_addr)
+        if ((acptr->ip.s_addr & NETMASK(gline->bits)) != gline->ipnum.s_addr)
           continue;
       }
       else {
-        if (match(gline->gl_host, acptr->sock_ip) != 0)
+        if (match(gline->gl_host, acptr->sockhost) != 0)
           continue;
       }