yann@1: #--- libc/resolv/nss_dns/dns-host.c.jj	Tue Sep 14 03:05:08 1999
yann@1: #+++ libc/resolv/nss_dns/dns-host.c	Thu Oct 10 13:07:33 2002
yann@1: #@@ -129,9 +129,10 @@ _nss_dns_gethostbyname2_r (const char *n
yann@1: # 			   char *buffer, size_t buflen, int *errnop,
yann@1: # 			   int *h_errnop)
yann@1: # {
yann@1: #-  querybuf host_buffer;
yann@1: #+  querybuf *host_buffer;
yann@1: #   int size, type, n;
yann@1: #   const char *cp;
yann@1: #+  enum nss_status status;
yann@1: # 
yann@1: #   switch (af) {
yann@1: #   case AF_INET:
yann@1: #@@ -159,16 +160,25 @@ _nss_dns_gethostbyname2_r (const char *n
yann@1: #   if (strchr (name, '.') == NULL && (cp = __hostalias (name)) != NULL)
yann@1: #     name = cp;
yann@1: # 
yann@1: #-  n = res_search (name, C_IN, type, host_buffer.buf, sizeof (host_buffer.buf));
yann@1: #+  host_buffer = (querybuf *) malloc (sizeof (*host_buffer));
yann@1: #+  if (host_buffer == NULL) {
yann@1: #+    *errnop = ENOMEM;
yann@1: #+    return NSS_STATUS_UNAVAIL;
yann@1: #+  }
yann@1: #+
yann@1: #+  n = res_search (name, C_IN, type, host_buffer->buf, sizeof (host_buffer->buf));
yann@1: #   if (n < 0)
yann@1: #     {
yann@1: #       *h_errnop = h_errno;
yann@1: #       *errnop = *h_errnop == TRY_AGAIN ? EAGAIN : ENOENT;
yann@1: #+      free (host_buffer);
yann@1: #       return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: #     }
yann@1: # 
yann@1: #-  return getanswer_r (&host_buffer, n, name, type, result, buffer, buflen,
yann@1: #-		      errnop, h_errnop);
yann@1: #+  status = getanswer_r (host_buffer, n, name, type, result, buffer, buflen,
yann@1: #+			errnop, h_errnop);
yann@1: #+  free (host_buffer);
yann@1: #+  return status; 
yann@1: # }
yann@1: # 
yann@1: # 
yann@1: #@@ -205,7 +215,7 @@ _nss_dns_gethostbyaddr_r (const char *ad
yann@1: #     char *h_addr_ptrs[MAX_NR_ADDRS + 1];
yann@1: #     char linebuffer[0];
yann@1: #   } *host_data = (struct host_data *) buffer;
yann@1: #-  querybuf host_buffer;
yann@1: #+  querybuf *host_buffer;
yann@1: #   char qbuf[MAXDNAME+1], *qp;
yann@1: #   size_t size;
yann@1: #   int n, status;
yann@1: #@@ -257,17 +267,25 @@ _nss_dns_gethostbyaddr_r (const char *ad
yann@1: #       /* Cannot happen.  */
yann@1: #     }
yann@1: # 
yann@1: #-  n = res_query (qbuf, C_IN, T_PTR, (u_char *)host_buffer.buf,
yann@1: #-		 sizeof host_buffer);
yann@1: #+  host_buffer = (querybuf *) malloc (sizeof (*host_buffer));
yann@1: #+  if (host_buffer == NULL) {
yann@1: #+    *errnop = ENOMEM;
yann@1: #+    return NSS_STATUS_UNAVAIL;
yann@1: #+  }
yann@1: #+
yann@1: #+  n = res_query (qbuf, C_IN, T_PTR, host_buffer->buf,
yann@1: #+		 sizeof (host_buffer->buf));
yann@1: #   if (n < 0)
yann@1: #     {
yann@1: #       *h_errnop = h_errno;
yann@1: #       *errnop = errno;
yann@1: #+      free (host_buffer);
yann@1: #       return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: #     }
yann@1: # 
yann@1: #-  status = getanswer_r (&host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
yann@1: #+  status = getanswer_r (host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
yann@1: # 			errnop, h_errnop);
yann@1: #+  free (host_buffer);
yann@1: #   if (status != NSS_STATUS_SUCCESS)
yann@1: #     {
yann@1: #       *h_errnop = h_errno;
yann@1: #--- libc/resolv/nss_dns/dns-network.c.jj	Wed Jun 30 12:01:14 1999
yann@1: #+++ libc/resolv/nss_dns/dns-network.c	Thu Oct 10 13:09:49 2002
yann@1: #@@ -113,24 +113,36 @@ _nss_dns_getnetbyname_r (const char *nam
yann@1: # 			 char *buffer, size_t buflen, int *errnop)
yann@1: # {
yann@1: #   /* Return entry for network with NAME.  */
yann@1: #-  querybuf net_buffer;
yann@1: #+  querybuf *net_buffer;
yann@1: #   int anslen;
yann@1: #   char *qbuf;
yann@1: #+  enum nss_status status;
yann@1: # 
yann@1: #   qbuf = strdupa (name);
yann@1: #-  anslen = res_search (qbuf, C_IN, T_PTR, (u_char *) &net_buffer,
yann@1: #-		       sizeof (querybuf));
yann@1: #+
yann@1: #+  net_buffer = (querybuf *) malloc (sizeof (*net_buffer));
yann@1: #+  if (net_buffer == NULL)
yann@1: #+    {
yann@1: #+      *errnop = ENOMEM;
yann@1: #+      return NSS_STATUS_UNAVAIL;
yann@1: #+    }
yann@1: #+
yann@1: #+  anslen = res_search (qbuf, C_IN, T_PTR, net_buffer->buf,
yann@1: #+		       sizeof (net_buffer->buf));
yann@1: #   if (anslen < 0)
yann@1: #     {
yann@1: #       /* Nothing found.  */
yann@1: #       *errnop = errno;
yann@1: #+      free (net_buffer);
yann@1: #       return (errno == ECONNREFUSED
yann@1: # 	      || errno == EPFNOSUPPORT
yann@1: # 	      || errno == EAFNOSUPPORT)
yann@1: # 	? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: #     }
yann@1: # 
yann@1: #-  return getanswer_r (&net_buffer, anslen, result, buffer, buflen, BYNAME);
yann@1: #+  status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYNAME);
yann@1: #+  free (net_buffer);
yann@1: #+  return status;
yann@1: # }
yann@1: # 
yann@1: # 
yann@1: #@@ -140,7 +152,7 @@ _nss_dns_getnetbyaddr_r (long net, int t
yann@1: # {
yann@1: #   /* Return entry for network with NAME.  */
yann@1: #   enum nss_status status;
yann@1: #-  querybuf net_buffer;
yann@1: #+  querybuf *net_buffer;
yann@1: #   unsigned int net_bytes[4];
yann@1: #   char qbuf[MAXDNAME];
yann@1: #   int cnt, anslen;
yann@1: #@@ -176,19 +188,28 @@ _nss_dns_getnetbyaddr_r (long net, int t
yann@1: #       break;
yann@1: #     }
yann@1: # 
yann@1: #-  anslen = res_query (qbuf, C_IN, T_PTR, (u_char *) &net_buffer,
yann@1: #-		      sizeof (querybuf));
yann@1: #+  net_buffer = (querybuf *) malloc (sizeof (*net_buffer));
yann@1: #+  if (net_buffer == NULL)
yann@1: #+    {
yann@1: #+      *errnop = ENOMEM;
yann@1: #+      return NSS_STATUS_UNAVAIL;
yann@1: #+    }
yann@1: #+
yann@1: #+  anslen = res_query (qbuf, C_IN, T_PTR, net_buffer->buf,
yann@1: #+		      sizeof (net_buffer->buf));
yann@1: #   if (anslen < 0)
yann@1: #     {
yann@1: #       /* Nothing found.  */
yann@1: #       *errnop = errno;
yann@1: #+      free (net_buffer);
yann@1: #       return (errno == ECONNREFUSED
yann@1: # 	      || errno == EPFNOSUPPORT
yann@1: # 	      || errno == EAFNOSUPPORT)
yann@1: # 	? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: #     }
yann@1: # 
yann@1: #-  status = getanswer_r (&net_buffer, anslen, result, buffer, buflen, BYADDR);
yann@1: #+  status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYADDR);
yann@1: #+  free (net_buffer);
yann@1: #   if (status == NSS_STATUS_SUCCESS)
yann@1: #     {
yann@1: #       /* Strip trailing zeros.  */
yann@1: #--- libc/resolv/res_query.c.jj	Wed Jun 30 12:01:06 1999
yann@1: #+++ libc/resolv/res_query.c	Thu Oct 10 13:01:12 2002
yann@1: #@@ -106,7 +106,7 @@ res_query(name, class, type, answer, ans
yann@1: # 	u_char *answer;		/* buffer to put answer */
yann@1: # 	int anslen;		/* size of answer buffer */
yann@1: # {
yann@1: #-	u_char buf[MAXPACKET];
yann@1: #+	u_char *buf;
yann@1: # 	register HEADER *hp = (HEADER *) answer;
yann@1: # 	int n;
yann@1: # 
yann@1: #@@ -121,17 +121,25 @@ res_query(name, class, type, answer, ans
yann@1: # 		printf(";; res_query(%s, %d, %d)\n", name, class, type);
yann@1: # #endif
yann@1: # 
yann@1: #+	buf = malloc (MAXPACKET);
yann@1: #+	if (buf == NULL) {
yann@1: #+		__set_h_errno (NETDB_INTERNAL);
yann@1: #+		return -1;
yann@1: #+	}
yann@1: #+
yann@1: # 	n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
yann@1: #-			buf, sizeof(buf));
yann@1: #+			buf, MAXPACKET);
yann@1: # 	if (n <= 0) {
yann@1: # #ifdef DEBUG
yann@1: # 		if (_res.options & RES_DEBUG)
yann@1: # 			printf(";; res_query: mkquery failed\n");
yann@1: # #endif
yann@1: # 		__set_h_errno (NO_RECOVERY);
yann@1: #+		free (buf);
yann@1: # 		return (n);
yann@1: # 	}
yann@1: # 	n = res_send(buf, n, answer, anslen);
yann@1: #+	free (buf);
yann@1: # 	if (n < 0) {
yann@1: # #ifdef DEBUG
yann@1: # 		if (_res.options & RES_DEBUG)
yann@1: #--- libc/resolv/gethnamaddr.c.jj	Tue Dec  7 11:50:36 1999
yann@1: #+++ libc/resolv/gethnamaddr.c	Thu Oct 10 15:05:50 2002
yann@1: #@@ -512,10 +512,11 @@ gethostbyname2(name, af)
yann@1: # 	const char *name;
yann@1: # 	int af;
yann@1: # {
yann@1: #-	querybuf buf;
yann@1: #+	querybuf *buf;
yann@1: # 	register const char *cp;
yann@1: # 	char *bp;
yann@1: # 	int n, size, type, len;
yann@1: #+	struct hostent *ret;
yann@1: # 	extern struct hostent *_gethtbyname2();
yann@1: # 
yann@1: # 	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
yann@1: #@@ -617,13 +618,22 @@ gethostbyname2(name, af)
yann@1: # 				break;
yann@1: # 		}
yann@1: # 
yann@1: #-	if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf.buf))) < 0) {
yann@1: #+	buf = (querybuf *) malloc (sizeof (*buf));
yann@1: #+	if (buf == NULL) {
yann@1: #+		__set_h_errno (NETDB_INTERNAL);
yann@1: #+		return NULL;
yann@1: #+	}
yann@1: #+
yann@1: #+	if ((n = res_search(name, C_IN, type, buf->buf, sizeof(buf->buf))) < 0) {
yann@1: #+		free (buf);
yann@1: # 		dprintf("res_search failed (%d)\n", n);
yann@1: # 		if (errno == ECONNREFUSED)
yann@1: # 			return (_gethtbyname2(name, af));
yann@1: # 		return (NULL);
yann@1: # 	}
yann@1: #-	return (getanswer(&buf, n, name, type));
yann@1: #+	ret = getanswer(buf, n, name, type);
yann@1: #+	free (buf);
yann@1: #+	return ret;
yann@1: # }
yann@1: # 
yann@1: # struct hostent *
yann@1: #@@ -636,7 +646,7 @@ gethostbyaddr(addr, len, af)
yann@1: # 	static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
yann@1: # 	static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
yann@1: # 	int n, size;
yann@1: #-	querybuf buf;
yann@1: #+	querybuf *buf;
yann@1: # 	register struct hostent *hp;
yann@1: # 	char qbuf[MAXDNAME+1], *qp;
yann@1: # #ifdef SUNSECURITY
yann@1: #@@ -697,14 +707,24 @@ gethostbyaddr(addr, len, af)
yann@1: # 	default:
yann@1: # 		abort();
yann@1: # 	}
yann@1: #-	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
yann@1: #+
yann@1: #+	buf = (querybuf *) malloc (sizeof (*buf));
yann@1: #+	if (buf == NULL) {
yann@1: #+		__set_h_errno (NETDB_INTERNAL);
yann@1: #+		return NULL;
yann@1: #+	}
yann@1: #+
yann@1: #+	n = res_query(qbuf, C_IN, T_PTR, buf->buf, sizeof buf->buf);
yann@1: # 	if (n < 0) {
yann@1: #+		free (buf);
yann@1: # 		dprintf("res_query failed (%d)\n", n);
yann@1: # 		if (errno == ECONNREFUSED)
yann@1: # 			return (_gethtbyaddr(addr, len, af));
yann@1: # 		return (NULL);
yann@1: # 	}
yann@1: #-	if (!(hp = getanswer(&buf, n, qbuf, T_PTR)))
yann@1: #+	hp = getanswer(buf, n, qbuf, T_PTR);
yann@1: #+	free (buf);
yann@1: #+	if (!hp)
yann@1: # 		return (NULL);	/* h_errno was set by getanswer() */
yann@1: # #ifdef SUNSECURITY
yann@1: # 	if (af == AF_INET) {
yann@1: #--- libc/resolv/getnetnamadr.c.jj	Wed Jun 30 12:00:50 1999
yann@1: #+++ libc/resolv/getnetnamadr.c	Thu Oct 10 13:14:01 2002
yann@1: #@@ -210,7 +210,7 @@ getnetbyaddr(net, net_type)
yann@1: # {
yann@1: # 	unsigned int netbr[4];
yann@1: # 	int nn, anslen;
yann@1: #-	querybuf buf;
yann@1: #+	querybuf *buf;
yann@1: # 	char qbuf[MAXDNAME];
yann@1: # 	u_int32_t net2;		/* Changed from unsigned long --roland */
yann@1: # 	struct netent *net_entry;
yann@1: #@@ -236,8 +236,15 @@ getnetbyaddr(net, net_type)
yann@1: # 		    netbr[1], netbr[0]);
yann@1: # 		break;
yann@1: # 	}
yann@1: #-	anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
yann@1: #+
yann@1: #+	buf = (querybuf *) malloc (sizeof (*buf));
yann@1: #+	if (buf == NULL) {
yann@1: #+		return NULL;
yann@1: #+	}
yann@1: #+
yann@1: #+	anslen = res_query(qbuf, C_IN, T_PTR, buf->buf, sizeof(buf->buf));
yann@1: # 	if (anslen < 0) {
yann@1: #+		free (buf);
yann@1: # #ifdef DEBUG
yann@1: # 		if (_res.options & RES_DEBUG)
yann@1: # 			printf("res_query failed\n");
yann@1: #@@ -246,7 +253,8 @@ getnetbyaddr(net, net_type)
yann@1: # 			return (_getnetbyaddr(net, net_type));
yann@1: # 		return (NULL);
yann@1: # 	}
yann@1: #-	net_entry = getnetanswer(&buf, anslen, BYADDR);
yann@1: #+	net_entry = getnetanswer(buf, anslen, BYADDR);
yann@1: #+	free (buf);
yann@1: # 	if (net_entry) {
yann@1: # 		unsigned u_net = net;	/* maybe net should be unsigned ? */
yann@1: # 
yann@1: #@@ -264,7 +272,7 @@ getnetbyname(net)
yann@1: # 	register const char *net;
yann@1: # {
yann@1: # 	int anslen;
yann@1: #-	querybuf buf;
yann@1: #+	querybuf *buf;
yann@1: # 	char qbuf[MAXDNAME];
yann@1: # 	struct netent *net_entry;
yann@1: # 
yann@1: #@@ -273,8 +281,13 @@ getnetbyname(net)
yann@1: # 		return (NULL);
yann@1: # 	}
yann@1: # 	strcpy(&qbuf[0], net);
yann@1: #-	anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
yann@1: #+	buf = (querybuf *) malloc (sizeof (*buf));
yann@1: #+	if (buf == NULL) {
yann@1: #+		return NULL;
yann@1: #+	}
yann@1: #+	anslen = res_search(qbuf, C_IN, T_PTR, buf->buf, sizeof(buf->buf));
yann@1: # 	if (anslen < 0) {
yann@1: #+		free (buf);
yann@1: # #ifdef DEBUG
yann@1: # 		if (_res.options & RES_DEBUG)
yann@1: # 			printf("res_query failed\n");
yann@1: #@@ -283,7 +296,8 @@ getnetbyname(net)
yann@1: # 			return (_getnetbyname(net));
yann@1: # 		return (_getnetbyname(net));
yann@1: # 	}
yann@1: #-	net_entry = getnetanswer(&buf, anslen, BYNAME);
yann@1: #+	net_entry = getnetanswer(buf, anslen, BYNAME);
yann@1: #+	free (buf);
yann@1: # 	if (net_entry)
yann@1: # 		return (net_entry);
yann@1: # 	return (_getnetbyname(net));
yann@1: --- libc/glibc-compat/nss_dns/dns-host.c.jj	Mon Jan  3 20:07:08 2000
yann@1: +++ libc/glibc-compat/nss_dns/dns-host.c	Thu Oct 10 12:46:24 2002
yann@1: @@ -126,9 +126,10 @@ enum nss_status
yann@1:  _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
yann@1:  			   char *buffer, size_t buflen, int *h_errnop)
yann@1:  {
yann@1: -  querybuf host_buffer;
yann@1: +  querybuf *host_buffer;
yann@1:    int size, type, n;
yann@1:    const char *cp;
yann@1: +  enum nss_status status;
yann@1:  
yann@1:    switch (af) {
yann@1:    case AF_INET:
yann@1: @@ -156,15 +157,22 @@ _nss_dns_gethostbyname2_r (const char *n
yann@1:    if (strchr (name, '.') == NULL && (cp = __hostalias (name)) != NULL)
yann@1:      name = cp;
yann@1:  
yann@1: -  n = res_search (name, C_IN, type, host_buffer.buf, sizeof (host_buffer.buf));
yann@1: +  host_buffer = (querybuf *) malloc (sizeof (querybuf));
yann@1: +  if (host_buffer == NULL)
yann@1: +    return NSS_STATUS_UNAVAIL;
yann@1: +
yann@1: +  n = res_search (name, C_IN, type, host_buffer->buf, sizeof (host_buffer->buf));
yann@1:    if (n < 0)
yann@1:      {
yann@1:        *h_errnop = h_errno;
yann@1: +      free (host_buffer);
yann@1:        return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1:      }
yann@1:  
yann@1: -  return getanswer_r (&host_buffer, n, name, type, result, buffer, buflen,
yann@1: -		      h_errnop);
yann@1: +  status = getanswer_r (host_buffer, n, name, type, result, buffer, buflen,
yann@1: +			h_errnop);
yann@1: +  free (host_buffer);
yann@1: +  return status;
yann@1:  }
yann@1:  
yann@1:  
yann@1: @@ -200,7 +208,7 @@ _nss_dns_gethostbyaddr_r (const char *ad
yann@1:      char *h_addr_ptrs[MAX_NR_ADDRS + 1];
yann@1:      char linebuffer[0];
yann@1:    } *host_data = (struct host_data *) buffer;
yann@1: -  querybuf host_buffer;
yann@1: +  querybuf *host_buffer;
yann@1:    char qbuf[MAXDNAME+1], *qp;
yann@1:    int size, n, status;
yann@1:  
yann@1: @@ -251,16 +259,22 @@ _nss_dns_gethostbyaddr_r (const char *ad
yann@1:        /* Cannot happen.  */
yann@1:      }
yann@1:  
yann@1: -  n = res_query (qbuf, C_IN, T_PTR, (u_char *)host_buffer.buf,
yann@1: -		 sizeof host_buffer);
yann@1: +  host_buffer = (querybuf *) malloc (sizeof (querybuf));
yann@1: +  if (host_buffer == NULL)
yann@1: +    return NSS_STATUS_UNAVAIL;
yann@1: +
yann@1: +  n = res_query (qbuf, C_IN, T_PTR, host_buffer->buf,
yann@1: +		 sizeof (host_buffer->buf));
yann@1:    if (n < 0)
yann@1:      {
yann@1:        *h_errnop = h_errno;
yann@1: +      free (host_buffer);
yann@1:        return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1:      }
yann@1:  
yann@1: -  status = getanswer_r (&host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
yann@1: +  status = getanswer_r (host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
yann@1:  			h_errnop);
yann@1: +  free (host_buffer);
yann@1:    if (status != NSS_STATUS_SUCCESS)
yann@1:      {
yann@1:        *h_errnop = h_errno;
yann@1: --- libc/glibc-compat/nss_dns/dns-network.c.jj	Mon Jan  3 20:07:08 2000
yann@1: +++ libc/glibc-compat/nss_dns/dns-network.c	Thu Oct 10 12:46:24 2002
yann@1: @@ -107,21 +107,32 @@ _nss_dns_getnetbyname_r (const char *nam
yann@1:  			 char *buffer, size_t buflen)
yann@1:  {
yann@1:    /* Return entry for network with NAME.  */
yann@1: -  querybuf net_buffer;
yann@1: +  querybuf *net_buffer;
yann@1:    int anslen;
yann@1:    char *qbuf;
yann@1: +  enum nss_status status;
yann@1:  
yann@1:    qbuf = strdupa (name);
yann@1: -  anslen = res_search (qbuf, C_IN, T_PTR, (u_char *) &net_buffer,
yann@1: -		       sizeof (querybuf));
yann@1: +
yann@1: +  net_buffer = (querybuf *) malloc (sizeof (querybuf));
yann@1: +  if (net_buffer == NULL)
yann@1: +    return NSS_STATUS_UNAVAIL;
yann@1: +
yann@1: +  anslen = res_search (qbuf, C_IN, T_PTR, net_buffer->buf,
yann@1: +		       sizeof (net_buffer->buf));
yann@1:    if (anslen < 0)
yann@1: -    /* Nothing found.  */
yann@1: -    return (errno == ECONNREFUSED
yann@1: -	    || errno == EPFNOSUPPORT
yann@1: -	    || errno == EAFNOSUPPORT)
yann@1: -      ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: +    {
yann@1: +      free (net_buffer);
yann@1: +      /* Nothing found.  */
yann@1: +      return (errno == ECONNREFUSED
yann@1: +	      || errno == EPFNOSUPPORT
yann@1: +	      || errno == EAFNOSUPPORT)
yann@1: +	      ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: +    }
yann@1:  
yann@1: -  return getanswer_r (&net_buffer, anslen, result, buffer, buflen, BYNAME);
yann@1: +  status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYNAME);
yann@1: +  free (net_buffer);
yann@1: +  return status;
yann@1:  }
yann@1:  
yann@1:  
yann@1: @@ -131,7 +142,7 @@ _nss_dns_getnetbyaddr_r (long net, int t
yann@1:  {
yann@1:    /* Return entry for network with NAME.  */
yann@1:    enum nss_status status;
yann@1: -  querybuf net_buffer;
yann@1: +  querybuf *net_buffer;
yann@1:    unsigned int net_bytes[4];
yann@1:    char qbuf[MAXDNAME];
yann@1:    int cnt, anslen;
yann@1: @@ -167,16 +178,24 @@ _nss_dns_getnetbyaddr_r (long net, int t
yann@1:        break;
yann@1:      }
yann@1:  
yann@1: -  anslen = res_query (qbuf, C_IN, T_PTR, (u_char *) &net_buffer,
yann@1: -		      sizeof (querybuf));
yann@1: +  net_buffer = (querybuf *) malloc (sizeof (querybuf));
yann@1: +  if (net_buffer == NULL)
yann@1: +    return NSS_STATUS_UNAVAIL;
yann@1: +
yann@1: +  anslen = res_query (qbuf, C_IN, T_PTR, net_buffer->buf,
yann@1: +		      sizeof (net_buffer->buf));
yann@1:    if (anslen < 0)
yann@1: -    /* Nothing found.  */
yann@1: -    return (errno == ECONNREFUSED
yann@1: -	    || errno == EPFNOSUPPORT
yann@1: -	    || errno == EAFNOSUPPORT)
yann@1: -      ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: +    {
yann@1: +      free (net_buffer);
yann@1: +      /* Nothing found.  */
yann@1: +      return (errno == ECONNREFUSED
yann@1: +	      || errno == EPFNOSUPPORT
yann@1: +	      || errno == EAFNOSUPPORT)
yann@1: +	      ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
yann@1: +    }
yann@1:  
yann@1: -  status = getanswer_r (&net_buffer, anslen, result, buffer, buflen, BYADDR);
yann@1: +  status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYADDR);
yann@1: +  free (net_buffer);
yann@1:    if (status == NSS_STATUS_SUCCESS)
yann@1:      {
yann@1:        /* Strip trailing zeros.  */