summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nickserv.c3
-rw-r--r--src/users.c5
2 files changed, 6 insertions, 2 deletions
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) {