From 961109ae4fde97144fdedeef25607a5b8b3ec2c2 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Thu, 24 Jan 2019 22:06:27 +0000
Subject: Remove trailing whitespace from various source files.

---
 src/users.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index 506cdf6d8..fd794d386 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1026,7 +1026,7 @@ void User::ChangeRealHost(const std::string& host, bool resetdisplay)
 	const bool changehost = (realhost != host);
 	if (!changehost && !resetdisplay)
 		return;
-	
+
 	// If the displayhost is not set and we are not resetting it then
 	// we need to copy it to the displayhost field.
 	if (displayhost.empty() && !resetdisplay)
-- 
cgit v1.3.1-10-gc9f91


From e1cf6f5ec70a0afcff4e6ceed5ead8042e9dcf23 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Mon, 28 Jan 2019 13:27:56 +0000
Subject: Fix erroneously sending RPL_YOURDISPLAYEDHOST to HAProxy clients.

---
 src/users.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/users.cpp')

diff --git a/src/users.cpp b/src/users.cpp
index fd794d386..b00992141 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1013,7 +1013,7 @@ bool User::ChangeDisplayedHost(const std::string& shost)
 
 	this->InvalidateCache();
 
-	if (IS_LOCAL(this))
+	if (IS_LOCAL(this) && this->registered != REG_NONE)
 		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, this->GetDisplayedHost(), "is now your displayed host");
 
 	return true;
-- 
cgit v1.3.1-10-gc9f91