From 65118165d665a2562eaa772cd0f643ebd9cfd4c8 Mon Sep 17 00:00:00 2001 From: codemastr Date: Sat, 15 Jul 2000 23:56:57 +0000 Subject: [PATCH] Fixed the TKL bug? --- Changes | 1 + src/s_kline.c | 4 ++-- src/version.c.SH | 9 +++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Changes b/Changes index 0f8d39b4a..b7e5e7416 100644 --- a/Changes +++ b/Changes @@ -451,3 +451,4 @@ - Added protection against webproxies - SJ3 part 2/3 and a VL fix - Indentation and more SJ3 fixes +- Fixed TKL? diff --git a/src/s_kline.c b/src/s_kline.c index 0295b4940..863e97b95 100644 --- a/src/s_kline.c +++ b/src/s_kline.c @@ -262,7 +262,7 @@ int find_tkline_match(cptr, xx) for (lp = tklines; lp; lp = lp->next) { - if (!(*lp->hostmask < '0') && (*lp->hostmask > '9')) + if (*lp->hostmask >= '0' && *lp->hostmask <= '9') is_ip = 1; else is_ip = 0; @@ -270,7 +270,7 @@ int find_tkline_match(cptr, xx) if (is_ip == 0 ? (!match(lp->hostmask, chost) && !match(lp->usermask, cname)) : (!match(lp->hostmask, chost) || !match(lp->hostmask, cip)) - && !match(lp->usermask, cname)) + && !match(lp->usermask, cname) && (xx != 2 || !match(lp->usermask, cname))) { if ((lp->type & (TKL_KILL)) && (xx != 2)) diff --git a/src/version.c.SH b/src/version.c.SH index aac5455c6..874da6811 100644 --- a/src/version.c.SH +++ b/src/version.c.SH @@ -10,7 +10,7 @@ case $CONFIG in ;; esac -echo "Extracting $package/ircd/version.c..." +echo "Extracting src/version.c..." if test -r version.c then @@ -156,13 +156,10 @@ char *unrealcredits[] = "zero9000 Kevin Alford", " - UnrealIRCd logo, graphics, null desu ;), ideas etc.", " \2\37codemastr would like to thank:\2\37", - "CaliMonk Ivo Teel calimonk@nhn.net", + "CaliMonk Ivo Teel calimonk@axenet.org", " - Getting me started at NeoHorizon which basically got me", " started coding IRCd", - "Kenpo Ian Ricci ianr@nhn.net", - " - Starting me out learning *nix and giving me a place", - " to develop Unreal", - "[FBI] Corey Lang *unknown*", + "[FBI] Corey Lang fbi@dal.net", " - Being a good IRC friend and getting me started with", " IRC through our old little wIRCd net :)", "",