From 0e27ee492429405964cf3a6c80adeb66584bbddf Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Apr 01 2008 20:29:33 +0000
Subject: - Avoid dhclient crash when run via NetworkManager (#439796)


---

diff --git a/dhcp-4.0.0-NetworkManager-crash.patch b/dhcp-4.0.0-NetworkManager-crash.patch
new file mode 100644
index 0000000..aecb844
--- /dev/null
+++ b/dhcp-4.0.0-NetworkManager-crash.patch
@@ -0,0 +1,12 @@
+--- dhcp-4.0.0//client/clparse.c.nmcrash	2008-04-01 10:25:39.000000000 -1000
++++ dhcp-4.0.0//client/clparse.c	2008-04-01 10:26:20.000000000 -1000
+@@ -227,6 +227,9 @@ int read_client_conf_file (const char *n
+ 	cfile = (struct parse *)0;
+ 	new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
+ 
++	if (!cfile)
++		return ISC_R_BADPARSE;
++
+ 	do {
+ 		token = peek_token (&val, (unsigned *)0, cfile);
+ 		if (token == END_OF_FILE)
diff --git a/dhcp.spec b/dhcp.spec
index 92bffd4..70116cb 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  13%{?dist}
+Release:  14%{?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.
@@ -42,7 +42,8 @@ Patch12:  %{name}-4.0.0-xen-checksum.patch
 Patch13:  %{name}-4.0.0-dhclient-anycast.patch
 Patch14:  %{name}-4.0.0-manpages.patch
 Patch15:  %{name}-4.0.0-paths.patch
-Patch16:  %{name}-4.0.0-libdhcp4client.patch
+Patch16:  %{name}-4.0.0-NetworkManager-crash.patch
+Patch17:  %{name}-4.0.0-libdhcp4client.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -183,9 +184,12 @@ client library.
 # Change paths to conform to our standards
 %patch15 -p1
 
-# Add the libdhcp4client target (library version of dhclient)
+# Avoid crash when dhclient is run with NetworkManager
 %patch16 -p1
 
+# Add the libdhcp4client target (library version of dhclient)
+%patch17 -p1
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0644 %{SOURCE5} .
 %{__install} -p -m 0644 %{SOURCE6} doc/
@@ -414,6 +418,9 @@ fi
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Tue Apr 01 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-14
+- Avoid dhclient crash when run via NetworkManager (#439796)
+
 * Tue Mar 25 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-13
 - Update dhclient-script to handle domain-search correctly (#437840)