From 00a002fc7674ac641be18b4348f5c1e70df47519 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 13 Feb 2008 06:41:05 +0000 Subject: [PATCH] - Fix startup error messages to report a missing "subnet6 declaration", rather than a missing "subnet declaration", when running as a DHCPv6 server. --- RELNOTES | 3 +++ common/discover.c | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/RELNOTES b/RELNOTES index 78145ca5c..390ac2efb 100644 --- a/RELNOTES +++ b/RELNOTES @@ -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 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 - The reverse dns name for PTR updates on IPv6 addresses has been fixed to diff --git a/common/discover.c b/common/discover.c index e04897aed..d853cc3ba 100644 --- a/common/discover.c +++ b/common/discover.c @@ -1141,7 +1141,7 @@ discover_interfaces(int state) { } else { strcpy(abuf, "no IPv6 addresses"); } - log_error("No subnet declaration for %s (%s).", + log_error("No subnet6 declaration for %s (%s).", tmp->name, abuf); #endif /* DHCPv6 */ @@ -1150,6 +1150,10 @@ discover_interfaces(int state) { log_error ("** Ignoring requests on %s. %s", tmp -> name, "If this is not what"); log_error (" 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", "for the network segment"); @@ -1159,8 +1163,12 @@ discover_interfaces(int state) { log_error ("%s", ""); goto next; } else { - log_error ("You must write a subnet %s", - " declaration for this"); + log_error ("You must write a %s", +#ifdef DHCPv6 + (local_family != AF_INET) ? + "subnet6 declaration for this" : +#endif + "subnet declaration for this"); log_error ("subnet. You cannot prevent %s", "the DHCP server"); log_error ("from listening on this subnet %s", -- 2.39.5