Finally apply my patch simplifying RSQUIT. Fixes bug #452, reported by Mark. This...

[user/henk/code/inspircd.git] / src / user_resolver.cpp

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index e7ae1ed0742131114c9b55c74a22997afd46551a..3f010df036828bdd4245920cb5daa31b76f5f6ab 100644 (file)
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDuserresolver */
+
 #include "inspircd.h"
 
 UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolve, QueryType qt, bool &cache) :
@@ -22,7 +24,6 @@ UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolv
 
 void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum)
 {
-       ServerInstance->Log(DEBUG, "Got a result (lookup complete)");
        /* We are only interested in the first matching result */
        if (resultnum)
                return;
@@ -35,25 +36,25 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                        /* Check we didnt time out */
                        if (this->bound_user->registered != REG_ALL)
                        {
-                               bool cached;
+                               bool lcached;
 #ifdef IPV6
                                if (this->bound_user->GetProtocolFamily() == AF_INET6)
                                {
                                        /* IPV6 forward lookup (with possibility of 4in6) */
                                        const char* ip = this->bound_user->GetIPString();
-                                       bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), cached);
+                                       bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), lcached);
                                }
                                else
                                        /* IPV4 lookup (mixed protocol mode) */
 #endif
                                /* IPV4 lookup (ipv4 only mode) */
-                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, cached);
-                               this->ServerInstance->AddResolver(bound_user->res_forward, cached);
+                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached);
+                               this->ServerInstance->AddResolver(bound_user->res_forward, lcached);
                        }
                }
                catch (CoreException& e)
                {
-                       ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+                       ServerInstance->Logs->Log("RESOLVER", DEBUG,"Error in resolver: %s",e.GetReason());
                }
        }
        else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
@@ -103,7 +104,6 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 
 void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 {
-       ServerInstance->Log(DEBUG, "Resolver error: " + errormessage);
        if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
        {
                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());