From cea53460b02f51c1d91540f4d371262bf8bdfa63 Mon Sep 17 00:00:00 2001 From: phil-lavin Date: Fri, 4 Jun 2010 09:57:54 +0000 Subject: Moved EVENT_CHANGE_NICK call to after anope_cmd_nc_change() call Added user identified check to validate_user() to prevent identified user being told to identify git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2999 5417fbe8-f217-4b02-8779-1006273d7864 --- src/nickserv.c | 3 +++ src/users.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nickserv.c b/src/nickserv.c index 8b15d9920..1033e8596 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -1008,6 +1008,9 @@ int validate_user(User * u) return 0; } + if (na->status & NS_IDENTIFIED) + return 1; + on_access = is_on_access(u, na->nc); if (on_access) na->status |= NS_ON_ACCESS; diff --git a/src/users.c b/src/users.c index 6ce0c2c06..e55a68696 100644 --- a/src/users.c +++ b/src/users.c @@ -746,8 +746,6 @@ User *do_nick(const char *source, char *nick, char *username, char *host, oldnick = sstrdup(user->nick); change_user_nick(user, nick); - send_event(EVENT_CHANGE_NICK, 2, nick, oldnick); - free(oldnick); if ((old_na ? old_na->nc : NULL) == (user->na ? user->na->nc : NULL)) @@ -758,6 +756,9 @@ User *do_nick(const char *source, char *nick, char *username, char *host, else { anope_cmd_nc_change(user); } + + send_event(EVENT_CHANGE_NICK, 2, nick, oldnick); + free(oldnick); } if (ircd->sqline) { -- cgit