X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcoremods%2Fcore_hostname_lookup.cpp;h=0dd077a8e6049343bcc9b93c6a6a823b7de2ef39;hb=256be7abde8c4f882c1fb491d485e4ce2f6985c9;hp=fc01db15741441a5e1b375dd22a9444d3be48d67;hpb=409321b5cf0fdfa69b54ba2f371b57de2e1e1452;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp
index fc01db157..0dd077a8e 100644
--- a/src/coremods/core_hostname_lookup.cpp
+++ b/src/coremods/core_hostname_lookup.cpp
@@ -1,7 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013-2016 Adam <Adam@anope.org>
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2016 Adam <Adam@anope.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -74,7 +76,7 @@ class UserResolver : public DNS::Request
 		const DNS::ResourceRecord* ans_record = r->FindAnswerOfType(this->question.type);
 		if (ans_record == NULL)
 		{
-			HandleError(user, "Could not resolve your hostname: No " + this->manager->GetTypeStr(this->question.type) + " records found");
+			HandleError(bound_user, "Could not resolve your hostname: No " + this->manager->GetTypeStr(this->question.type) + " records found");
 			return;
 		}
 
@@ -134,7 +136,8 @@ class UserResolver : public DNS::Request
 			if (rev_match)
 			{
 				bound_user->WriteNotice("*** Found your hostname (" + this->question.name + (r->cached ? ") -- cached" : ")"));
-				bound_user->ChangeRealHost(this->question.name, true);
+				bool display_is_real = bound_user->GetDisplayedHost() == bound_user->GetRealHost();
+				bound_user->ChangeRealHost(this->question.name, display_is_real);
 				dl->unset(bound_user);
 			}
 			else
@@ -151,7 +154,7 @@ class UserResolver : public DNS::Request
 	{
 		LocalUser* bound_user = IS_LOCAL(ServerInstance->FindUUID(uuid));
 		if (bound_user)
-			HandleError("Could not resolve your hostname: " + this->manager->GetErrorStr(query->error));
+			HandleError(bound_user, "Could not resolve your hostname: " + this->manager->GetErrorStr(query->error));
 	}
 };