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

[jochen at alioth.debian.org]

Author: jochen
Date: 2008-08-22 16:05:26 +0000 (Fri, 22 Aug 2008)
New Revision: 253

Added:
   branches/net-snmp54/debian/patches/52_suppress_registration_warnings.README
   branches/net-snmp54/debian/patches/52_suppress_registration_warnings.patch
Log:
Add Official Patch 1805971 to suppress annoying warnings in syslog


Added: branches/net-snmp54/debian/patches/52_suppress_registration_warnings.README
===================================================================
--- branches/net-snmp54/debian/patches/52_suppress_registration_warnings.README	                        (rev 0)
+++ branches/net-snmp54/debian/patches/52_suppress_registration_warnings.README	2008-08-22 16:05:26 UTC (rev 253)
@@ -0,0 +1,3 @@
+Upstream Changeset 16669: Official Patch 1805971
+agent: suppress annoying "registration != duplicate" warning for root oids
+(otherwise, you'll get this message on almost every startup)

Added: branches/net-snmp54/debian/patches/52_suppress_registration_warnings.patch
===================================================================
--- branches/net-snmp54/debian/patches/52_suppress_registration_warnings.patch	                        (rev 0)
+++ branches/net-snmp54/debian/patches/52_suppress_registration_warnings.patch	2008-08-22 16:05:26 UTC (rev 253)
@@ -0,0 +1,14 @@
+Index: agent/agent_registry.c
+===================================================================
+--- net-snmp-5.4.1.orig/agent/agent_registry.c	(Revision 16668)
++++ net-snmp-5.4.1/agent/agent_registry.c	(Revision 16669)
+@@ -532,7 +532,8 @@
+ 	
+ 	    if (next && (next->namelen  == new_sub->namelen) &&
+ 		(next->priority == new_sub->priority)) {
+-                netsnmp_assert(!"registration != duplicate"); /* always false */
++                if (new_sub->namelen != 1) /* ignore root OID dups */
++                    netsnmp_assert(!"registration != duplicate"); /* always false */
+ 		return MIB_DUPLICATE_REGISTRATION;
+ 	    }
+