naviserver-commits

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1729/nsd

Modified Files:
	dns.c 
Log Message:
        * nsd/dns.c: Don't log host/address not found error
        messages. These aren't really errors.


Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/dns.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dns.c	24 Jun 2005 08:37:41 -0000	1.5
--- dns.c	19 Aug 2005 09:01:13 -0000	1.6
***************
*** 259,270 ****
      sa.sin_family = AF_INET;
      sa.sin_addr.s_addr = inet_addr(addr);
!     if ((result = getnameinfo((const struct sockaddr *) &sa,
!                     sizeof(struct sockaddr_in), buf, sizeof(buf),
!                     NULL, 0, NI_NAMEREQD)) != 0) {
!         Ns_Log(Error, "dns: getnameinfo failed: %s", gai_strerror(result));
!     } else {
          Ns_DStringAppend(dsPtr, buf);
          status = NS_TRUE;
!         
      }
      return status;
--- 259,270 ----
      sa.sin_family = AF_INET;
      sa.sin_addr.s_addr = inet_addr(addr);
!     result = getnameinfo((const struct sockaddr *) &sa,
!                          sizeof(struct sockaddr_in), buf, sizeof(buf),
!                          NULL, 0, NI_NAMEREQD);
!     if (result == 0) {
          Ns_DStringAppend(dsPtr, buf);
          status = NS_TRUE;
!     } else if (result != EAI_NONAME) {
!         Ns_Log(Error, "dns: getnameinfo failed: %s", gai_strerror(result));        
      }
      return status;
***************
*** 343,350 ****
      hints.ai_family = PF_INET;
      hints.ai_socktype = SOCK_STREAM;
!     if ((result = getaddrinfo(host, NULL, &hints, &res)) != 0) {
!         Ns_Log(Error, "dns: getaddrinfo failed for %s: %s", host,
!                 gai_strerror(result));
!     } else {
          ptr = res;
          while (ptr != NULL) {
--- 343,347 ----
      hints.ai_family = PF_INET;
      hints.ai_socktype = SOCK_STREAM;
!     if ((result = getaddrinfo(host, NULL, &hints, &res)) == 0) {
          ptr = res;
          while (ptr != NULL) {
***************
*** 355,358 ****
--- 352,358 ----
          }
          freeaddrinfo(res);
+     } else if (result != EAI_NONAME) {
+         Ns_Log(Error, "dns: getaddrinfo failed for %s: %s", host,
+                gai_strerror(result));
      }
      return status;