Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

1 files changed, 7 insertions, 8 deletions

diff --git a/modules/commands/ns_update.cpp b/modules/commands/ns_update.cpp
index 5297bc4d3..b4affe547 100644
--- a/modules/commands/ns_update.cpp
+++ b/modules/commands/ns_update.cpp
@@ -24,22 +24,21 @@ class CommandNSUpdate : public Command
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
-		User *u = source.u;
+		User *u = source.GetUser();
+		if (!u)
+			return;
+
 		NickAlias *na = findnick(u->nick);
 
-		if (!na)
+		if (na && na->nc == source.nc)
 		{
-			source.Reply(NICK_NOT_REGISTERED);
-			return;
+			na->last_realname = u->realname;
+			na->last_seen = Anope::CurTime;
 		}
 
-		na->last_realname = u->realname;
-		na->last_seen = Anope::CurTime;
-
 		FOREACH_MOD(I_OnNickUpdate, OnNickUpdate(u));
 
 		source.Reply(_("Status updated (memos, vhost, chmodes, flags)."), Config->NickServ.c_str());
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) anope_override