X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=8dec4c5419f38c7ae365112c3c8c9f2ac700c3f4;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=cb3db08519b3845cdcaaa324d6d92868054b965a;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index cb3db0851..8dec4c541 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -36,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))
@@ -71,13 +71,13 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 				if ((this->bound_user->registered != REG_ALL) && (!this->bound_user->dns_done))
 				{
 					/* Hostnames starting with : are not a good thing (tm) */
-					if (*(hostname.c_str()) == ':')
+					if (hostname[0] == ':')
 						hostname.insert(0, "0");
 
 					this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : ""));
 					this->bound_user->dns_done = true;
-					strlcpy(this->bound_user->dhost, hostname.c_str(),64);
-					strlcpy(this->bound_user->host, hostname.c_str(),64);
+					this->bound_user->dhost.assign(hostname, 0, 64);
+					this->bound_user->host.assign(hostname, 0, 64);
 					/* Invalidate cache */
 					this->bound_user->InvalidateCache();
 				}