components/net-snmp/patches/045.16003771.agent_registry.patch
author Huie-Ying Lee <huieying.lee@oracle.com>
Wed, 20 May 2015 15:14:17 -0700
branchs11-update
changeset 4329 771a6f41f496
parent 3418 e8909b770a1a
permissions -rw-r--r--
21078900 openssh server should fatal out when pam_setcred and pam_open_session fail
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3418
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     1
This patch taken from the net-snmp community fixes, an issue related to registration
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     2
error recorded in the /var/log/snmpd.log file when snmp is enabled.
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     3
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     4
The details can be found in the following location
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     5
http://sourceforge.net/p/net-snmp/patches/973/
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     6
--- a/agent/agent_registry.c	2012-12-18 02:02:56.032682052 -0800
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     7
+++ b/agent/agent_registry.c	2012-12-18 02:34:11.953844076 -0800
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     8
@@ -532,7 +532,23 @@
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
     9
	
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    10
	    if (next && (next->namelen  == new_sub->namelen) &&
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    11
		(next->priority == new_sub->priority)) {
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    12
-                netsnmp_assert(!"registration != duplicate"); /* always false */
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    13
+                if (new_sub->namelen != 1) {    /* ignore root OID dups */
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    14
+                    size_t          out_len = 0;
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    15
+                    size_t          buf_len = 0;
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    16
+                    char           *buf = NULL;
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    17
+                    int             buf_overflow = 0;
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    18
+
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    19
+                    netsnmp_sprint_realloc_objid((u_char **) &buf, &buf_len, &out_len,
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    20
+                                                 1, &buf_overflow,
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    21
+                                                 new_sub->start_a,
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    22
+                                                 new_sub->start_len);
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    23
+                    snmp_log(LOG_ERR,
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    24
+                             "duplicate registration: MIB modules %s and %s (oid %s%s).\n",
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    25
+                             next->label_a, new_sub->label_a,
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    26
+                             buf ? buf : "",
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    27
+                             buf_overflow ? " [TRUNCATED]" : "");
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    28
+                    free(buf);
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    29
+                }
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    30
		return MIB_DUPLICATE_REGISTRATION;
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    31
	    }
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    32
 
e8909b770a1a 16003771 net-snmp service records a registration error when service is enabled
Charly Abraham <Charly.Abraham@Sun.COM>
parents:
diff changeset
    33