From aeb69d352897237a1c07107944922027854c4aca Mon Sep 17 00:00:00 2001 From: "Kevin L. Mitchell" Date: Mon, 18 Oct 2004 22:45:25 +0000 Subject: [PATCH] Author: Kev 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 --- ChangeLog | 5 +++++ ircd/gline.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 43db773..ae328a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-18 Kevin L Mitchell + + * 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 * include/s_conf.h (ConfItem): Add new field username. Replace diff --git a/ircd/gline.c b/ircd/gline.c index 25b4ca1..e0a7278 100644 --- 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)) -- 2.20.1