rpms/dhcp/devel dhcp-4.1.0-add_timeout_when_NULL.patch, NONE, 1.1 dhcp.spec, 1.256, 1.257
David Cantrell
dcantrel at fedoraproject.org
Sat Jun 27 00:02:16 UTC 2009
Author: dcantrel
Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5500
Modified Files:
dhcp.spec
Added Files:
dhcp-4.1.0-add_timeout_when_NULL.patch
Log Message:
* Fri Jun 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-21
- Handle cases in add_timeout() where the function is called with a NULL
value for the 'when' parameter (#506626)
dhcp-4.1.0-add_timeout_when_NULL.patch:
--- NEW FILE dhcp-4.1.0-add_timeout_when_NULL.patch ---
diff -up dhcp-4.1.0/common/dispatch.c.dracut dhcp-4.1.0/common/dispatch.c
--- dhcp-4.1.0/common/dispatch.c.dracut 2008-01-23 16:43:04.000000000 -1000
+++ dhcp-4.1.0/common/dispatch.c 2009-06-25 16:21:03.000000000 -1000
@@ -104,6 +104,10 @@ void add_timeout (when, where, what, ref
{
struct timeout *t, *q;
+ if (when == NULL) {
+ return;
+ }
+
/* See if this timeout supersedes an existing timeout. */
t = (struct timeout *)0;
for (q = timeouts; q; q = q -> next) {
Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -p -r1.256 -r1.257
--- dhcp.spec 6 May 2009 17:31:05 -0000 1.256
+++ dhcp.spec 27 Jun 2009 00:01:46 -0000 1.257
@@ -10,7 +10,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: 4.1.0
-Release: 20%{?dist}
+Release: 21%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was.
@@ -46,6 +46,7 @@ Patch16: %{name}-4.1.0-port-validation.
Patch17: %{name}-4.1.0-invalid-dhclient-conf.patch
Patch18: %{name}-4.1.0-missing-ipv6-not-fatal.patch
Patch19: %{name}-4.1.0-IFNAMSIZ.patch
+Patch20: %{name}-4.1.0-add_timeout_when_NULL.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
@@ -191,6 +192,10 @@ libdhcpctl and libomapi static libraries
# Read only up to IFNAMSIZ characters for the interface name in dhcpd (#441524)
%patch19 -p1
+# Handle cases in add_timeout() where the function is called with a NULL
+# value for the 'when' parameter
+%patch20 -p1
+
# Copy in documentation and example scripts for LDAP patch to dhcpd
%{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
@@ -423,6 +428,10 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog
+* Fri Jun 26 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-21
+- Handle cases in add_timeout() where the function is called with a NULL
+ value for the 'when' parameter (#506626)
+
* Wed May 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-20
- Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290)
More information about the scm-commits
mailing list