aboutsummaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-08-05 23:32:24 +0000
committerUlrich Drepper <drepper@redhat.com>2004-08-05 23:32:24 +0000
commit87bb6b6c6bb6d5ff5e5b2a719fa32c77e9898459 (patch)
tree62536f4dd4680dc660ad8293e9a47ed7249ce4d3 /nss
parenta79d752f3da1085b4f00ef1a817d8beadcc3014a (diff)
downloadglibc-87bb6b6c6bb6d5ff5e5b2a719fa32c77e9898459.zip
glibc-87bb6b6c6bb6d5ff5e5b2a719fa32c77e9898459.tar.gz
glibc-87bb6b6c6bb6d5ff5e5b2a719fa32c77e9898459.tar.bz2
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.
Diffstat (limited to 'nss')
-rw-r--r--nss/digits_dots.c2
-rw-r--r--nss/getXXbyYY_r.c2
-rw-r--r--nss/getnssent_r.c11
3 files changed, 6 insertions, 9 deletions
diff --git a/nss/digits_dots.c b/nss/digits_dots.c
index 1720794..9576dd5 100644
--- a/nss/digits_dots.c
+++ b/nss/digits_dots.c
@@ -43,7 +43,7 @@ __nss_hostname_digits_dots (const char *name, struct hostent *resbuf,
/* We have to test for the use of IPv6 which can only be done by
examining `_res'. */
- if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+ if (__res_maybe_init (&_res, 0) == -1)
{
if (h_errnop)
*h_errnop = NETDB_INTERNAL;
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 6338aa5..9e425ce 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -182,7 +182,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
#ifdef NEED__RES
/* The resolver code will really be used so we have to
initialize it. */
- if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
+ if (__res_maybe_init (&_res, 0) == -1)
{
*h_errnop = NETDB_INTERNAL;
*result = NULL;
diff --git a/nss/getnssent_r.c b/nss/getnssent_r.c
index 7545b80..a0cfa72 100644
--- a/nss/getnssent_r.c
+++ b/nss/getnssent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,02 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -60,8 +60,7 @@ __nss_setent (const char *func_name, db_lookup_function lookup_fct,
} fct;
int no_more;
- if (res && (_res.options & RES_INIT) == 0
- && __res_ninit (&_res) == -1)
+ if (res && __res_maybe_init (&_res, 0) == -1)
{
__set_h_errno (NETDB_INTERNAL);
return;
@@ -104,8 +103,7 @@ __nss_endent (const char *func_name, db_lookup_function lookup_fct,
} fct;
int no_more;
- if (res && (_res.options & RES_INIT) == 0
- && __res_ninit (&_res) == -1)
+ if (res && __res_maybe_init (&_res, 0) == -1)
{
__set_h_errno (NETDB_INTERNAL);
return;
@@ -145,8 +143,7 @@ __nss_getent_r (const char *getent_func_name,
int no_more;
enum nss_status status;
- if (res && (_res.options & RES_INIT) == 0
- && __res_ninit (&_res) == -1)
+ if (res && __res_maybe_init (&_res, 0) == -1)
{
*h_errnop = NETDB_INTERNAL;
*result = NULL;