resolv: Use RES_DFLRETRY consistently [BZ #21474]

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

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>
* extra-modules.mk: Delete file.

View File

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