mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-20 23:00:56 -05:00
- Fix mktime in unbound-anchor not using UTC.
git-svn-id: file:///svn/unbound/trunk@3467 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
771e7295ac
commit
0d38ea6b3a
3 changed files with 4 additions and 2 deletions
|
|
@ -168,7 +168,7 @@ HOST_OBJ=unbound-host.lo
|
||||||
HOST_OBJ_LINK=$(HOST_OBJ) $(SLDNS_OBJ) $(COMPAT_OBJ_WITHOUT_CTIMEARC4) @WIN_HOST_OBJ_LINK@
|
HOST_OBJ_LINK=$(HOST_OBJ) $(SLDNS_OBJ) $(COMPAT_OBJ_WITHOUT_CTIMEARC4) @WIN_HOST_OBJ_LINK@
|
||||||
UBANCHOR_SRC=smallapp/unbound-anchor.c
|
UBANCHOR_SRC=smallapp/unbound-anchor.c
|
||||||
UBANCHOR_OBJ=unbound-anchor.lo
|
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@
|
$(COMPAT_OBJ_WITHOUT_CTIME) @WIN_UBANCHOR_OBJ_LINK@
|
||||||
TESTBOUND_SRC=testcode/testbound.c testcode/testpkts.c \
|
TESTBOUND_SRC=testcode/testbound.c testcode/testpkts.c \
|
||||||
daemon/worker.c daemon/acl_list.c daemon/daemon.c daemon/stats.c \
|
daemon/worker.c daemon/acl_list.c daemon/daemon.c daemon/stats.c \
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
- Document in the manual more text about configuring locally served
|
- Document in the manual more text about configuring locally served
|
||||||
zones.
|
zones.
|
||||||
- Fix 5011 anchor update timer after reload.
|
- Fix 5011 anchor update timer after reload.
|
||||||
|
- Fix mktime in unbound-anchor not using UTC.
|
||||||
|
|
||||||
30 July 2015: Wouter
|
30 July 2015: Wouter
|
||||||
- please afl-gcc (llvm) for uninitialised variable warning.
|
- please afl-gcc (llvm) for uninitialised variable warning.
|
||||||
|
|
|
||||||
|
|
@ -117,6 +117,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "libunbound/unbound.h"
|
#include "libunbound/unbound.h"
|
||||||
#include "sldns/rrdef.h"
|
#include "sldns/rrdef.h"
|
||||||
|
#include "sldns/parseutil.h"
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
#ifndef HAVE_EXPAT_H
|
#ifndef HAVE_EXPAT_H
|
||||||
#error "need libexpat to parse root-anchors.xml file."
|
#error "need libexpat to parse root-anchors.xml file."
|
||||||
|
|
@ -1328,7 +1329,7 @@ xml_convertdate(const char* str)
|
||||||
/* but ignore, (lenient) */
|
/* but ignore, (lenient) */
|
||||||
}
|
}
|
||||||
|
|
||||||
t = mktime(&tm);
|
t = sldns_mktime_from_utc(&tm);
|
||||||
if(t == (time_t)-1) {
|
if(t == (time_t)-1) {
|
||||||
if(verb) printf("xml_convertdate mktime failure\n");
|
if(verb) printf("xml_convertdate mktime failure\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue