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.23-303-g4efdc6d
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 May 2016 08:55:58 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-303-g4efdc6d
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 4efdc6d956f4ba40f27356e6fc54e40527de63fe (commit)
from 8db2cf163e048b02cbafe118bf033b78618c2f30 (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=4efdc6d956f4ba40f27356e6fc54e40527de63fe
commit 4efdc6d956f4ba40f27356e6fc54e40527de63fe
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue May 10 10:50:24 2016 +0200
resolv: Call gmtime_r instead of gmtime in p_secstodate [BZ #20017]
diff --git a/ChangeLog b/ChangeLog
index 7131a28..516be8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2016-05-10 Florian Weimer <fweimer@redhat.com>
+ [BZ #20017]
+ * resolv/res_debug.c (p_secstodate): Call __gmtime_r instead of
+ gmtime.
+
+2016-05-10 Florian Weimer <fweimer@redhat.com>
+
[BZ #19994]
* sysdeps/posix/getaddrinfo.c (gethosts): Restore RES_USE_INET6
flag in _res.options.
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index d1e12db..bd95590 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -1035,13 +1035,8 @@ p_secstodate (u_long secs) {
time_t clock = secs;
struct tm *time;
-#ifdef HAVE_TIME_R
struct tm timebuf;
-
- time = gmtime_r(&clock, &timebuf);
-#else
- time = gmtime(&clock);
-#endif
+ time = __gmtime_r(&clock, &timebuf);
time->tm_year += 1900;
time->tm_mon += 1;
sprintf(output, "%04d%02d%02d%02d%02d%02d",
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
resolv/res_debug.c | 7 +------
2 files changed, 7 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources