From 35f891404a6d2f0d034ca0fb724904db72baf552 Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Tue, 1 Jul 2008 16:54:07 +0200
Subject: Fix SEGV in ip ospf neighbor all

Dont use vty->index in show_ip_ospf_neighbor_all_cmd(),
It is invalid, use ospf_lookup() instead.
---
 ospfd/ospf_vty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ospfd')

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 5307b413..11f12c5c 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3093,7 +3093,7 @@ DEFUN (show_ip_ospf_neighbor_all,
        "Neighbor list\n"
        "include down status neighbor\n")
 {
-  struct ospf *ospf = vty->index;
+  struct ospf *ospf = ospf_lookup ();
   struct listnode *node;
   struct ospf_interface *oi;
 
-- 
cgit v1.2.1


From fb62a3cef5960885119f9e87c833520ddf2a9b49 Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Tue, 13 May 2008 20:03:32 +0200
Subject: Make --enable-snmp cross compile and make libcrypto optional with
 --without-crypto

Autoconfig work by me, the rest was done by
"Kirill K. Smirnov" <lich@math.spbu.ru>
---
 ospfd/ospf_snmp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ospfd')

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 6e972605..e6ce1f01 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -27,10 +27,12 @@
 #ifdef HAVE_SNMP
 #ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
-#endif
+#include <net-snmp/net-snmp-includes.h>
+#else
 #include <asn1.h>
 #include <snmp.h>
 #include <snmp_impl.h>
+#endif
 
 #include "if.h"
 #include "log.h"
-- 
cgit v1.2.1