X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=5180d670aa81c5caaec58cfb4d573e3e085ee91d;hb=c2a3ebea46f3527e0680f1258725f95ff13f0880;hp=db8d065f110da0285366aa6441ce6263c0779cd5;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index db8d065f1..5180d670a 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,11 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
-UserResolver::UserResolver(User* user, std::string to_resolve, QueryType qt, bool &cache) :
-	Resolver(to_resolve, qt, cache), bound_user(user)
+UserResolver::UserResolver(LocalUser* user, std::string to_resolve, QueryType qt, bool &cache) :
+	Resolver(to_resolve, qt, cache, NULL), bound_user(user)
 {
 	this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA);
 	this->bound_fd = user->GetFd();
@@ -25,7 +23,7 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 {
 	UserResolver *res_forward; // for forward-resolution
 
-	if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
+	if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == &bound_user->eh))
 	{
 		this->bound_user->stored_host = result;
 		try
@@ -52,7 +50,7 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 			ServerInstance->Logs->Log("RESOLVER", DEBUG,"Error in resolver: %s",e.GetReason());
 		}
 	}
-	else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
+	else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == &bound_user->eh))
 	{
 		/* Both lookups completed */
 
@@ -120,7 +118,7 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 
 void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 {
-	if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
+	if (ServerInstance->SE->GetRef(this->bound_fd) == &bound_user->eh)
 	{
 		this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), this->bound_user->GetIPString());
 		this->bound_user->dns_done = true;