Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index 156bb9828f6384211d1b1e40b6b7b9bdfa87c54a..f18fc9a0385a29604ec5586bd3d276e7a8de2d8f 100644 (file)
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 UserResolver::UserResolver(LocalUser* user, std::string to_resolve, QueryType qt, bool &cache) :
        Resolver(to_resolve, qt, cache, NULL), uuid(user->uuid)
@@ -22,9 +29,17 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 {
        UserResolver *res_forward; // for forward-resolution
        LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid);
+       if (!bound_user)
+       {
+               ServerInstance->Logs->Log("RESOLVER", DEBUG, "Resolution finished for user '%s' who is gone", uuid.c_str());
+               return;
+       }
+
+       ServerInstance->Logs->Log("RESOLVER", DEBUG, "DNS result for %s: '%s' -> '%s'", uuid.c_str(), input.c_str(), result.c_str());
 
-       if ((!this->fwd) && bound_user)
+       if (!fwd)
        {
+               // first half of resolution is done. We now need to verify that the host matches.
                bound_user->stored_host = result;
                try
                {
@@ -50,7 +65,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) && bound_user)
+       else
        {
                /* Both lookups completed */