This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.25-288-g0ad970b
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 May 2017 11:20:36 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-288-g0ad970b
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 0ad970bb13920b6471ccc4503cf1f0d8b2352f05 (commit)
from 2bfdaeddaad93425b93c42ef7a75443b96824942 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0ad970bb13920b6471ccc4503cf1f0d8b2352f05
commit 0ad970bb13920b6471ccc4503cf1f0d8b2352f05
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue May 9 12:28:01 2017 +0200
resolv: Use RES_DFLRETRY consistently [BZ #21474]
diff --git a/ChangeLog b/ChangeLog
index d8e12d6..f3a0bdd 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 a4b376f..c52574f 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 ();
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
resolv/res_libc.c | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources