rpms/net-snmp/devel net-snmp-5.5-missing-bcast.patch, NONE, 1.1 net-snmp.spec, 1.199, 1.200

[Jan Šafránek]

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18203

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.5-missing-bcast.patch 
Log Message:
fix crash with interfaces without broadcast addresses (like OpenVPN's tun0)
Resolves: #544849

net-snmp-5.5-missing-bcast.patch:
 ipaddress_ioctl.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE net-snmp-5.5-missing-bcast.patch ---
544849 -  snmpd segfaults when openvpn is running

Source: upstream, svn rev. 17931

Clear the bcastentry in every loop iteration. If not cleared, the bcastentry
might be insterted into the container twice, when processing an interface
without broadcast address (like OpenVPN's tun0).

diff -up net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.new net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
--- net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.new	2009-05-06 23:59:20.000000000 +0200
+++ net-snmp-5.5/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c	2009-12-21 15:58:02.000000000 +0100
@@ -135,7 +135,6 @@ _netsnmp_ioctl_ipaddress_container_load_
     struct ifreq   *ifrp;
     struct sockaddr save_addr;
     struct sockaddr_in * si;
-    netsnmp_ipaddress_entry *entry, *bcastentry = NULL;
     struct address_flag_info addr_info;
     in_addr_t       ipval;
     _ioctl_extras           *extras;
@@ -156,6 +155,7 @@ _netsnmp_ioctl_ipaddress_container_load_
 
     ifrp = ifc.ifc_req;
     for(i=0; i < interfaces; ++i, ++ifrp) {
+        netsnmp_ipaddress_entry *entry, *bcastentry = NULL;
 
         DEBUGMSGTL(("access:ipaddress:container",
                     " interface %d, %s\n", i, ifrp->ifr_name));


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- net-snmp.spec	8 Dec 2009 09:36:22 -0000	1.199
+++ net-snmp.spec	21 Dec 2009 15:56:44 -0000	1.200
@@ -11,7 +11,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -31,6 +31,7 @@ Patch2: net-snmp-5.5-dir-fix.patch
 Patch3: net-snmp-5.5-multilib.patch
 Patch4: net-snmp-5.5-sensors3.patch
 Patch5: net-snmp-5.5-udptable-index.patch
+Patch6: net-snmp-5.5-missing-bcast.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -161,6 +162,7 @@ Net-SNMP toolkit library.
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .sensors
 %patch5 -p1 -b .udptable-index
+%patch6 -p1 -b .missing-bcast
 
 %build
 MIBS="host agentx smux \
@@ -402,6 +404,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Mon Dec 21 2009 Jan Safranek <jsafrane at redhat.com> - 1:5.5-7
+- fix crash with interfaces without broadcast addresses (like OpenVPN's tun0)
+  (#544849)
+
 * Tue Dec  8 2009 Jan Safranek <jsafrane at redhat.com> - 1:5.5-6
 - fix compilation of the python module