[dhcp/f16] don't send log messages to the standard error descriptor by default (#790387)

[Jiří Popelka]

commit 60e3a5eeae4b555e87312cfeb2089f606eeb88e9
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Feb 22 15:07:05 2012 +0100

    don't send log messages to the standard error descriptor by default (#790387)

 dhcp-4.2.3-P2-log_perror.patch |   11 +++++++++++
 dhcp.spec                      |   10 +++++++++-
 dhcpd.service                  |    2 +-
 dhcpd6.service                 |    2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/dhcp-4.2.3-P2-log_perror.patch b/dhcp-4.2.3-P2-log_perror.patch
new file mode 100644
index 0000000..124c8c5
--- /dev/null
+++ b/dhcp-4.2.3-P2-log_perror.patch
@@ -0,0 +1,11 @@
+diff -up dhcp-4.2.3-P2/server/dhcpd.c.log_perror dhcp-4.2.3-P2/server/dhcpd.c
+--- dhcp-4.2.3-P2/server/dhcpd.c.log_perror	2012-02-22 14:24:57.000000000 +0100
++++ dhcp-4.2.3-P2/server/dhcpd.c	2012-02-22 14:29:09.964576687 +0100
+@@ -315,6 +315,7 @@ main(int argc, char **argv) {
+ #ifndef DEBUG
+ 			daemon = 0;
+ #endif
++			log_perror = 0;
+ 		} else if (!strcmp (argv [i], "-d")) {
+ #ifndef DEBUG
+ 			daemon = 0;
diff --git a/dhcp.spec b/dhcp.spec
index 6493c8b..6d0205d 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -19,7 +19,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.3
-Release:  7.%{patchver}%{?dist}
+Release:  8.%{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.
@@ -69,6 +69,7 @@ Patch29:  dhcp-4.2.2-remove-bind.patch
 Patch30:  dhcp-4.2.2-sharedlib.patch
 Patch31:  dhcp-4.2.0-PPP.patch
 Patch32:  dhcp-4.2.3-paranoia.patch
+Patch33:  dhcp-4.2.3-P2-log_perror.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -308,6 +309,10 @@ rm bind/bind.tar.gz
 # Write lease file AFTER changing of the effective user/group ID.
 %patch32 -p1 -b .paranoia
 
+# Don't send log messages to the standard error descriptor by default (#790387)
+# (Submitted to dhcp-bugs at isc.org - [ISC-Bugs #28049])
+%patch33 -p1 -b .log_perror
+
 # Copy in the Fedora/RHEL dhclient script
 %{__install} -p -m 0755 %{SOURCE4} client/scripts/linux
 %{__install} -p -m 0644 %{SOURCE5} .
@@ -641,6 +646,9 @@ fi
 %{_initddir}/dhcrelay
 
 %changelog
+* Wed Feb 22 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.3-8.P2
+- don't send log messages to the standard error descriptor by default (#790387)
+
 * Tue Feb 07 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.3-7.P2
 - dhclient-script: install link-local static routes with correct scope (#787318)
 
diff --git a/dhcpd.service b/dhcpd.service
index c9a73a1..487289d 100644
--- a/dhcpd.service
+++ b/dhcpd.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/dhcpd
-ExecStart=/usr/sbin/dhcpd -d -user dhcpd -group dhcpd --no-pid $DHCPDARGS
+ExecStart=/usr/sbin/dhcpd -f -user dhcpd -group dhcpd --no-pid $DHCPDARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/dhcpd6.service b/dhcpd6.service
index 33f145a..8839a00 100644
--- a/dhcpd6.service
+++ b/dhcpd6.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/dhcpd6
-ExecStart=/usr/sbin/dhcpd -d -6 -user dhcpd -group dhcpd --no-pid $DHCPDARGS
+ExecStart=/usr/sbin/dhcpd -f -6 -user dhcpd -group dhcpd --no-pid $DHCPDARGS
 
 [Install]
 WantedBy=multi-user.target