summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-11-17 04:54:58 +0000
committertrystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-11-17 04:54:58 +0000
commitfd63b1d276d1cdab708c1eda6aa25ba1281b3ff9 (patch)
tree273ae99b1e94619a76759aa04ba25a21fdbf02d9
parent848538fc003a85e4f60308913fca1b304d970877 (diff)
BUILD : 1.7.6 (446) BUGS : N/A NOTES : 1. Added a debug message to do_kill(), 2. nsCheckNickTracking() could return true in some cases where the nick was forbidden
git-svn-id: svn://svn.anope.org/anope/trunk@446 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@300 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes4
-rw-r--r--src/nickserv.c8
-rw-r--r--src/users.c5
-rw-r--r--version.log7
4 files changed, 21 insertions, 3 deletions
diff --git a/Changes b/Changes
index d9d2c5395..acac20852 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,10 @@ Anope Version S V N
-------------------
Provided by Anope Dev. <dev@anope.org> - 2004
+Provided by Trystan <trystan@nomadirc.net> - 2004
+11/16 F NickTracking could allow usage of forbidden nick in some cases. [ #00]
+
+
Anope Version 1.7.6
-------------------
Provided by Anope Dev. <dev@anope.org> - 2004
diff --git a/src/nickserv.c b/src/nickserv.c
index 0c76c3064..7fcea6dab 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -4296,8 +4296,14 @@ int nsCheckNickTracking(User * u)
char *nick;
/* No nick alias or nick return false by default */
- if ((!(na = u->na)) || (!(nick = na->nick)))
+ if ((!(na = u->na)) || (!(nick = na->nick))) {
return 0;
+ }
+
+ /* nick is forbidden best return 0 */
+ if (na->status & NS_VERBOTEN) {
+ return 0;
+ }
/* Get the core for the requested nick */
nc = na->nc;
diff --git a/src/users.c b/src/users.c
index b824271bb..4cc41561e 100644
--- a/src/users.c
+++ b/src/users.c
@@ -729,7 +729,10 @@ void do_kill(char *nick, char *msg)
user = finduser(nick);
if (!user)
- return;
+ if (debug) {
+ alog("debug: KILL of nonexistent nick: %s", nick);
+ }
+ return;
if (debug)
alog("debug: %s killed", nick);
if ((na = user->na) && (!(na->status & NS_VERBOTEN))
diff --git a/version.log b/version.log
index 4fbdc2913..867d909db 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,15 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="6"
-VERSION_BUILD="445"
+VERSION_BUILD="446"
# $Log$
#
+# BUILD : 1.7.6 (446)
+# BUGS : N/A
+# NOTES : 1. Added a debug message to do_kill(), 2. nsCheckNickTracking() could return true in some cases where the nick
+# was forbidden
+#
# BUILD : 1.7.6 (445)
# NOTES : Setup for devel.
#