summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/protocol/hybrid.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 74f0ee51e..917b1a86e 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -220,7 +220,7 @@ class HybridProto : public IRCDProto
{
const BotInfo *ns = findbot(Config->NickServ);
- ircdproto->SendMode(ns, u, "+d %d", u->timestamp);
+ ircdproto->SendMode(ns, u, "+d %s", u->Account()->display.c_str());
}
void SendLogout(User *u) anope_override
@@ -588,13 +588,14 @@ struct IRCDMessageUID : IRCDMessage
if (user && nickserv)
{
- const NickAlias *na;
+ const NickAlias *na = NULL;
- if (user->timestamp == convertTo<time_t>(params[8]) && (na = findnick(user->nick)))
- {
- NickCore *nc = na->nc;
+ if (params[8] != "0")
+ na = findnick(params[8]);
- user->Login(nc);
+ if (na)
+ {
+ user->Login(na->nc);
if (!Config->NoNicknameOwnership && na->nc->HasFlag(NI_UNCONFIRMED) == false)
user->SetMode(findbot(Config->NickServ), UMODE_REGISTERED);