mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Track single-request fallback via _res._flags (bug 31476)

Browse Source 
This avoids changing _res.options, which inteferes with change
detection as part of automatic reloading of /etc/resolv.conf.

Reviewed-by: DJ Delorie <dj@redhat.com>
(cherry picked from commit 868ab8923a)
This commit is contained in:
Florian Weimer 2024-06-13 18:56:30 +02:00
parent 8c9fbc6651
commit 51db012c94
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -55,6 +55,7 @@ The following bugs are resolved with this release:
[31372] dynamic-link: _dl_tlsdesc_dynamic doesn't preserve all caller-
saved registers
[31429] build: Glibc failed to build with -march=x86-64-v3
[31476] resolv: Track single-request fallback via _res._flags
[31501] dynamic-link: _dl_tlsdesc_dynamic_xsavec may clobber %rbx
[31612] libc: arc4random fails to fallback to /dev/urandom if
getrandom is not present

12
resolv/res_send.c
View File

@ -947,9 +947,11 @@ send_dg(res_state statp,
seconds /= statp->nscount;
if (seconds <= 0)
seconds = 1;
bool single_request_reopen = (statp->options & RES_SNGLKUPREOP) != 0;
bool single_request = (((statp->options & RES_SNGLKUP) != 0)
| single_request_reopen);
bool single_request_reopen = ((statp->options & RES_SNGLKUPREOP)
|| (statp->_flags & RES_F_SNGLKUPREOP));
bool single_request = ((statp->options & RES_SNGLKUP)
|| (statp->_flags & RES_F_SNGLKUP)
|| single_request_reopen);
int save_gotsomewhere = *gotsomewhere;
int retval;
@ -1006,14 +1008,14 @@ send_dg(res_state statp,
have received the first answer. */
if (!single_request)
{
statp->options |= RES_SNGLKUP;
statp->_flags |= RES_F_SNGLKUP;
single_request = true;
*gotsomewhere = save_gotsomewhere;
goto retry;
}
else if (!single_request_reopen)
{
statp->options |= RES_SNGLKUPREOP;
statp->_flags |= RES_F_SNGLKUPREOP;
single_request_reopen = true;
*gotsomewhere = save_gotsomewhere;
__res_iclose (statp, false);

2
resolv/resolv-internal.h
View File

@ -26,6 +26,8 @@
#define RES_F_VC 0x00000001 /* Socket is TCP. */
#define RES_F_CONN 0x00000002 /* Socket is connected. */
#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors. */
#define RES_F_SNGLKUP 0x00200000 /* Private version of RES_SNGLKUP. */
#define RES_F_SNGLKUPREOP 0x00400000 /* Private version of RES_SNGLKUPREOP. */
/* The structure HEADER is normally aligned on a word boundary. In
some code, we need to access this structure when it may be aligned