diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-07-17 22:09:30 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-17 22:09:30 +0000 |
commit | 8114530a31e03aec4085f79971c2a3b9e940eae3 (patch) | |
tree | b0b003fab3e4416cb3c35281827a377365a04e34 /nss | |
parent | 7f53da19c11c141d4d4d24417b3a72bbaf755d2c (diff) | |
download | glibc-8114530a31e03aec4085f79971c2a3b9e940eae3.tar.gz glibc-8114530a31e03aec4085f79971c2a3b9e940eae3.tar.xz glibc-8114530a31e03aec4085f79971c2a3b9e940eae3.zip |
Update.
2000-07-17 Bruno Haible <haible@clisp.cons.org> * iconv/gconv_open.c (__gconv_open): Initialize the __data field of struct __gconv_trans_data differently. Don't pass NULL to trans_init_fct. Simplify list append operation. 2000-07-14 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (dcigettext): Call plural_eval on all platforms, not only those having tsearch. 2000-07-17 Ulrich Drepper <drepper@redhat.com> * locale/langinfo.h: Add placeholder values in enum for removed LC_CTYPE entries. 2000-07-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-addr.c (_dl_addr): Keep searching in the _dl_loaded chain if the PHDR check fails. 2000-07-17 Mark Kettenis <kettenis@gnu.org> * nss/getent.c (print_hosts): Make sure we always print a space between numeric addresses and hostnames. 2000-07-17 Wolfram Gloger <wg@malloc.de> * malloc/malloc.c (chunk_alloc): Use mmap_chunk() only if allowed, i.e. if n_mmaps_max>0. 2000-07-16 Mark Kettenis <kettenis@gnu.org> * resolv/netdb.h (AI_V4MAPPED, AI_ALL, AI_ADDRCONFIG): Adjust values to remove possible clash with other AI_* constants. (AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST): Define as hexadecimal constants to stress the fact they're in fact bit flags. 2000-07-15 Mark Kettenis <kettenis@gnu.org> * nss/getXXent_r.c [NEED__RES]: Include <resolv.h>. (SETFUNC_NAME, ENDFUNC_NAME, REENTRANT_GETNAME): Use res_ninit instead of res_init.
Diffstat (limited to 'nss')
-rw-r--r-- | nss/getXXent_r.c | 10 | ||||
-rw-r--r-- | nss/getent.c | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index e0ba98b59a..4e45ec1c15 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -22,6 +22,10 @@ #include "nsswitch.h" +#ifdef NEED__RES +# include <resolv.h> +#endif + /*******************************************************************\ |* Here we assume several symbols to be defined: *| |* *| @@ -149,7 +153,7 @@ SETFUNC_NAME (STAYOPEN) int no_more; #ifdef NEED__RES - if ((_res.options & RES_INIT) == 0 && res_init () == -1) + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) { __set_h_errno (NETDB_INTERNAL); return; @@ -187,7 +191,7 @@ ENDFUNC_NAME (void) int no_more; #ifdef NEED__RES - if ((_res.options & RES_INIT) == 0 && res_init () == -1) + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) { __set_h_errno (NETDB_INTERNAL); return; @@ -224,7 +228,7 @@ INTERNAL (REENTRANT_GETNAME) (LOOKUP_TYPE *resbuf, char *buffer, size_t buflen, enum nss_status status; #ifdef NEED__RES - if ((_res.options & RES_INIT) == 0 && res_init () == -1) + if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1) { __set_h_errno (NETDB_INTERNAL); *result = NULL; diff --git a/nss/getent.c b/nss/getent.c index d3a9fde1e1..5834d790a0 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -257,8 +257,9 @@ print_hosts (struct hostent *host) buf, sizeof (buf)); fputs (ip, stdout); - for (i = strlen (ip); i < 16; ++i) + for (i = strlen (ip); i < 15; ++i) fputs (" ", stdout); + fputs (" ", stdout); fputs (host->h_name, stdout); i = 0; |