'No subnet declaration for <iface>' should be info, not error
This commit is contained in:
parent
61da11e0c5
commit
9311117d66
48
dhcp-no-subnet-error2info.patch
Normal file
48
dhcp-no-subnet-error2info.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
diff -up dhcp-4.2.5/common/discover.c.error2info dhcp-4.2.5/common/discover.c
|
||||||
|
--- dhcp-4.2.5/common/discover.c.error2info 2013-09-27 10:27:42.000000000 +0200
|
||||||
|
+++ dhcp-4.2.5/common/discover.c 2013-09-27 10:29:30.687201624 +0200
|
||||||
|
@@ -782,9 +782,9 @@ discover_interfaces(int state) {
|
||||||
|
|
||||||
|
/* We must have a subnet declaration for each interface. */
|
||||||
|
if (!tmp->shared_network && (state == DISCOVER_SERVER)) {
|
||||||
|
- log_error("%s", "");
|
||||||
|
+ log_info("%s", "");
|
||||||
|
if (local_family == AF_INET) {
|
||||||
|
- log_error("No subnet declaration for %s (%s).",
|
||||||
|
+ log_info("No subnet declaration for %s (%s).",
|
||||||
|
tmp->name,
|
||||||
|
(tmp->addresses == NULL) ?
|
||||||
|
"no IPv4 addresses" :
|
||||||
|
@@ -799,26 +799,26 @@ discover_interfaces(int state) {
|
||||||
|
} else {
|
||||||
|
strcpy(abuf, "no IPv6 addresses");
|
||||||
|
}
|
||||||
|
- log_error("No subnet6 declaration for %s (%s).",
|
||||||
|
+ log_info("No subnet6 declaration for %s (%s).",
|
||||||
|
tmp->name,
|
||||||
|
abuf);
|
||||||
|
#endif /* DHCPv6 */
|
||||||
|
}
|
||||||
|
if (supports_multiple_interfaces(tmp)) {
|
||||||
|
- log_error ("** Ignoring requests on %s. %s",
|
||||||
|
+ log_info ("** Ignoring requests on %s. %s",
|
||||||
|
tmp -> name, "If this is not what");
|
||||||
|
- log_error (" you want, please write %s",
|
||||||
|
+ log_info (" you want, please write %s",
|
||||||
|
#ifdef DHCPv6
|
||||||
|
(local_family != AF_INET) ?
|
||||||
|
"a subnet6 declaration" :
|
||||||
|
#endif
|
||||||
|
"a subnet declaration");
|
||||||
|
- log_error (" in your dhcpd.conf file %s",
|
||||||
|
+ log_info (" in your dhcpd.conf file %s",
|
||||||
|
"for the network segment");
|
||||||
|
- log_error (" to %s %s %s",
|
||||||
|
+ log_info (" to %s %s %s",
|
||||||
|
"which interface",
|
||||||
|
tmp -> name, "is attached. **");
|
||||||
|
- log_error ("%s", "");
|
||||||
|
+ log_info ("%s", "");
|
||||||
|
goto next;
|
||||||
|
} else {
|
||||||
|
log_error ("You must write a %s",
|
@ -18,7 +18,7 @@
|
|||||||
Summary: Dynamic host configuration protocol software
|
Summary: Dynamic host configuration protocol software
|
||||||
Name: dhcp
|
Name: dhcp
|
||||||
Version: 4.2.5
|
Version: 4.2.5
|
||||||
Release: 22%{?dist}
|
Release: 23%{?dist}
|
||||||
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
|
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
|
||||||
# dcantrell maintaining the package) made incorrect use of the epoch and
|
# 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.
|
# that's why it is at 12 now. It should have never been used, but it was.
|
||||||
@ -80,6 +80,7 @@ Patch46: dhcp-4.2.4-P2-dupl-key.patch
|
|||||||
Patch47: dhcp-4.2.5-range6.patch
|
Patch47: dhcp-4.2.5-range6.patch
|
||||||
Patch48: dhcp-4.2.5-next-server.patch
|
Patch48: dhcp-4.2.5-next-server.patch
|
||||||
Patch49: dhcp-bindtodevice-inet6.patch
|
Patch49: dhcp-bindtodevice-inet6.patch
|
||||||
|
Patch50: dhcp-no-subnet-error2info.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -348,6 +349,9 @@ rm -rf includes/isc-dhcp
|
|||||||
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784])
|
# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784])
|
||||||
%patch49 -p1 -b .bindtodevice_inet6
|
%patch49 -p1 -b .bindtodevice_inet6
|
||||||
|
|
||||||
|
# 'No subnet declaration for <iface>' should be info, not error.
|
||||||
|
%patch50 -p1 -b .error2info
|
||||||
|
|
||||||
# Update paths in all man pages
|
# Update paths in all man pages
|
||||||
for page in client/dhclient.conf.5 client/dhclient.leases.5 \
|
for page in client/dhclient.conf.5 client/dhclient.leases.5 \
|
||||||
client/dhclient-script.8 client/dhclient.8 ; do
|
client/dhclient-script.8 client/dhclient.8 ; do
|
||||||
@ -615,6 +619,9 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 27 2013 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-23
|
||||||
|
- 'No subnet declaration for <iface>' should be info, not error.
|
||||||
|
|
||||||
* Wed Sep 18 2013 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-22
|
* Wed Sep 18 2013 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-22
|
||||||
- fix segfault introduced with previous commit
|
- fix segfault introduced with previous commit
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user