resolv: Call gmtime_r instead of gmtime in p_secstodate [BZ #20017]

diff --git a/ChangeLog b/ChangeLog
index 7131a286f0309c1a7d20b2fb183a4203b1897237..516be8a96cef96e054c7bc09a13947cb8c5700a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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]

diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index d1e12db579f59aebb86766aa1ee4a8e1584da9cc..bd95590ccc4f285b9e8fc1b1ab3d1cb9e056a449 100644 (file)
--- 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",