X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fresolve.c;h=109d8b6c5491aaa69a3a0f8352b7fbdc3d872c8a;hb=c97fb2e93e9c7d66b1ce70fa681a762d1f430521;hp=be41ec8a97517087840444321c520e4a4adc2f3b;hpb=a534e71e8da9a7bab55e7e76358a60dcbd3e25d5;p=ngircd-alex.git

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index be41ec8a..109d8b6c 100644
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -108,9 +108,8 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
 	return false;
 } /* Resolve_Name */
 
-
-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
-#if !defined(WANT_IPV6) && defined(h_errno)
+#if !defined(HAVE_WORKING_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
+#ifdef h_errno
 static char *
 Get_Error( int H_Error )
 {
@@ -217,8 +216,8 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen)
 	assert(reslen >= NG_INET_ADDRSTRLEN);
 	ng_ipaddr_tostr_r(IpAddr, tmp_ip_str);
 
-	Log_Subprocess(LOG_WARNING, "%s: Can't resolve address \"%s\": %s",
-				funcname, tmp_ip_str, errmsg);
+	Log_Subprocess(LOG_WARNING, "Can't resolve address \"%s\": %s [%s].",
+		       tmp_ip_str, errmsg, funcname);
 	strlcpy(resbuf, tmp_ip_str, reslen);
 	return false;
 }
@@ -233,7 +232,11 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen)
  * @return true if lookup successful, false if domain name not found
  */
 static bool
+#ifdef HAVE_WORKING_GETADDRINFO
 ForwardLookup(const char *hostname, array *IpAddr, int af)
+#else
+ForwardLookup(const char *hostname, array *IpAddr, UNUSED int af)
+#endif
 {
 	ng_ipaddr_t addr;
 
@@ -334,14 +337,16 @@ static void
 Log_Forgery_NoIP(const char *ip, const char *host)
 {
 	Log_Subprocess(LOG_WARNING,
-		"Possible forgery: %s resolved to %s (which has no ip address)", ip, host);
+		"Possible forgery: %s resolved to \"%s\", which has no IP address!",
+		ip, host);
 }
 
 static void
 Log_Forgery_WrongIP(const char *ip, const char *host)
 {
 	Log_Subprocess(LOG_WARNING,
-		"Possible forgery: %s resolved to %s (which points to different address)", ip, host);
+		"Possible forgery: %s resolved to \"%s\", which points to a different address!",
+		ip, host);
 }