package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch

   1 From 79e60e145f8a595bca5a784c00b437216d51de68 Mon Sep 17 00:00:00 2001
   2 From: Steven Barth <steven@midlink.org>
   3 Date: Mon, 13 Apr 2015 09:45:20 +0200
   4 Subject: [PATCH] dnssec: improve timestamp heuristic
   5
   6 Signed-off-by: Steven Barth <steven@midlink.org>
   7 ---
   8  src/dnssec.c | 15 +++++++++++----
   9  1 file changed, 11 insertions(+), 4 deletions(-)
  10
  11 --- a/src/dnssec.c
  12 +++ b/src/dnssec.c
  13 @@ -432,17 +432,24 @@ static int back_to_the_future;
  14  int setup_timestamp(void)
  15  {
  16    struct stat statbuf;
  17 -
  18 +  time_t now;
  19 +  time_t base = 1420070400; /* 1-1-2015 */
  20 +
  21    back_to_the_future = 0;
  22
  23    if (!daemon->timestamp_file)
  24      return 0;
  25 -
  26 +
  27 +  now = time(NULL);
  28 +
  29 +  if (!stat("/proc/self/exe", &statbuf) && difftime(statbuf.st_mtime, base) > 0)
  30 +    base = statbuf.st_mtime;
  31 +
  32    if (stat(daemon->timestamp_file, &statbuf) != -1)
  33      {
  34        timestamp_time = statbuf.st_mtime;
  35      check_and_exit:
  36 -      if (difftime(timestamp_time, time(0)) <=  0)
  37 +      if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <=  0)
  38         {
  39           /* time already OK, update timestamp, and do key checking from the start. */
  40           if (utime(daemon->timestamp_file, NULL) == -1)
  41 @@ -463,7 +470,7 @@ int setup_timestamp(void)
  42
  43           close(fd);
  44
  45 -         timestamp_time = timbuf.actime = timbuf.modtime = 1420070400; /* 1-1-2015 */
  46 +         timestamp_time = timbuf.actime = timbuf.modtime = base;
  47           if (utime(daemon->timestamp_file, &timbuf) == 0)
  48             goto check_and_exit;
  49         }