Fix Get_Error() usage, take II

[ngircd-alex.git] / src / ngircd / resolve.c

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index be41ec8a97517087840444321c520e4a4adc2f3b..a8a163f0cf786c73ef34173ed3c3b90059e3fdd5 100644 (file)
--- 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;
 }
@@ -334,14 +333,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);
 }