diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2012-09-18 21:51:22 +0100 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2012-09-18 21:51:22 +0100 |
| commit | 2b127a1eab194b39ea65e4b69570f233b0abbafc (patch) | |
| tree | 56b0fb9b924966b10948f6b07fdc0b22e4f495fd | |
| parent | dfb23b3f7777e63008466906d2247269408ece06 (diff) | |
| download | dnsmasq-2b127a1eab194b39ea65e4b69570f233b0abbafc.tar.gz | |
Flag DHCP or DHCPv6 in starup logging.
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | src/dnsmasq.c | 9 |
2 files changed, 8 insertions, 4 deletions
@@ -16,6 +16,9 @@ version 2.64 Don't report spurious netlink errors, regression in 2.63. Thanks to Vladislav Grishenko for the patch. + Flag DHCP or DHCPv6 in starup logging. Thanks to + Vladislav Grishenko for the patch. + version 2.63 Do duplicate dhcp-host address check in --test mode. diff --git a/src/dnsmasq.c b/src/dnsmasq.c index 6abd201..0023a4f 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -658,12 +658,13 @@ int main (int argc, char **argv) if ((dhcp_tmp->flags & CONTEXT_DHCP) || family == AF_INET) my_syslog(MS_DHCP | LOG_INFO, (dhcp_tmp->flags & CONTEXT_RA_STATELESS) ? - _("stateless DHCPv6 on %s%.0s%.0s") : + _("%s stateless on %s%.0s%.0s") : (dhcp_tmp->flags & CONTEXT_STATIC) ? - _("DHCP, static leases only on %.0s%s, %s") : + _("%s, static leases only on %.0s%s, %s") : (dhcp_tmp->flags & CONTEXT_PROXY) ? - _("DHCP, proxy on subnet %.0s%s%.0s") : - _("DHCP, IP range %s -- %s, %s"), + _("%s, proxy on subnet %.0s%s%.0s") : + _("%s, IP range %s -- %s, %s"), + (family != AF_INET) ? "DHCPv6" : "DHCP", daemon->dhcp_buff, daemon->dhcp_buff3, daemon->namebuff); if (dhcp_tmp->flags & CONTEXT_RA_NAME) |