X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=5180d670aa81c5caaec58cfb4d573e3e085ee91d;hb=c2a3ebea46f3527e0680f1258725f95ff13f0880;hp=bcf8a6aa3b47d08b8e76b8b93de5a59164a8f16a;hpb=355b17f151fe8258a025a3db3240339ab7cea445;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp index bcf8a6aa3..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 @@ -12,7 +12,7 @@ */ #include "inspircd.h" -UserResolver::UserResolver(User* user, std::string to_resolve, QueryType qt, bool &cache) : +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); @@ -23,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 @@ -50,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 */ @@ -118,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;