Added options:nonicknameownership config option

1 files changed, 10 insertions, 3 deletions

diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index 2a135287b..e5f7a759a 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -207,12 +207,15 @@ class RatboxProto : public IRCDProto
 		send_cmd(source->GetUID(), "INVITE %s %s", u ? u->GetUID().c_str() : nick.c_str(), chan.c_str());
 	}
 
-	void SendAccountLogin(const User *u, const NickCore *account)
+	void SendLogin(User *u)
 	{
-		send_cmd(Config->Numeric, "ENCAP * SU %s %s", u->GetUID().c_str(), account->display.c_str());
+		if (!u->Account())
+			return;
+
+		send_cmd(Config->Numeric, "ENCAP * SU %s %s", u->GetUID().c_str(), u->Account()->display.c_str());
 	}
 
-	void SendAccountLogout(const User *u, const NickCore *account)
+	void SendLogout(User *u)
 	{
 		send_cmd(Config->Numeric, "ENCAP * SU %s", u->GetUID().c_str());
 	}
@@ -479,6 +482,10 @@ bool event_encap(const Anope::string &source, const std::vector<Anope::string> &
 		if (!u || !nc)
 			return true;
 		u->Login(nc);
+
+		NickAlias *user_na = findnick(u->nick);
+		if (!Config->NoNicknameOwnership && user_na && user_na->nc == nc && user_na->nc->HasFlag(NI_UNCONFIRMED) == false)
+			u->SetMode(findbot(Config->NickServ), UMODE_REGISTERED);
 	}
 
 	return true;