qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix handling of RES_USE_INET6 big in nscd 

This fixes BZ #12350 also for nscd.
This commit is contained in:
Ulrich Drepper 2011-06-27 13:10:44 -04:00
parent 4902da17c8
commit 034807a9cb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2011-06-27 Ulrich Drepper <drepper@gmail.com> 2011-06-27 Ulrich Drepper <drepper@gmail.com>
[BZ #12350]
* nscd/aicache.c (addhstaiX): Restore only RES_USE_INET6
bit from old_res_options.
* sysdeps/unix/sysv/linux/Makefile (CFLAGS-servicescache.c): Define. * sysdeps/unix/sysv/linux/Makefile (CFLAGS-servicescache.c): Define.
* inet/getnetgrent_r.c (innetgr): Minimal cleanup, use correct return * inet/getnetgrent_r.c (innetgr): Minimal cleanup, use correct return

2
nscd/aicache.c
View File

@ -534,7 +534,7 @@ next_nip:
} }
out: out:
_res.options = old_res_options; _res.options |= old_res_options & RES_USE_INET6;
if (dataset != NULL && !alloca_used) if (dataset != NULL && !alloca_used)
{ {