[PATCH] netfilter: xt_time: never matches a correct monthday in a leap year after 28th 2

[PATCH] netfilter: xt_time: never matches a correct monthday in a leap year after 28th 2

[luo kaih]

the function localtime_3 in xt_time.c  gives a wrong monthday in a
leap year after 28th 2 . calculating monthday should use the array
days_since_leapyear[] not days_since_year[]  in a leap year .

From: Kaihui Luo <kaih.luo@gmail.com>

Signed-off-by: Kaihui Luo <kaih.luo@gmail.com>

---
--- linux-2.6.26/net/netfilter/xt_time.c.orig   2008-08-25
11:59:46.000000000 +0800
+++ linux-2.6.26/net/netfilter/xt_time.c        2008-08-25
12:16:12.000000000 +0800
@@ -136,17 +136,19 @@ static void localtime_3(struct xtm *r, t
       * from w repeatedly while counting.)
       */
      if (is_leap(year)) {
+               /* use days_since_leapyear[] in a leap year */
              for (i = ARRAY_SIZE(days_since_leapyear) - 1;
-                   i > 0 && days_since_year[i] > w; --i)
+                   i > 0 && days_since_leapyear[i] > w; --i)
                      /* just loop */;
+               r->monthday = w - days_since_leapyear[i] + 1;
      } else {
              for (i = ARRAY_SIZE(days_since_year) - 1;
                  i > 0 && days_since_year[i] > w; --i)
                      /* just loop */;
+               r->monthday = w - days_since_year[i] + 1;
      }
      r->month    = i + 1;
-       r->monthday = w - days_since_year[i] + 1;
      return;
 }

Re: [PATCH] netfilter: xt_time: never matches a correct monthday in a leap year after 28th 2

[Patrick McHardy]

luo kaih wrote:
> the function localtime_3 in xt_time.c  gives a wrong monthday in a
> leap year after 28th 2 . calculating monthday should use the array
> days_since_leapyear[] not days_since_year[]  in a leap year .

Your mailer corrupted whitespace in this patch. Please resend as
attachment. Thanks.

Re: [PATCH] netfilter: xt_time: never matches a correct monthday in a leap year after 28th 2

[Patrick McHardy]

Patrick McHardy wrote:
> luo kaih wrote:
>> the function localtime_3 in xt_time.c  gives a wrong monthday in a
>> leap year after 28th 2 . calculating monthday should use the array
>> days_since_leapyear[] not days_since_year[]  in a leap year .
> 
> Your mailer corrupted whitespace in this patch. Please resend as
> attachment. Thanks.

Sorry, please ignore. I thought you sent two different patches,
but its the same one I just queued up.