Merge branch 'insp3' into master.

1 files changed, 1 insertions, 21 deletions

diff --git a/src/users.cpp b/src/users.cpp
index ec47d7d06..96e08b651 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -739,19 +739,9 @@ irc::sockets::cidr_mask User::GetCIDRMask()
 	return irc::sockets::cidr_mask(client_sa, range);
 }
 
-bool User::SetClientIP(const std::string& address)
-{
-	irc::sockets::sockaddrs sa;
-	if (!irc::sockets::aptosa(address, client_sa.port(), sa))
-		return false;
-
-	User::SetClientIP(sa);
-	return true;
-}
-
 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();
 
@@ -762,16 +752,6 @@ void User::SetClientIP(const irc::sockets::sockaddrs& sa)
 		ChangeDisplayedHost(GetIPString());
 }
 
-bool LocalUser::SetClientIP(const std::string& address)
-{
-	irc::sockets::sockaddrs sa;
-	if (!irc::sockets::aptosa(address, client_sa.port(), sa))
-		return false;
-
-	LocalUser::SetClientIP(sa);
-	return true;
-}
-
 void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa)
 {
 	if (sa == client_sa)