[Pkg-net-snmp-commits] r138 - branches/net-snmp52/debian/patches

[Jochen Friedrich]

Author: jochen
Date: 2007-03-14 16:26:18 +0000 (Wed, 14 Mar 2007)
New Revision: 138

Modified:
   branches/net-snmp52/debian/patches/28_revert_iftable.README
   branches/net-snmp52/debian/patches/28_revert_iftable.patch
Log:
Update patch to upstream version.


Modified: branches/net-snmp52/debian/patches/28_revert_iftable.README
===================================================================
--- branches/net-snmp52/debian/patches/28_revert_iftable.README	2007-02-03 00:59:49 UTC (rev 137)
+++ branches/net-snmp52/debian/patches/28_revert_iftable.README	2007-03-14 16:26:18 UTC (rev 138)
@@ -1 +1,2 @@
 Revert revision 1.13.2.2 as this causes a crash if ifentry == NULL.
+Ersetzt durch Upstream-Patch svn -r15935:15936

Modified: branches/net-snmp52/debian/patches/28_revert_iftable.patch
===================================================================
--- branches/net-snmp52/debian/patches/28_revert_iftable.patch	2007-02-03 00:59:49 UTC (rev 137)
+++ branches/net-snmp52/debian/patches/28_revert_iftable.patch	2007-03-14 16:26:18 UTC (rev 138)
@@ -1,21 +1,14 @@
---- net-snmp-5.2.3/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	2006/01/09 17:28:46	1.13.2.2
-+++ net-snmp-5.2.3/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	2005/12/06 17:44:11	1.13.2.1
-@@ -2,7 +2,7 @@
-  * Note: this file originally auto-generated by mib2c using
-  *       version : 1.12 $ of : mfd-data-access.m2c,v $ 
-  *
-- * $Id: ifTable_data_access.c,v 1.13.2.2 2006/01/09 17:28:46 rstory Exp $
-+ * $Id: ifTable_data_access.c,v 1.13.2.1 2005/12/06 17:44:11 rstory Exp $
-  */
- /*
-  * standard Net-SNMP includes 
-@@ -164,8 +164,7 @@
+svn diff -r15935:15936
+Index: agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
+===================================================================
+--- agent/mibgroup/if-mib/ifTable/ifTable_data_access.c (Revision 15935)
++++ agent/mibgroup/if-mib/ifTable/ifTable_data_access.c (Revision 15936)
+@@ -164,7 +164,7 @@
              DEBUGMSGTL(("ifTable:access", "updating missing entry\n"));
              rowreq_ctx->known_missing = 1;
              rowreq_ctx->data.ifAdminStatus = IFADMINSTATUS_DOWN;
 -            if ((!(ifentry->ns_flags & NETSNMP_INTERFACE_FLAGS_HAS_LASTCHANGE))
--                && (rowreq_ctx->data.ifOperStatus != IFOPERSTATUS_DOWN))
-+            if (rowreq_ctx->data.ifOperStatus != IFOPERSTATUS_DOWN)
++            if ((!(rowreq_ctx->data.ifentry->ns_flags & NETSNMP_INTERFACE_FLAGS_HAS_LASTCHANGE))
+                 && (rowreq_ctx->data.ifOperStatus != IFOPERSTATUS_DOWN))
                  oper_changed = 1;
              rowreq_ctx->data.ifOperStatus = IFOPERSTATUS_DOWN;
-         }