diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2014-02-04 03:07:26 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2014-02-04 03:07:26 +0000 |
| commit | b401cc61846bc496d3408e91ef96286b7b0c0e80 (patch) | |
| tree | c5426a03af3dd06f4329e52170ac18d6dd342c14 /usr.sbin/nsd/xfrd-disk.c | |
| parent | 7d7ea2a8d639ff6e8c4599db29d1dd7539ee4823 (diff) | |
merge conflicts
Diffstat (limited to 'usr.sbin/nsd/xfrd-disk.c')
| -rw-r--r-- | usr.sbin/nsd/xfrd-disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/nsd/xfrd-disk.c b/usr.sbin/nsd/xfrd-disk.c index 3b5e0120dd6..94ac93e3133 100644 --- a/usr.sbin/nsd/xfrd-disk.c +++ b/usr.sbin/nsd/xfrd-disk.c @@ -445,7 +445,7 @@ xfrd_write_state(struct xfrd_state* xfrd) fprintf(out, "\tnext_timeout: %d", (zone->zone_handler_flags&EV_TIMEOUT)?(int)zone->timeout.tv_sec:0); if((zone->zone_handler_flags&EV_TIMEOUT)) { - neato_timeout(out, "\t# =", zone->timeout.tv_sec - xfrd_time()); + neato_timeout(out, "\t# =", zone->timeout.tv_sec); } fprintf(out, "\n"); xfrd_write_state_soa(out, "soa_nsd", &zone->soa_nsd, |