- dhclient logs its pid to make troubleshooting NM managed systems with

multiple dhclients running easier (#546792)
This commit is contained in:
Jiří Popelka 2009-12-14 10:56:21 +00:00
parent 89c5adb3ae
commit 59ea29af7c
2 changed files with 22 additions and 1 deletions

12
dhcp-4.1.0p1-logpid.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up dhcp-4.1.0p1/client/dhclient.c.logpid dhcp-4.1.0p1/client/dhclient.c
--- dhcp-4.1.0p1/client/dhclient.c.logpid 2009-12-14 11:39:47.000000000 +0100
+++ dhcp-4.1.0p1/client/dhclient.c 2009-12-14 11:41:17.000000000 +0100
@@ -148,7 +148,7 @@ main(int argc, char **argv) {
else if (fd != -1)
close(fd);
- openlog("dhclient", LOG_NDELAY, LOG_DAEMON);
+ openlog("dhclient", LOG_NDELAY | LOG_PID, LOG_DAEMON);
#if !(defined(DEBUG) || defined(__CYGWIN32__))
setlogmask(LOG_UPTO(LOG_INFO));

View File

@ -13,7 +13,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: %{basever}p1
Release: 14%{?dist}
Release: 15%{?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.
@ -55,6 +55,7 @@ Patch20: %{name}-4.1.0-add_timeout_when_NULL.patch
Patch21: %{name}-4.1.0-64_bit_lease_parse.patch
Patch22: %{name}-4.1.0-CVE-2009-1892.patch
Patch23: %{name}-4.1.0p1-capability.patch
Patch24: %{name}-4.1.0p1-logpid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
@ -218,6 +219,10 @@ libdhcpctl and libomapi static libraries are also included in this package.
# Drop unnecessary capabilities in dhclient (#517649)
%patch23 -p1
# dhclient logs its pid to make troubleshooting NM managed systems
# with multiple dhclients running easier (#546792)
%patch24 -p1
# Copy in documentation and example scripts for LDAP patch to dhcpd
%{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
@ -481,6 +486,10 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog
* Mon Dec 14 2009 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-15
- dhclient logs its pid to make troubleshooting NM managed systems
with multiple dhclients running easier (#546792)
* Mon Nov 23 2009 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.0p1-14
- Honor DEFROUTE=yes|no for all connection types (#530209)