diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-05-10 10:50:24 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-05-10 10:50:24 +0200 |
| commit | 4efdc6d956f4ba40f27356e6fc54e40527de63fe (patch) | |
| tree | f5e864cfb00cc7481a47896cf888059c95153a17 | |
| parent | 8db2cf163e048b02cbafe118bf033b78618c2f30 (diff) | |
| download | glibc-4efdc6d956f4ba40f27356e6fc54e40527de63fe.tar.gz glibc-4efdc6d956f4ba40f27356e6fc54e40527de63fe.tar.xz glibc-4efdc6d956f4ba40f27356e6fc54e40527de63fe.zip | |
resolv: Call gmtime_r instead of gmtime in p_secstodate [BZ #20017]
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | resolv/res_debug.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 7131a286f0..516be8a96c 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 d1e12db579..bd95590ccc 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", |