[Pkg-net-snmp-commits] r258 - branches/net-snmp54/debian/patches

[jochen at alioth.debian.org]

Author: jochen
Date: 2008-10-06 20:59:14 +0000 (Mon, 06 Oct 2008)
New Revision: 258

Added:
   branches/net-snmp54/debian/patches/54_fix_xen.README
   branches/net-snmp54/debian/patches/54_fix_xen.patch
Log:
Add Upstream Changeset 16790: PATCH 1849903:
snmpd: from jsafranek: do not spam log with asserts when XEN is used


Added: branches/net-snmp54/debian/patches/54_fix_xen.README
===================================================================
--- branches/net-snmp54/debian/patches/54_fix_xen.README	                        (rev 0)
+++ branches/net-snmp54/debian/patches/54_fix_xen.README	2008-10-06 20:59:14 UTC (rev 258)
@@ -0,0 +1,2 @@
+Upstream Changeset 16790: PATCH 1849903:
+snmpd: from jsafranek: do not spam log with asserts when XEN is used

Added: branches/net-snmp54/debian/patches/54_fix_xen.patch
===================================================================
--- branches/net-snmp54/debian/patches/54_fix_xen.patch	                        (rev 0)
+++ branches/net-snmp54/debian/patches/54_fix_xen.patch	2008-10-06 20:59:14 UTC (rev 258)
@@ -0,0 +1,22 @@
+Index: agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
+===================================================================
+--- net-snmp-5.4.1.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	(Revision 16789)
++++ net-snmp-5.4.1/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	(Revision 16790)
+@@ -208,7 +208,16 @@
+         {
+             int rc = strcmp(rowreq_ctx->data.ifName,
+                             ifentry->name);
+-            netsnmp_assert(rc == 0);
++            if (rc != 0) {
++                static int logged = 0;
++                if (!logged) {
++                    snmp_log(LOG_ERR, "Name of an interface changed. Such " \
++                        "interfaces will keep its old name in IF-MIB.\n");
++                    logged = 1;
++                }
++                DEBUGMSGTL(("ifTable:access", "interface %s changed name to %s, ignoring\n",
++                    rowreq_ctx->data.ifName, ifentry->name));
++            }
+         }
+ #endif
+         /*