From 87bb6b6c6bb6d5ff5e5b2a719fa32c77e9898459 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 5 Aug 2004 23:32:24 +0000
Subject: Update.

2004-08-04  Jakub Jelinek  <jakub@redhat.com>

	* hesiod/hesiod.c (__hesiod_res_get): Use calloc instead of malloc +
	memset.
	(__hesiod_res_set): Free nsaddrs.

	* include/resolv.h (__res_maybe_init): Add prototype.
	* resolv/resolv.h (struct __res_state): Add _u._ext.initstamp field.
	* resolv/Versions (libc): Add __res_maybe_init@@GLIBC_PRIVATE.
	* resolv/res_libc.c (__res_initstamp, lock): New variables.
	(res_init): Increase __res_initstamp.
	(__res_maybe_init): New function.
	* resolv/res_init.c (__res_vinit): Initialize _u._ext.initstamp.
	* hesiod/hesiod.c (__hesiod_res_get): Use __res_maybe_init instead
	of RES_INIT check and {res_ninit,__res_ninit,res_init} call.
	* sysdeps/posix/getaddrinfo.c (gaih_inet): Likewise.
	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r,
	_nss_dns_gethostbyaddr_r): Likewise.
	* resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r,
	_nss_dns_getnetbyaddr_r): Likewise.
	* resolv/gethnamaddr.c (gethostbyname, gethostbyname2,
	gethostbyaddr): Likewise.
	* resolv/res_data.c (fp_nquery, res_mkquery, res_mkupdate,
	res_isourserver, res_sendsigned, res_update, res_search,
	res_querydomain): Likewise.
	* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)): Likewise.
	* nss/digits_dots.c (__nss_hostname_digits_dots): Likewise.
	* nss/getnssent_r.c (__nss_setent, __nss_endent, __nss_getent_r):
	Likewise.

	* sysdeps/posix/getaddrinfo.c (gaih_inet): Set ai_family for
	V4-mapped IPv6 addresses and req->ai_family==AF_INET.
	Reported by A. Guru <a.guru@sympatico.ca>.

	* po/pl.po: Likewise.
	characters than necessary.
---
 resolv/res_data.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'resolv/res_data.c')

diff --git a/resolv/res_data.c b/resolv/res_data.c
index 7488ba7..2183e02 100644
--- a/resolv/res_data.c
+++ b/resolv/res_data.c
@@ -141,7 +141,7 @@ fp_query(const u_char *msg, FILE *file) {
 
 void
 fp_nquery(const u_char *msg, int len, FILE *file) {
-	if ((_res.options & RES_INIT) == 0 && __res_ninit(&_res) == -1)
+	if (__res_maybe_init (&_res, 0) == -1)
 		return;
 
 	res_pquery(&_res, msg, len, file);
@@ -157,7 +157,7 @@ res_mkquery(int op,			/* opcode of query */
 	    u_char *buf,		/* buffer to put query */
 	    int buflen)			/* size of buffer */
 {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
 		return (-1);
 	}
@@ -169,7 +169,7 @@ res_mkquery(int op,			/* opcode of query */
 #ifdef BIND_UPDATE
 int
 res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
 		return (-1);
 	}
@@ -184,7 +184,7 @@ res_query(const char *name,	/* domain name */
 	  u_char *answer,	/* buffer to put answer */
 	  int anslen)		/* size of answer buffer */
 {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
 		return (-1);
 	}
@@ -208,7 +208,7 @@ res_isourserver(const struct sockaddr_in *inp) {
 
 int
 res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		/* errno should have been set by res_init() in this case. */
 		return (-1);
 	}
@@ -221,7 +221,7 @@ int
 res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
 	       u_char *ans, int anssiz)
 {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		/* errno should have been set by res_init() in this case. */
 		return (-1);
 	}
@@ -249,7 +249,7 @@ res_close(void) {
 #ifdef BIND_UPDATE
 int
 res_update(ns_updrec *rrecp_in) {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
 		return (-1);
 	}
@@ -264,7 +264,7 @@ res_search(const char *name,	/* domain name */
 	   u_char *answer,	/* buffer to put answer */
 	   int anslen)		/* size of answer */
 {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
 		return (-1);
 	}
@@ -279,7 +279,7 @@ res_querydomain(const char *name,
 		u_char *answer,		/* buffer to put answer */
 		int anslen)		/* size of answer */
 {
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+	if (__res_maybe_init (&_res, 1) == -1) {
 		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
 		return (-1);
 	}
-- 
cgit v1.1