Author: Kev <klmitch@mit.edu>

Log message:

gline_find() used a call to ircd_strcmp() instead of match() when looking
up "inexact," or matching G-lines.  This crept in during .06; apparently,
a cut-and-paste error when correcting a null pointer dereference.

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

diff --git a/ChangeLog b/ChangeLog
index 43db773e3a76b5af8755432073f19addb56099bb..ae328a430479f5ca294e612cd8d178281a0c6a3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Kevin L Mitchell  <klmitch@mit.edu>
+
+       * ircd/gline.c (gline_find): unless we're looking for an exact
+       match, we should call match() on hostnames, not ircd_strcmp()
+
 2004-10-17  Michael Poole <mdpoole@troilus.org>
 
        * include/s_conf.h (ConfItem): Add new field username.  Replace

diff --git a/ircd/gline.c b/ircd/gline.c
index 25b4ca1724b5b37b0048152317a218941589f7c9..e0a7278f17c01e50c7f26dbfd2d30cd3db3090e9 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -663,7 +663,7 @@ gline_find(char *userhost, unsigned int flags)
           ircd_strcmp(gline->gl_user, user) == 0))
        break;
     } else {
-      if (((gline->gl_host && host && ircd_strcmp(gline->gl_host, host) == 0)
+      if (((gline->gl_host && host && match(gline->gl_host, host) == 0)
            || (!gline->gl_host && !host)) &&
          ((!user && ircd_strcmp(gline->gl_user, "*") == 0) ||
           match(gline->gl_user, user) == 0))