← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/net-snmp/intrepid-security

« back to all changes in this revision

Viewing changes to debian/patches/54_fix_registration_error.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-09-12 13:21:40 UTC
  • Revision ID: james.westby@ubuntu.com-20080912132140-khakjcdpcuiaf7gx
Tags: 5.4.1~dfsg-7.1ubuntu5
https://launchpad.net/bugs/43575
https://launchpad.net/bugs/200614
* debian/snmpd.init: LSBify the snmpd.init script. And add status
  notification, based on inital patch by Gary Coady. (LP: #43575) 
* debian/patches/54_fix_registration_error.patch: Surpresses annoying
  registrations in startup. (LP: #200614) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/54_fix_registration_error.patch
 
1
diff -Naur net-snmp-5.4.1.orig/agent/agent_registry.c net-snmp-5.4.1/agent/agent_registry.c
 
2
--- net-snmp-5.4.1.orig/agent/agent_registry.c  2007-07-16 19:59:44.000000000 -0400
 
3
+++ net-snmp-5.4.1/agent/agent_registry.c       2008-09-15 14:14:15.000000000 -0400
 
4
@@ -532,7 +532,8 @@
 
5
        
 
6
            if (next && (next->namelen  == new_sub->namelen) &&
 
7
                (next->priority == new_sub->priority)) {
 
8
-                netsnmp_assert(!"registration != duplicate"); /* always false */
 
9
+               if (new_sub->namelen != 1) /* ignore root OID dups */
 
10
+                       netsnmp_assert(!"registration != duplicate"); /* always false */
 
11
                return MIB_DUPLICATE_REGISTRATION;
 
12
            }
 
13