- Fix mktime in unbound-anchor not using UTC.

git-svn-id: file:///svn/unbound/trunk@3467 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 40cf9a57d20836a699dce655b5409c5c8446693b..8b970e39272553c7e308791a6d0b4cb82b3e430c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,7 +168,7 @@ HOST_OBJ=unbound-host.lo
 HOST_OBJ_LINK=$(HOST_OBJ) $(SLDNS_OBJ) $(COMPAT_OBJ_WITHOUT_CTIMEARC4) @WIN_HOST_OBJ_LINK@
 UBANCHOR_SRC=smallapp/unbound-anchor.c
 UBANCHOR_OBJ=unbound-anchor.lo
-UBANCHOR_OBJ_LINK=$(UBANCHOR_OBJ) \
+UBANCHOR_OBJ_LINK=$(UBANCHOR_OBJ) parseutil.lo \
 $(COMPAT_OBJ_WITHOUT_CTIME) @WIN_UBANCHOR_OBJ_LINK@
 TESTBOUND_SRC=testcode/testbound.c testcode/testpkts.c \
 daemon/worker.c daemon/acl_list.c daemon/daemon.c daemon/stats.c \

diff --git a/doc/Changelog b/doc/Changelog
index 46f4098ebc423dd5aa7593ef5d58daf1ddec566c..38e22026819227352bde8395a86a9d79c5bb2bc2 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Document in the manual more text about configuring locally served
          zones.
        - Fix 5011 anchor update timer after reload.
+       - Fix mktime in unbound-anchor not using UTC.
 
 30 July 2015: Wouter
        - please afl-gcc (llvm) for uninitialised variable warning.

diff --git a/smallapp/unbound-anchor.c b/smallapp/unbound-anchor.c
index 576a30f646a9c07fcb3310c6663d3d7763d619cc..92bfa842877eaccc9ec8875c4ad5835ac421a176 100644 (file)
--- a/smallapp/unbound-anchor.c
+++ b/smallapp/unbound-anchor.c
@@ -117,6 +117,7 @@
 #include "config.h"
 #include "libunbound/unbound.h"
 #include "sldns/rrdef.h"
+#include "sldns/parseutil.h"
 #include <expat.h>
 #ifndef HAVE_EXPAT_H
 #error "need libexpat to parse root-anchors.xml file."
@@ -1328,7 +1329,7 @@ xml_convertdate(const char* str)
                /* but ignore, (lenient) */
        }
 
-       t = mktime(&tm);
+       t = sldns_mktime_from_utc(&tm);
        if(t == (time_t)-1) {
                if(verb) printf("xml_convertdate mktime failure\n");
                return 0;