diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-05-09 12:28:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-05-09 13:19:55 +0200 |
| commit | 0ad970bb13920b6471ccc4503cf1f0d8b2352f05 (patch) | |
| tree | 7d1dc2cb87cdd5b2417a74ddfc729147b08cb70f | |
| parent | 2bfdaeddaad93425b93c42ef7a75443b96824942 (diff) | |
| download | glibc-0ad970bb13920b6471ccc4503cf1f0d8b2352f05.tar.gz glibc-0ad970bb13920b6471ccc4503cf1f0d8b2352f05.tar.xz glibc-0ad970bb13920b6471ccc4503cf1f0d8b2352f05.zip | |
resolv: Use RES_DFLRETRY consistently [BZ #21474]
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | resolv/res_libc.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d8e12d6359..f3a0bddb3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/resolv/res_libc.c b/resolv/res_libc.c index a4b376f15b..c52574f895 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -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 (); |