From ffa1c976f5fec5bd344cd332e84b465728a9fb49 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 14 Oct 2012 01:50:14 -0400
Subject: [PATCH] Use account name for svid on hybrid

---
 modules/protocol/hybrid.cpp | 13 +++++++------
 1 file 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)))
+			if (params[8] != "0")
+				na = findnick(params[8]);
+
+			if (na)
 			{
-				NickCore *nc = na->nc;
-
-				user->Login(nc);
+				user->Login(na->nc);
 
 				if (!Config->NoNicknameOwnership && na->nc->HasFlag(NI_UNCONFIRMED) == false)
 					user->SetMode(findbot(Config->NickServ), UMODE_REGISTERED);