--- embedaddon/quagga/ripd/rip_snmp.c	2012/02/21 17:26:12	1.1.1.1
+++ embedaddon/quagga/ripd/rip_snmp.c	2013/07/21 23:54:40	1.1.1.2
@@ -22,14 +22,8 @@
 #include <zebra.h>
 
 #ifdef HAVE_SNMP
-#ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
 #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"
@@ -351,6 +345,10 @@ rip2IfStatEntry (struct variable *v, oid name[], size_
   static struct in_addr addr;
   static long valid = SNMP_VALID;
 
+  if (smux_header_table(v, name, length, exact, var_len, write_method)
+      == MATCH_FAILED)
+    return NULL;
+
   memset (&addr, 0, sizeof (struct in_addr));
   
   /* Lookup interface. */
@@ -454,6 +452,10 @@ rip2IfConfAddress (struct variable *v, oid name[], siz
   struct interface *ifp;
   struct rip_interface *ri;
 
+  if (smux_header_table(v, name, length, exact, val_len, write_method)
+      == MATCH_FAILED)
+    return NULL;
+
   memset (&addr, 0, sizeof (struct in_addr));
   
   /* Lookup interface. */
@@ -523,6 +525,10 @@ rip2PeerTable (struct variable *v, oid name[], size_t 
   /* static time_t uptime; */
 
   struct rip_peer *peer;
+
+  if (smux_header_table(v, name, length, exact, val_len, write_method)
+      == MATCH_FAILED)
+    return NULL;
 
   memset (&addr, 0, sizeof (struct in_addr));