summaryrefslogtreecommitdiff
path: root/src/nickserv.c
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-10-16 05:36:26 +0000
committertrystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2004-10-16 05:36:26 +0000
commit659525324ba4d9d5643ef982936b6d1a9763e5ba (patch)
tree4c7724f8f85933c9d849723715087ae89d10e6b3 /src/nickserv.c
parentec2b8ac54923878349b76ffa72f9f1e6184e8a70 (diff)
BUILD : 1.7.5 (402) BUGS : N/A NOTES : Forgot to get chanserv.c and nickserv.c in the last commit
git-svn-id: svn://svn.anope.org/anope/trunk@402 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@266 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/nickserv.c')
-rw-r--r--src/nickserv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nickserv.c b/src/nickserv.c
index 57973387d..8e3974ef8 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -2486,6 +2486,8 @@ static int do_identify(User * u)
}
} else if (na->status & NS_VERBOTEN) {
notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, na->nick);
+ } else if (nick_identified(u)) {
+ notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED);
} else if (!(res = check_password(pass, na->nc->pass))) {
alog("%s: Failed IDENTIFY for %s!%s@%s", s_NickServ, u->nick,
u->username, common_get_vhost(u));
@@ -2493,8 +2495,6 @@ static int do_identify(User * u)
bad_password(u);
} else if (res == -1) {
notice_lang(s_NickServ, u, NICK_IDENTIFY_FAILED);
- } else if (nick_identified(u)) {
- notice_lang(s_NickServ, u, NICK_ALREADY_IDENTIFIED);
} else {
if (!(na->status & NS_IDENTIFIED) && !(na->status & NS_RECOGNIZED)) {
if (na->last_usermask)