[dhcp/f14/master] Fix OMAPI (#666441)

[Jiří Popelka]

commit 781bc294ca0037f84f1de0c74064341e8f54e4a1
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jan 3 17:14:45 2011 +0100

    Fix OMAPI (#666441)

 dhcp-4.2.0-P2-omapi.patch |   12 ++++++++++++
 dhcp.spec                 |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/dhcp-4.2.0-P2-omapi.patch b/dhcp-4.2.0-P2-omapi.patch
new file mode 100644
index 0000000..0222090
--- /dev/null
+++ b/dhcp-4.2.0-P2-omapi.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.0-P2/omapip/protocol.c.omapi dhcp-4.2.0-P2/omapip/protocol.c
+--- dhcp-4.2.0-P2/omapip/protocol.c.omapi	2009-11-20 02:49:02.000000000 +0100
++++ dhcp-4.2.0-P2/omapip/protocol.c	2011-01-03 16:30:25.000000000 +0100
+@@ -386,7 +386,7 @@ isc_result_t omapi_protocol_signal_handl
+ 	/* Should only receive these when opening the initial authenticator. */
+ 	if (!strcmp (name, "status")) {
+ 		status = va_arg (ap, isc_result_t);
+-		if (status != ISC_R_SUCCESS) {
++		if ((status != ISC_R_SUCCESS) && (status >= ISC_RESULTCLASS_DHCP)) {
+ 			omapi_signal_in (h -> inner, "status", status,
+ 					 (omapi_object_t *)0);
+ 			omapi_disconnect (p -> outer, 1);
diff --git a/dhcp.spec b/dhcp.spec
index 46a6feb..c63b6ae 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -12,7 +12,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.0
-Release:  16.%{patchver}%{?dist}
+Release:  17.%{patchver}%{?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.
@@ -63,6 +63,7 @@ Patch29:  dhcp-4.2.0-PIE-RELRO.patch
 Patch30:  dhcp-4.2.0-honor-expired.patch
 Patch31:  dhcp-4.2.0-noprefixavail.patch
 Patch32:  dhcp-4.2.0-PPP.patch
+Patch33:  dhcp-4.2.0-P2-omapi.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -261,6 +262,9 @@ libdhcpctl and libomapi static libraries are also included in this package.
 # DHCPv6 over PPP support (#626514)
 %patch32 -p1 -b .PPP
 
+# Fix OMAPI (#666441)
+%patch33 -p1 -b .omapi
+
 # Copy in the Fedora/RHEL dhclient script
 %{__install} -p -m 0755 %{SOURCE4} client/scripts/linux
 %{__install} -p -m 0644 %{SOURCE5} .
@@ -542,6 +546,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+
+* Mon Jan 03 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.0-17.P2
+- Fix OMAPI (#666441)
+
 * Mon Dec 13 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.0-16.P2
 - 4.2.0-P2: fix for CVE-2010-3616 (#662326)
 - Use upstream fix for #628258