Skip to content

Commit

Permalink
Fix handling of RES_USE_INET6 big in nscd
Browse files Browse the repository at this point in the history
This fixes BZ #12350 also for nscd.
  • Loading branch information
Ulrich Drepper committed Jun 27, 2011
1 parent 4902da1 commit 034807a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
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.

* inet/getnetgrent_r.c (innetgr): Minimal cleanup, use correct return
Expand Down
2 changes: 1 addition & 1 deletion nscd/aicache.c
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
}

out:
_res.options = old_res_options;
_res.options |= old_res_options & RES_USE_INET6;

if (dataset != NULL && !alloca_used)
{
Expand Down

0 comments on commit 034807a

Please sign in to comment.