[bgpd] bug #370, default-originate was broken by a silly thinko

2007-05-25 Paul Jakma <paul.jakma@sun.com>

	* bgp_route.c: (bgp_default_originate) Sanity check added
	  previously was broken and always failed, thus this function
	  never could run, bug #370.

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index ed6064945de1eb2eeffd22ce77a2ff4e64e5f795..b2191d4836bdfcf99e2126da8e7f7d08f21f054c 100644 (file)
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25 Paul Jakma <paul.jakma@sun.com>
+
+       * bgp_route.c: (bgp_default_originate) Sanity check added
+         previously was broken and always failed, thus this function
+         never could run, bug #370.
+
 2007-05-03 Paul Jakma <paul.jakma@sun.com>
 
        * bgp_route.h: (struct info) Move less frequently used

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index db0f3a74090319ac9b2e1418c245b90b4d4ae4bb..1c0e6f1a02b2c4ba28dae92f0f486f1a2d4553dd 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2370,7 +2370,7 @@ bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
   struct peer *from;
   int ret = RMAP_DENYMATCH;
   
-  if (afi != AFI_IP || afi != AFI_IP6)
+  if (!(afi == AFI_IP || afi == AFI_IP6))
     return;
   
   bgp = peer->bgp;