[Pkg-net-snmp-commits] r154 - branches/net-snmp54/debian/patches
Jochen Friedrich
jochen at alioth.debian.org
Fri Apr 13 11:46:18 UTC 2007
Author: jochen
Date: 2007-04-13 11:46:17 +0000 (Fri, 13 Apr 2007)
New Revision: 154
Added:
branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.README
branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.patch
branches/net-snmp54/debian/patches/37_tcp_connection_tables.README
branches/net-snmp54/debian/patches/37_tcp_connection_tables.patch
Log:
Add official 5.4 patches
Added: branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.README
===================================================================
--- branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.README 2007-04-13 11:45:47 UTC (rev 153)
+++ branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.README 2007-04-13 11:46:17 UTC (rev 154)
@@ -0,0 +1 @@
+Official Patch #1610155
Added: branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.patch
===================================================================
--- branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.patch 2007-04-13 11:45:47 UTC (rev 153)
+++ branches/net-snmp54/debian/patches/36_ip_addr_route_leaks.patch 2007-04-13 11:46:17 UTC (rev 154)
@@ -0,0 +1,86 @@
+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.17
+retrieving revision 1.18
+diff -u -p -r1.17 -r1.18
+--- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c 25 Jan 2006 16:25:56 -0000 1.17
++++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c 6 Dec 2006 15:10:40 -0000 1.18
+@@ -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.17 2006/01/25 16:25:56 dts12 Exp $
++ * $Id: ipAddressTable.c,v 1.18 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.12
+retrieving revision 1.13
+diff -u -p -r1.12 -r1.13
+--- agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c 12 Jun 2006 20:05:20 -0000 1.12
++++ agent/mibgroup/ip-forward-mib/inetCidrRouteTable/inetCidrRouteTable.c 6 Dec 2006 15:01:26 -0000 1.13
+@@ -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.12 2006/06/12 20:05:20 rstory Exp $
++ * $Id: inetCidrRouteTable.c,v 1.13 2006/12/06 15:01:26 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.11
+retrieving revision 1.12
+diff -u -p -r1.11 -r1.12
+--- agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.c 25 Jan 2006 16:25:54 -0000 1.11
++++ agent/mibgroup/ip-forward-mib/ipCidrRouteTable/ipCidrRouteTable.c 6 Dec 2006 15:01:26 -0000 1.12
+@@ -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.11 2006/01/25 16:25:54 dts12 Exp $
++ * $Id: ipCidrRouteTable.c,v 1.12 2006/12/06 15:01:26 rstory Exp $
+ */
+ /** \page MFD helper for ipCidrRouteTable
+ *
+@@ -160,6 +160,10 @@ 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 */
+
+ /**
+
+
Added: branches/net-snmp54/debian/patches/37_tcp_connection_tables.README
===================================================================
--- branches/net-snmp54/debian/patches/37_tcp_connection_tables.README 2007-04-13 11:45:47 UTC (rev 153)
+++ branches/net-snmp54/debian/patches/37_tcp_connection_tables.README 2007-04-13 11:46:17 UTC (rev 154)
@@ -0,0 +1 @@
+Official Patch #1611524
Added: branches/net-snmp54/debian/patches/37_tcp_connection_tables.patch
===================================================================
--- branches/net-snmp54/debian/patches/37_tcp_connection_tables.patch 2007-04-13 11:45:47 UTC (rev 153)
+++ branches/net-snmp54/debian/patches/37_tcp_connection_tables.patch 2007-04-13 11:46:17 UTC (rev 154)
@@ -0,0 +1,20 @@
+--- net-snmp-5.4/agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c.old 2006-12-08 15:29:56.000000000 +0200
++++ net-snmp-5.4/agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c 2006-12-08 15:30:39.000000000 +0200
+@@ -275,15 +275,6 @@
+ if (0 == log_open_err)
+ log_open_err = 1;
+
+- netsnmp_assert(NULL != container);
+-
+-#undef PROCFILE
+-#define PROCFILE "/proc/net/tcp6"
+- if (!(in = fopen(PROCFILE, "r"))) {
+- snmp_log(LOG_ERR,"could not open " PROCFILE "\n");
+- return -2;
+- }
+-
+ fgets(line, sizeof(line), in); /* skip header */
+
+ /*
+
+
More information about the Pkg-net-snmp-commits
mailing list