Committer : klmitch
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-10-18 22:45:35 UTC
Modified files:
ChangeLog ircd/gline.c
Log message:
Author: Kev <[EMAIL PROTECTED]>
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.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.494 ircu2.10/ChangeLog:1.495
--- ircu2.10/ChangeLog:1.494 Sun Oct 17 20:14:58 2004
+++ ircu2.10/ChangeLog Mon Oct 18 15:45:24 2004
@@ -1,3 +1,8 @@
+2004-10-18 Kevin L Mitchell <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* include/s_conf.h (ConfItem): Add new field username. Replace
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.53 ircu2.10/ircd/gline.c:1.54
--- ircu2.10/ircd/gline.c:1.53 Mon Oct 4 21:14:44 2004
+++ ircu2.10/ircd/gline.c Mon Oct 18 15:45:25 2004
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.53 2004/10/05 04:14:44 entrope Exp $
+ * @version $Id: gline.c,v 1.54 2004/10/18 22:45:25 klmitch Exp $
*/
#include "config.h"
@@ -663,7 +663,7 @@
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))
----------------------- End of diff -----------------------
