From: Ondrej Filip <feela@network.cz>
Date: Sat, 12 Feb 2005 22:19:46 +0000 (+0000)
Subject: Bugfix in password acceptance
X-Git-Tag: v1.2.0~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bae7c43ff35482807654519253b1daa0a6518951;p=thirdparty%2Fbird.git

Bugfix in password acceptance
---

diff --git a/proto/ospf/packet.c b/proto/ospf/packet.c
index 5b0ad8073..f6b68fd43 100644
--- a/proto/ospf/packet.c
+++ b/proto/ospf/packet.c
@@ -164,7 +164,7 @@ ospf_pkt_checkauth(struct ospf_neighbor *n, struct ospf_iface *ifa, struct ospf_
       WALK_LIST(ptmp, *(ifa->passwords))
       {
         if (pkt->u.md5.keyid != ptmp->id) continue;
-        if ((ptmp->genfrom > now) || (ptmp->gento < now)) continue;
+        if ((ptmp->accfrom > now) || (ptmp->accto < now)) continue;
         pass = ptmp;
         break;
       }
@@ -278,7 +278,7 @@ ospf_rx_hook(sock * sk, int size)
 
   if (ntohl(ps->areaid) != ifa->oa->areaid)
   {
-    log(L_ERR "%s%I - other area %ld", mesg, sk->faddr, ps->areaid);
+    log(L_ERR "%s%I - different area %ld", mesg, sk->faddr, ntohl(ps->areaid));
     return 1;
   }