resolv: Use RES_DFLRETRY consistently [BZ #21474]

diff --git a/ChangeLog b/ChangeLog
index d8e12d6359dbef86f9d019c73052b9e3d01fbd81..f3a0bddb3dd83d4fb5797ab6b3140e4b18cafad8 100644 (file)
--- 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 a4b376f15b0b0e9830cc08b8212a71da4bb10684..c52574f895d4f19ddd3720fdde0d8246622f2ca5 100644 (file)
--- 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 ();