X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=268cc65540617635467ffc534503a82fa837ae0a;hb=922d4ebf7a27a6577d6b4f91e0f42ccdfa989455;hp=5a09f3f37bd25ff52d480a347642f3d30c9d24c2;hpb=f05102db9ad1effde62d8fb3211772ae2e46f258;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/message.cpp b/src/message.cpp
index 5a09f3f37..268cc6554 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -95,28 +95,6 @@ void NonBlocking(int s)
 	fcntl(s, F_SETFL, flags | O_NONBLOCK);
 }
 
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost, bool forward, unsigned long timeout)
-{
-	bool ok;
-	std::string ipaddr;
-
-	DNS d(Config->DNSServer);
-	if (forward)
-		ok = d.ForwardLookup(unresolvedHost, false);
-	else
-		ok = d.ReverseLookup(unresolvedHost, false);
-	if (!ok)
-		return 0;
-	time_t T = time(NULL)+timeout;
-	while ((!d.HasResult()) && (time(NULL)<T));
-	if (forward)
-		ipaddr = d.GetResultIP();
-	else
-		ipaddr = d.GetResult();
-	strlcpy(resolvedHost,ipaddr.c_str(),MAXBUF);
-	return (ipaddr != "");
-}
-
 int c_count(userrec* u)
 {
 	int z = 0;
@@ -306,7 +284,7 @@ std::string chlist(userrec *user,userrec* source)
 			 * If the channel is NOT private/secret OR the user shares a common channel
 			 * If the user is an oper, and the <options:operspywhois> option is set.
 			 */
-			if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET]) && !(user->modes[UM_INVISIBLE])) || (rec->channel->HasUser(source))))
+			if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
 			{
 				list.append(cmode(user, rec->channel)).append(rec->channel->name).append(" ");
 			}