From f888dd42eda9fc5342d666e4927586b57c66767e Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Jun 23 2008 15:18:35 +0000
Subject: - Remove instances of \032 in domain search option (#450042)

- Make 'service dhcpd configtest' display text indicating the status

---

diff --git a/dhcp.spec b/dhcp.spec
index 0442a4d..b0bbf2c 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:  15%{?dist}
+Release:  16%{?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.
@@ -422,6 +422,10 @@ fi
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Mon Jun 23 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-16
+- Remove instances of \032 in domain search option (#450042)
+- Make 'service dhcpd configtest' display text indicating the status
+
 * Fri May 16 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-15
 - Set close-on-exec on dhclient.leases for SELinux (#446632)
 
diff --git a/dhcpd.init b/dhcpd.init
index 0723f06..acc88f8 100644
--- a/dhcpd.init
+++ b/dhcpd.init
@@ -62,6 +62,11 @@ configtest() {
     [ -f $conf ] || return 6
     $dhcpd -q -t -cf $conf
     RETVAL=$?
+    if [ $RETVAL -eq 1 ]; then
+        $dhcpd -t -cf $conf
+    else
+        echo "Syntax: OK" >&2
+    fi
     return $RETVAL
 }
 
diff --git a/linux b/linux
index 8476cb9..93638f0 100755
--- a/linux
+++ b/linux
@@ -48,10 +48,10 @@ make_resolv_conf() {
         echo '; generated by /sbin/dhclient-script' > $rscf
 
         if [ -n "$new_domain_search" ]; then
-            echo search $new_domain_search >> $rscf
+            echo "search ${new_domain_search//\\032/ }" >> $rscf
         else
             if [ -n "$new_domain_name" ]; then
-                echo search $new_domain_name >> $rscf
+                echo "search ${new_domain_name//\\032/ }" >> $rscf
             fi
         fi