← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/net-snmp/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/54_fix_xen.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-11-05 02:59:05 UTC
  • Revision ID: james.westby@ubuntu.com-20081105025905-uoyhlnxsef4cz5bd
Tags: 5.4.1~dfsg-11ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/43575
* Merge from debian unstable, remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config. Use bash (LP: #104738)
* Removed multiuser option when calling update-rc.d (LP: #254261).
* debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcd.1
  (LP: #250459)
* debian/snmp.init: LSBify the snmpd.init script. Add status notification,
  based on inital patch by Gary Coady. (LP: #43575)
* Dropped debian/patches/51_CVE-2008-0960.patch: Use debian's instead.
* Dropped debian/patches/54_fix_registration_error.patch: Use debian's instead. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/54_fix_xen.patch
 
1
Index: agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
 
2
===================================================================
 
3
--- net-snmp-5.4.1.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c     (Revision 16789)
 
4
+++ net-snmp-5.4.1/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c  (Revision 16790)
 
5
@@ -208,7 +208,16 @@
 
6
         {
 
7
             int rc = strcmp(rowreq_ctx->data.ifName,
 
8
                             ifentry->name);
 
9
-            netsnmp_assert(rc == 0);
 
10
+            if (rc != 0) {
 
11
+                static int logged = 0;
 
12
+                if (!logged) {
 
13
+                    snmp_log(LOG_ERR, "Name of an interface changed. Such " \
 
14
+                        "interfaces will keep its old name in IF-MIB.\n");
 
15
+                    logged = 1;
 
16
+                }
 
17
+                DEBUGMSGTL(("ifTable:access", "interface %s changed name to %s, ignoring\n",
 
18
+                    rowreq_ctx->data.ifName, ifentry->name));
 
19
+            }
 
20
         }
 
21
 #endif
 
22
         /*