[Pkg-net-snmp-commits] r144 - branches/net-snmp53/debian/patches
Jochen Friedrich
jochen at alioth.debian.org
Tue Apr 10 15:56:20 UTC 2007
Author: jochen
Date: 2007-04-10 15:56:19 +0000 (Tue, 10 Apr 2007)
New Revision: 144
Added:
branches/net-snmp53/debian/patches/33_trapdauth_noagentx.README
branches/net-snmp53/debian/patches/33_trapdauth_noagentx.patch
branches/net-snmp53/debian/patches/34_gettable.README
branches/net-snmp53/debian/patches/34_gettable.patch
branches/net-snmp53/debian/patches/35_ipmib_size_64bit.README
branches/net-snmp53/debian/patches/35_ipmib_size_64bit.patch
branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.README
branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.patch
Log:
Add official patches
Added: branches/net-snmp53/debian/patches/33_trapdauth_noagentx.README
===================================================================
--- branches/net-snmp53/debian/patches/33_trapdauth_noagentx.README 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/33_trapdauth_noagentx.README 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1 @@
+Official Patch #1527661
Added: branches/net-snmp53/debian/patches/33_trapdauth_noagentx.patch
===================================================================
--- branches/net-snmp53/debian/patches/33_trapdauth_noagentx.patch 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/33_trapdauth_noagentx.patch 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1,42 @@
+Index: apps/snmptrapd.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/apps/snmptrapd.c,v
+retrieving revision 5.67.2.2
+retrieving revision 5.67.2.3
+diff -u -r5.67.2.2 -r5.67.2.3
+--- apps/snmptrapd.c 20 Apr 2006 22:27:55 -0000 5.67.2.2
++++ apps/snmptrapd.c 31 Jul 2006 20:23:34 -0000 5.67.2.3
+@@ -1011,9 +1011,6 @@
+ #ifdef USING_SNMPV3_SNMPENGINE_MODULE
+ extern void register_snmpEngine_scalars_context(const char *);
+ #endif
+-#ifdef USING_SNMPV3_USMUSER_MODULE
+- extern void init_register_usmUser_context(const char *);
+-#endif
+ subagent_init();
+ #ifdef USING_NOTIFICATION_LOG_MIB_NOTIFICATION_LOG_MODULE
+ /* register the notification log table */
+@@ -1035,14 +1032,17 @@
+ */
+ register_snmpEngine_scalars_context("snmptrapd");
+ #endif
++ }
++#endif /* USING_AGENTX_SUBAGENT_MODULE && !SNMPTRAPD_DISABLE_AGENTX */
+
+- /* register our authorization handler */
+- init_netsnmp_trapd_auth();
++ /* register our authorization handler */
++ init_netsnmp_trapd_auth();
+
+-#ifdef USING_SNMPV3_USMUSER_MODULE
++#if defined(USING_AGENTX_SUBAGENT_MODULE) && !defined(SNMPTRAPD_DISABLE_AGENTX) && defined(USING_SNMPV3_USMUSER_MODULE)
++ if (agentx_subagent) {
++ extern void init_register_usmUser_context(const char *);
+ /* register ourselves as having a USM user database */
+ init_register_usmUser_context("snmptrapd");
+-#endif
+ }
+ #endif
+
+
+
Added: branches/net-snmp53/debian/patches/34_gettable.README
===================================================================
--- branches/net-snmp53/debian/patches/34_gettable.README 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/34_gettable.README 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1 @@
+Official Patch #1532044
Added: branches/net-snmp53/debian/patches/34_gettable.patch
===================================================================
--- branches/net-snmp53/debian/patches/34_gettable.patch 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/34_gettable.patch 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1,54 @@
+Index: SNMP.pm
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/perl/SNMP/SNMP.pm,v
+retrieving revision 5.70.2.7
+diff -u -p -r5.70.2.7 SNMP.pm
+--- perl/SNMP/SNMP.pm 30 Jun 2006 22:26:19 -0000 5.70.2.7
++++ perl/SNMP/SNMP.pm 31 Jul 2006 21:46:53 -0000
+@@ -649,7 +649,8 @@ sub gettable {
+ # i.e. we have reached the end of this table.
+ #
+
+- my ($this, $root_oid, $options) = @_;
++ my ($this, $root_oid, %options) = @_;
++ my $options = \%options;
+ my ($textnode, $stopconds, $varbinds, $vbl, $res, %result_hash, $repeat);
+
+ # translate the OID into numeric form if its not
+@@ -722,7 +723,7 @@ sub gettable {
+ $vbl = $varbinds;
+
+ my $repeatcount;
+- if ($this->{Version} == 1 || $opts->{nogetbulk}) {
++ if ($this->{Version} == 1 || $options->{nogetbulk}) {
+ $repeatcount = 1;
+ } elsif ($options->{'repeat'}) {
+ $repeatcount = $options->{'repeat'};
+@@ -744,7 +745,7 @@ sub gettable {
+ }
+
+ while ($#$vbl > -1 && !$this->{ErrorNum}) {
+- if ($#$vbl + 1 != ($#$stopconds + 1) * $repeatcount) {
++ if (($#$vbl + 1) % ($#$stopconds + 1) != 0) {
+ print STDERR "ack: gettable results not appropriate\n";
+ my @k = keys(%result_hash);
+ last if ($#k > -1); # bail with what we have
+@@ -763,12 +764,12 @@ sub gettable {
+ my $row_value = $vbl->[$i][2];
+ my $row_type = $vbl->[$i][3];
+
+- if ($row_oid =~ /^$stopconds->[$i % ($#$stopconds+1)]/) {
+-
++ if ($row_oid =~ /^$stopconds->[$i % ($#$stopconds+1)]/ &&
++ $row_value ne 'ENDOFMIBVIEW') {
+ if ($row_type eq "OBJECTID") {
+
+- # If the value returned is an OID, translate this
+- # back in to a textual OID
++ # If the value returned is an OID, translate this
++ # back in to a textual OID
+
+ $row_value = SNMP::translateObj($row_value);
+
+
+
Added: branches/net-snmp53/debian/patches/35_ipmib_size_64bit.README
===================================================================
--- branches/net-snmp53/debian/patches/35_ipmib_size_64bit.README 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/35_ipmib_size_64bit.README 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1 @@
+Official Patch #1550635
Added: branches/net-snmp53/debian/patches/35_ipmib_size_64bit.patch
===================================================================
--- branches/net-snmp53/debian/patches/35_ipmib_size_64bit.patch 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/35_ipmib_size_64bit.patch 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1,191 @@
+Index: agent/mibgroup/mibII/ipAddr.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/mibII/ipAddr.c,v
+retrieving revision 5.18
+diff -u -p -r5.18 ipAddr.c
+--- agent/mibgroup/mibII/ipAddr.c 3 May 2006 20:59:35 -0000 5.18
++++ agent/mibgroup/mibII/ipAddr.c 31 Aug 2006 19:43:27 -0000
+@@ -293,6 +293,7 @@ var_ipAddrEntry(struct variable *vp,
+ *var_len = sizeof(long_return);
+ switch (vp->magic) {
+ case IPADADDR:
++ *var_len = sizeof(uint32_t);
+ #ifdef hpux11
+ long_return = lowin_ifaddr.Addr;
+ return (u_char *) & long_return;
+@@ -308,6 +309,7 @@ var_ipAddrEntry(struct variable *vp,
+ long_return = lowinterface;
+ return (u_char *) & long_return;
+ case IPADNETMASK:
++ *var_len = sizeof(uint32_t);
+ #ifdef hpux11
+ long_return = lowin_ifaddr.NetMask;
+ return (u_char *) & long_return;
+@@ -912,6 +914,7 @@ var_ipAddrEntry(struct variable *vp,
+ *var_len = sizeof(long_return);
+ switch (vp->magic) {
+ case IPADADDR:
++ *var_len = sizeof(uint32_t);
+ long_return = ifs[i].addr.s_addr;
+ return (u_char *) & long_return;
+
+@@ -920,6 +923,7 @@ var_ipAddrEntry(struct variable *vp,
+ return (u_char *) & long_return;
+
+ case IPADNETMASK:
++ *var_len = sizeof(uint32_t);
+ long_return = ifs[i].mask.s_addr;
+ return (u_char *) & long_return;
+
+@@ -1021,6 +1025,7 @@ var_ipAddrEntry(struct variable *vp,
+ *var_len = sizeof(long_return);
+ switch (vp->magic) {
+ case IPADADDR:
++ *var_len = sizeof(uint32_t);
+ long_return = pIpAddrTable->table[i].dwAddr;
+ return (u_char *) & long_return;
+
+@@ -1030,6 +1035,7 @@ var_ipAddrEntry(struct variable *vp,
+ return (u_char *) & long_return;
+
+ case IPADNETMASK:
++ *var_len = sizeof(uint32_t);
+ long_return = pIpAddrTable->table[i].dwMask;
+ free(pIpAddrTable);
+ return (u_char *) & long_return;
+Index: agent/mibgroup/mibII/at.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/mibII/at.c,v
+retrieving revision 5.10
+diff -u -p -r5.10 at.c
+--- agent/mibgroup/mibII/at.c 11 Jan 2006 23:26:47 -0000 5.10
++++ agent/mibgroup/mibII/at.c 1 Sep 2006 14:49:26 -0000
+@@ -314,7 +314,7 @@ var_atEntry(struct variable *vp,
+ *var_len = sizeof(LowPhysAddr);
+ return (u_char *) LowPhysAddr;
+ case IPMEDIANETADDRESS: /* also ATNETADDRESS */
+- *var_len = sizeof long_return;
++ *var_len = sizeof(uint32_t);
+ long_return = LowAddr;
+ return (u_char *) & long_return;
+ case IPMEDIATYPE:
+@@ -454,7 +454,7 @@ var_atEntry(struct variable * vp,
+ *var_len = Lowentry.ipNetToMediaPhysAddress.o_length;
+ return Lowentry.ipNetToMediaPhysAddress.o_bytes;
+ case IPMEDIANETADDRESS:
+- *var_len = sizeof(Lowentry.ipNetToMediaNetAddress);
++ *var_len = sizeof(uint32_t);
+ return (u_char *) &Lowentry.ipNetToMediaNetAddress;
+ case IPMEDIATYPE:
+ *var_len = sizeof long_return;
+@@ -957,7 +957,7 @@ var_atEntry(struct variable *vp,
+ free(pIpNetTable);
+ return (u_char *) return_buf;
+ case IPMEDIANETADDRESS: /* also ATNETADDRESS */
+- *var_len = sizeof long_return;
++ *var_len = sizeof(uint32_t);
+ long_return = pIpNetTable->table[i].dwAddr;
+ free(pIpNetTable);
+ return (u_char *) & long_return;
+Index: agent/mibgroup/mibII/var_route.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/mibII/var_route.c,v
+retrieving revision 5.19
+diff -u -p -r5.19 var_route.c
+--- agent/mibgroup/mibII/var_route.c 25 Jul 2006 15:26:42 -0000 5.19
++++ agent/mibgroup/mibII/var_route.c 1 Sep 2006 14:49:27 -0000
+@@ -227,6 +227,7 @@ var_ipRouteEntry(struct variable *vp,
+
+ switch (vp->magic) {
+ case IPROUTEDEST:
++ *var_len = sizeof(uint32_t);
+ return (u_char *) get_in_address((struct sockaddr *) (rtp + 1),
+ rtp->rtm_addrs, RTA_DST);
+ case IPROUTEIFINDEX:
+@@ -260,6 +261,7 @@ var_ipRouteEntry(struct variable *vp,
+ long_return = -1;
+ return (u_char *) & long_return;
+ case IPROUTENEXTHOP:
++ *var_len = sizeof(uint32_t);
+ return (u_char *) get_in_address((struct sockaddr *) (rtp + 1),
+ rtp->rtm_addrs, RTA_GATEWAY);
+ case IPROUTETYPE:
+@@ -530,7 +532,7 @@ var_ipRouteEntry(struct variable * vp,
+
+ switch (vp->magic) {
+ case IPROUTEDEST:
+- *var_len = 4;
++ *var_len = sizeof(uint32_t);
+ #if NEED_KLGETSA
+ sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_dst);
+ return (u_char *) & (sa->sin_addr.s_addr);
+@@ -589,7 +591,7 @@ var_ipRouteEntry(struct variable * vp,
+ long_return = -1;
+ return (u_char *) & long_return;
+ case IPROUTENEXTHOP:
+- *var_len = 4;
++ *var_len = sizeof(uint32_t);
+ #if NEED_KLGETSA
+ sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_gateway);
+ return (u_char *) & (sa->sin_addr.s_addr);
+@@ -1561,6 +1563,7 @@ var_ipRouteEntry(struct variable *vp,
+
+ switch (vp->magic) {
+ case IPROUTEDEST:
++ *var_len = sizeof(uint32_t);
+ *write_method = write_rte;
+ long_return = pIpRtrTable->table[RtIndex].dwForwardDest;
+ return (u_char *) & long_return;
+@@ -1589,6 +1592,7 @@ var_ipRouteEntry(struct variable *vp,
+ long_return = pIpRtrTable->table[RtIndex].dwForwardMetric5;
+ return (u_char *) & long_return;
+ case IPROUTENEXTHOP:
++ *var_len = sizeof(uint32_t);
+ *write_method = write_rte;
+ long_return = pIpRtrTable->table[RtIndex].dwForwardNextHop;
+ return (u_char *) & long_return;
+@@ -1852,10 +1856,11 @@ var_ipRouteEntry(struct variable * vp,
+ *length = 14;
+ }
+
+- *var_len = sizeof long_return;
++ *var_len = sizeof(long_return);
+
+ switch (vp->magic) {
+ case IPROUTEDEST:
++ *var_len = sizeof(uint32_t);
+ long_return = rt->dest.s_addr;
+ return (u_char *) & long_return;
+
+@@ -1880,6 +1885,7 @@ var_ipRouteEntry(struct variable * vp,
+ return (u_char *) & long_return;
+
+ case IPROUTENEXTHOP:
++ *var_len = sizeof(uint32_t);
+ if (rt->gateway.s_addr == 0 && rt->ifa.s_addr == 0)
+ long_return = 0;
+ else if (rt->gateway.s_addr == 0)
+Index: agent/mibgroup/mibII/udpTable.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/mibII/udpTable.c,v
+retrieving revision 5.24
+diff -u -p -r5.24 udpTable.c
+--- agent/mibgroup/mibII/udpTable.c 27 Jun 2006 18:09:16 -0000 5.24
++++ agent/mibgroup/mibII/udpTable.c 1 Sep 2006 14:49:27 -0000
+@@ -213,12 +213,12 @@ udpTable_handler(netsnmp_mib_handler
+ addr = ntohl(IN6_EXTRACT_V4ADDR(&entry->pcb.inp_laddr));
+ snmp_set_var_typed_value(requestvb, ASN_IPADDRESS,
+ (u_char*)&addr,
+- sizeof(addr));
++ sizeof(uint32_t));
+ #else
+ addr = UDP_ADDRESS_TO_HOST_ORDER(entry->UDPTABLE_LOCALADDRESS);
+ snmp_set_var_typed_value(requestvb, ASN_IPADDRESS,
+ (u_char *)&addr,
+- sizeof(addr));
++ sizeof(uint32_t));
+ #endif
+ break;
+ case UDPLOCALPORT:
+
+
Added: branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.README
===================================================================
--- branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.README 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.README 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1 @@
+Official Patch #1610160
Added: branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.patch
===================================================================
--- branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.patch 2007-04-10 14:51:10 UTC (rev 143)
+++ branches/net-snmp53/debian/patches/36_ip_addr_route_leaks.patch 2007-04-10 15:56:19 UTC (rev 144)
@@ -0,0 +1,85 @@
+Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c,v
+retrieving revision 1.16.2.1
+retrieving revision 1.16.2.2
+diff -u -p -r1.16.2.1 -r1.16.2.2
+--- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c 25 Jan 2006 16:26:39 -0000 1.16.2.1
++++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c 6 Dec 2006 15:10:40 -0000 1.16.2.2
+@@ -2,7 +2,7 @@
+ * Note: this file originally auto-generated by mib2c using
+ * version : 1.48 $ of : mfd-top.m2c,v $
+ *
+- * $Id: ipAddressTable.c,v 1.16.2.1 2006/01/25 16:26:39 dts12 Exp $
++ * $Id: ipAddressTable.c,v 1.16.2.2 2006/12/06 15:10:40 rstory Exp $
+ */
+ /** \page MFD helper for ipAddressTable
+ *
+@@ -156,6 +156,10 @@ ipAddressTable_rowreq_ctx_cleanup(ipAddr
+ /*
+ * TODO:211:o: |-> Perform extra ipAddressTable rowreq cleanup.
+ */
++ if (NULL != rowreq_ctx->data) {
++ ipAddressTable_release_data(rowreq_ctx->data);
++ rowreq_ctx->data = NULL;
++ }
+ } /* ipAddressTable_rowreq_ctx_cleanup */
+
+ /**
+Index: agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c,v
+retrieving revision 1.9.2.2
+diff -u -p -r1.9.2.2 inetCidrRouteTable.c
+--- agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c 12 Jun 2006 20:01:19 -0000 1.9.2.2
++++ agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c 6 Dec 2006 15:20:23 -0000
+@@ -2,7 +2,7 @@
+ * Note: this file originally auto-generated by mib2c using
+ * version : 1.48 $ of : mfd-top.m2c,v $
+ *
+- * $Id: inetCidrRouteTable.c,v 1.9.2.2 2006/06/12 20:01:19 rstory Exp $
++ * $Id: inetCidrRouteTable.c,v 1.9.2.3 2006/11/14 22:20:40 rstory Exp $
+ */
+ /** \page MFD helper for inetCidrRouteTable
+ *
+@@ -205,6 +205,10 @@ inetCidrRouteTable_rowreq_ctx_cleanup(in
+ /*
+ * TODO:211:o: |-> Perform extra inetCidrRouteTable rowreq cleanup.
+ */
++ if (NULL != rowreq_ctx->data) {
++ inetCidrRouteTable_release_data(rowreq_ctx->data);
++ rowreq_ctx->data = NULL;
++ }
+ } /* inetCidrRouteTable_rowreq_ctx_cleanup */
+
+ /**
+Index: agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.c
+===================================================================
+RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.c,v
+retrieving revision 1.10.2.1
+diff -u -p -r1.10.2.1 ipCidrRouteTable.c
+--- agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.c 25 Jan 2006 16:26:38 -0000 1.10.2.1
++++ agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.c 6 Dec 2006 15:20:26 -0000
+@@ -2,7 +2,7 @@
+ * Note: this file originally auto-generated by mib2c using
+ * version : 1.48 $ of : mfd-top.m2c,v $
+ *
+- * $Id: ipCidrRouteTable.c,v 1.10.2.1 2006/01/25 16:26:38 dts12 Exp $
++ * $Id: ipCidrRouteTable.c,v 1.10.2.2 2006/11/14 22:20:40 rstory Exp $
+ */
+ /** \page MFD helper for ipCidrRouteTable
+ *
+@@ -160,6 +160,11 @@ ipCidrRouteTable_rowreq_ctx_cleanup(ipCi
+ /*
+ * TODO:211:o: |-> Perform extra ipCidrRouteTable rowreq cleanup.
+ */
++ if (NULL != rowreq_ctx->data) {
++ ipCidrRouteTable_release_data(rowreq_ctx->data);
++ rowreq_ctx->data = NULL;
++ }
++
+ } /* ipCidrRouteTable_rowreq_ctx_cleanup */
+
+ /**
+
+
More information about the Pkg-net-snmp-commits
mailing list