OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* resolv/res_init.c (__res_vinit): Always assign to statp->nscount 

after reading name server list.
This commit is contained in:
Ulrich Drepper 2008-12-08 03:59:18 +00:00
parent e87946cce5
commit 905ef0daeb
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2008-12-07 Ulrich Drepper <drepper@redhat.com>
* resolv/res_init.c (__res_vinit): Always assign to statp->nscount
after reading name server list.
* nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyname4_r): Fix memory
handling for host name aliases.

3
nis/nss_nis/nis-hosts.c
View File

@ -545,8 +545,7 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
size_t h_name_len = strlen (host.h_name) + 1;
if (h_name_len >= buflen)
goto erange;
/* Potentially the string and the destination buffer overlap. */
(*pat)->name = memmove (buffer, host.h_name, h_name_len);
(*pat)->name = memcpy (buffer, host.h_name, h_name_len);
free (result);

3
resolv/res_init.c
View File

@ -420,8 +420,7 @@ __res_vinit(res_state statp, int preinit) {
continue;
}
}
if (nserv > 1)
statp->nscount = nserv;
statp->nscount = nserv;
#ifdef _LIBC
if (nservall - nserv > 0) {
statp->_u._ext.nscount6 = nservall - nserv;