net/vpnc/patches/patch-ag

   1 $NetBSD$
   2
   3 --- tunip.c.orig        2008-11-19 20:55:51.000000000 +0000
   4 +++ tunip.c     2009-11-25 23:23:47.000000000 +0000
   5 @@ -178,5 +178,5 @@
   6         }
   7         if (r < (p->ip_hl << 2) + s->ipsec.em->fixed_header_size) {
   8 -               syslog(LOG_ALERT, "packet too short. got %d, expected %d", r, (p->ip_hl << 2) + s->ipsec.em->fixed_header_size);
   9 +               syslog(LOG_ALERT, "packet too short. got %ld, expected %ld", (long) r, (long) ((p->ip_hl << 2) + s->ipsec.em->fixed_header_size));
  10                 return -1;
  11         }
  12 @@ -217,6 +217,6 @@
  13         }
  14         if (r < s->ipsec.em->fixed_header_size) {
  15 -               syslog(LOG_ALERT, "packet too short from %s. got %d, expected %d",
  16 -                       inet_ntoa(s->dst), r, s->ipsec.em->fixed_header_size);
  17 +               syslog(LOG_ALERT, "packet too short from %s. got %ld, expected %ld",
  18 +                       inet_ntoa(s->dst), (long) r, (long) (s->ipsec.em->fixed_header_size));
  19                 return -1;
  20         }
  21 @@ -882,5 +882,5 @@
  22                         }
  23                         DEBUG(2,printf("lifetime status: %ld of %u seconds used, %u|%u of %u kbytes used\n",
  24 -                               time(NULL) - s->ipsec.life.start,
  25 +                               (long)(time(NULL) - s->ipsec.life.start),
  26                                 s->ipsec.life.seconds,
  27                                 s->ipsec.life.rx/1024,