system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolv: Use RES_DFLRETRY consistently [BZ #21474]

Browse Source
This commit is contained in:
Florian Weimer 2017-05-09 12:28:01 +02:00
parent 2bfdaeddaa
commit 0ad970bb13
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2017-05-09 Florian Weimer <fweimer@redhat.com>
[BZ #21474]
* resolv/res_libc.c (res_init): Use RES_DFLRETRY.
(__res_maybe_init): Likewise.
2017-05-09 Zack Weinberg <zackw@panix.com> 2017-05-09 Zack Weinberg <zackw@panix.com>
* extra-modules.mk: Delete file. * extra-modules.mk: Delete file.

4
resolv/res_libc.c
View File

@ -65,7 +65,7 @@ res_init(void) {
if (!_res.retrans) if (!_res.retrans)
_res.retrans = RES_TIMEOUT; _res.retrans = RES_TIMEOUT;
if (!_res.retry) if (!_res.retry)
_res.retry = 4; _res.retry = RES_DFLRETRY;
if (!(_res.options & RES_INIT)) if (!(_res.options & RES_INIT))
_res.options = RES_DEFAULT; _res.options = RES_DEFAULT;
else if (_res.nscount > 0) else if (_res.nscount > 0)
@ -103,7 +103,7 @@ __res_maybe_init (res_state resp, int preinit)
if (!resp->retrans) if (!resp->retrans)
resp->retrans = RES_TIMEOUT; resp->retrans = RES_TIMEOUT;
if (!resp->retry) if (!resp->retry)
resp->retry = 4; resp->retry = RES_DFLRETRY;
resp->options = RES_DEFAULT; resp->options = RES_DEFAULT;
if (!resp->id) if (!resp->id)
resp->id = res_randomid (); resp->id = res_randomid ();