Committer : decampos
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_07
Commit time: 2004-06-18 13:41:55 UTC
Modified files:
Tag: u2_10_11_07
ChangeLog ircd/gline.c ircd/s_conf.c
Log message:
Author: Alex Badea <[EMAIL PROTECTED]>
Log message:
"gline [EMAIL PROTECTED] then remove it and set [EMAIL PROTECTED], note the problem."
This is the patch.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.130.2.9 ircu2.10/ChangeLog:1.290.2.130.2.10
--- ircu2.10/ChangeLog:1.290.2.130.2.9 Tue Jun 8 17:51:28 2004
+++ ircu2.10/ChangeLog Fri Jun 18 06:41:43 2004
@@ -1,3 +1,11 @@
+2004-06-18 Alex Badea <[EMAIL PROTECTED]>
+
+ * ircd/gline.c (gline_lookup): only return a gline if it's
+ active
+
+ * ircd/s_conf.c (find_kill): don't check for active gline,
+ since gline_lookup does now
+
2004-06-08 Kevin L Mitchell <[EMAIL PROTECTED]>
* ircd/parse.c: don't let rank-and-file users escape HIS
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.38.2.9.2.1 ircu2.10/ircd/gline.c:1.38.2.9.2.2
--- ircu2.10/ircd/gline.c:1.38.2.9.2.1 Sun Mar 7 14:45:39 2004
+++ ircu2.10/ircd/gline.c Fri Jun 18 06:41:44 2004
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: gline.c,v 1.38.2.9.2.1 2004/03/07 22:45:39 klmitch Exp $
+ * $Id: gline.c,v 1.38.2.9.2.2 2004/06/18 13:41:44 decampos Exp $
*/
#include "config.h"
@@ -660,7 +660,8 @@
Debug((DEBUG_DEBUG,"realname gline: '%s' '%s'",gline->gl_user,cli_info(cptr)));
if (match(gline->gl_user+2, cli_info(cptr)) != 0)
continue;
-
+ if (!GlineIsActive(gline))
+ continue;
return gline;
}
else {
@@ -677,7 +678,8 @@
continue;
}
}
- return gline;
+ if (GlineIsActive(gline))
+ return gline;
}
/*
* No Glines matched
Index: ircu2.10/ircd/s_conf.c
diff -u ircu2.10/ircd/s_conf.c:1.44.2.5 ircu2.10/ircd/s_conf.c:1.44.2.5.4.1
--- ircu2.10/ircd/s_conf.c:1.44.2.5 Sat Nov 1 02:19:13 2003
+++ ircu2.10/ircd/s_conf.c Fri Jun 18 06:41:44 2004
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: s_conf.c,v 1.44.2.5 2003/11/01 10:19:13 isomer Exp $
+ * $Id: s_conf.c,v 1.44.2.5.4.1 2004/06/18 13:41:44 decampos Exp $
*/
#include "config.h"
@@ -1506,15 +1506,13 @@
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", deny->message);
}
}
- else if ((agline = gline_lookup(cptr, 0)) && GlineIsActive(agline)) {
+ else if ((agline = gline_lookup(cptr, 0))) {
/*
* find active glines
* added a check against the user's IP address to find_gline() -Kev
*/
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.",
GlineReason(agline));
}
- else
- agline = 0; /* if a gline was found, it was inactive */
if (deny)
return -1;
----------------------- End of diff -----------------------
