mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

- Fix startup error messages to report a missing "subnet6 declaration", rather

Browse Source 
than a missing "subnet declaration", when running as a DHCPv6 server.
This commit is contained in:
Mark Andrews 2008-02-13 06:41:05 +00:00
parent 961e7a5b0e
commit 00a002fc76
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELNOTES
View File

@ -153,6 +153,9 @@ work on other platforms. Please report any problems and suggested fixes to
- The failover server no longer issues a floating point error if it encounters - The failover server no longer issues a floating point error if it encounters
a previously undefined option code. a previously undefined option code.
- Fix startup error messages to report a missing "subnet6 declaration", rather
than a missing "subnet declaration", when running as a DHCPv6 server.
Changes since 4.0.0b3 Changes since 4.0.0b3
- The reverse dns name for PTR updates on IPv6 addresses has been fixed to - The reverse dns name for PTR updates on IPv6 addresses has been fixed to

14
common/discover.c
View File

@ -1141,7 +1141,7 @@ discover_interfaces(int state) {
} else { } else {
strcpy(abuf, "no IPv6 addresses"); strcpy(abuf, "no IPv6 addresses");
} }
log_error("No subnet declaration for %s (%s).", log_error("No subnet6 declaration for %s (%s).",
tmp->name, tmp->name,
abuf); abuf);
#endif /* DHCPv6 */ #endif /* DHCPv6 */
@ -1150,6 +1150,10 @@ discover_interfaces(int state) {
log_error ("** Ignoring requests on %s. %s", log_error ("** Ignoring requests on %s. %s",
tmp -> name, "If this is not what"); tmp -> name, "If this is not what");
log_error (" you want, please write %s", log_error (" you want, please write %s",
#ifdef DHCPv6
(local_family != AF_INET) ?
"a subnet6 declaration" :
#endif
"a subnet declaration"); "a subnet declaration");
log_error (" in your dhcpd.conf file %s", log_error (" in your dhcpd.conf file %s",
"for the network segment"); "for the network segment");
@ -1159,8 +1163,12 @@ discover_interfaces(int state) {
log_error ("%s", ""); log_error ("%s", "");
goto next; goto next;
} else { } else {
log_error ("You must write a subnet %s", log_error ("You must write a %s",
" declaration for this"); #ifdef DHCPv6
(local_family != AF_INET) ?
"subnet6 declaration for this" :
#endif
"subnet declaration for this");
log_error ("subnet. You cannot prevent %s", log_error ("subnet. You cannot prevent %s",
"the DHCP server"); "the DHCP server");
log_error ("from listening on this subnet %s", log_error ("from listening on this subnet %s",