rpms/dhcp/F-9 dhcp.spec, 1.209, 1.210 dhcpd.init, 1.25, 1.26 linux, 1.12, 1.13

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18624

Modified Files:
	dhcp.spec dhcpd.init linux 
Log Message:
* Mon Jun 23 2008 David Cantrell <dcantrell at 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



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/dhcp.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- dhcp.spec	17 May 2008 00:21:12 -0000	1.209
+++ dhcp.spec	23 Jun 2008 15:18:35 -0000	1.210
@@ -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 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Mon Jun 23 2008 David Cantrell <dcantrell at 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 at redhat.com> - 12:4.0.0-15
 - Set close-on-exec on dhclient.leases for SELinux (#446632)
 


Index: dhcpd.init
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/dhcpd.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dhcpd.init	11 Jan 2008 00:14:20 -0000	1.25
+++ dhcpd.init	23 Jun 2008 15:18:35 -0000	1.26
@@ -62,6 +62,11 @@
     [ -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
 }
 


Index: linux
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-9/linux,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux	26 Mar 2008 04:53:54 -0000	1.12
+++ linux	23 Jun 2008 15:18:35 -0000	1.13
@@ -48,10 +48,10 @@
         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