const'ify command name variable in _COMMAND strcuture

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

diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
index e7f73ad5c3c32cf801ce891c15fa1a45689fcad5..bccf5180f65ce0b839db30e28105986d40d49f85 100644 (file)
--- a/src/ngircd/resolve.c
+++ b/src/ngircd/resolve.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2009 by Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -144,8 +144,8 @@ Resolve_Init(RES_STAT *s)
 }
 
 
-#ifndef WANT_IPV6
-#ifdef h_errno
+#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
+#if !defined(WANT_IPV6) && defined(h_errno)
 static char *
 Get_Error( int H_Error )
 {
@@ -162,8 +162,8 @@ Get_Error( int H_Error )
        }
        return "unknown error";
 }
-#endif /* h_errno */
-#endif /* WANT_IPV6 */
+#endif
+#endif
 
 
 /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */
@@ -203,7 +203,7 @@ Do_IdentQuery(int identsock, array *resolved_addr)
  * the IP address in resbuf and returns false.
  * @param IpAddr ip address to resolve
  * @param resbuf result buffer to store DNS name/string representation of ip address
- * @reslen size of result buffer (must be >= NGT_INET_ADDRSTRLEN)
+ * @param reslen size of result buffer (must be >= NGT_INET_ADDRSTRLEN)
  * @return true if reverse lookup successful, false otherwise
  */
 static bool
@@ -218,7 +218,7 @@ ReverseLookup(const ng_ipaddr_t *IpAddr, char *resbuf, size_t reslen)
        *resbuf = 0;
 
        res = getnameinfo((struct sockaddr *) IpAddr, ng_ipaddr_salen(IpAddr),
-                               resbuf, reslen, NULL, 0, NI_NAMEREQD);
+                         resbuf, (socklen_t)reslen, NULL, 0, NI_NAMEREQD);
        if (res == 0)
                return true;
 
@@ -291,6 +291,8 @@ ForwardLookup(const char *hostname, array *IpAddr)
        if (!Conf_ConnectIPv4)
                hints.ai_family = AF_INET6;
 #endif
+       memset(&addr, 0, sizeof(addr));
+
        res = getaddrinfo(hostname, NULL, &hints, &ai_results);
        switch (res) {
        case 0: break;
@@ -540,5 +542,6 @@ Resolve_Read( RES_STAT *s, void* readbuf, size_t buflen)
        Resolve_Shutdown(s);
        return (size_t)bytes_read;
 }
-/* -eof- */
 
+
+/* -eof- */