From ff28fd38e5cc13be1a2f61898e7f930139bf82e6 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Wed, 10 Aug 2022 14:46:05 +0100
Subject: Fix some harmless debug messages when initializing remote users.

---
 src/modules/m_spanningtree/uid.cpp | 3 +--
 src/users.cpp                      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 79afdff5b..f9aeaa09f 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -80,6 +80,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
 	_new->ChangeRealHost(params[3], false);
 	_new->ChangeDisplayedHost(params[4]);
 	_new->ident = params[5];
+	_new->SetClientIP(params[6]);
 	_new->ChangeRealName(params.back());
 	_new->registered = REG_ALL;
 	_new->signon = signon;
@@ -119,8 +120,6 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
 		_new->SetMode(mh, true);
 	}
 
-	_new->SetClientIP(params[6]);
-
 	ServerInstance->Users->AddClone(_new);
 	remoteserver->UserCount++;
 
diff --git a/src/users.cpp b/src/users.cpp
index 737995f46..227a6897e 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -765,7 +765,7 @@ irc::sockets::cidr_mask User::GetCIDRMask()
 bool User::SetClientIP(const std::string& address)
 {
 	irc::sockets::sockaddrs sa;
-	if (!irc::sockets::aptosa(address, client_sa.port(), sa))
+	if (!irc::sockets::aptosa(address, client_sa.family() == AF_UNSPEC ? 0 : client_sa.port(), sa))
 		return false;
 
 	User::SetClientIP(sa);
@@ -774,7 +774,7 @@ bool User::SetClientIP(const std::string& address)
 
 void User::SetClientIP(const irc::sockets::sockaddrs& sa)
 {
-	const std::string oldip(GetIPString());
+	const std::string oldip(client_sa.family() == AF_UNSPEC ? "" : GetIPString());
 	memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
 	this->InvalidateCache();
 
-- 
cgit v1.3.1-10-gc9f91