diff options
| author | Thomas Markwalder <tmark@isc.org> | 2019-05-15 15:31:42 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-06-12 09:57:32 -0400 |
| commit | 753d458b1f257cc2107454db158e14e92fcecb11 (patch) | |
| tree | aa9561e6e87dac08912897b3c1d4401a10fdf2a4 /server | |
| parent | 9bb1ce338651eefdaff33558f30ed6acdc4057c6 (diff) | |
| download | isc-dhcp-753d458b1f257cc2107454db158e14e92fcecb11.tar.gz | |
[#15,!10] Minor changes to eliminate warnings under GCC 9
added release note
common/parse.c
parse_warn() - upped format buffer size to squelch warning
includes/dhcpd.h
struct interface_info - bumped name size by 1 to squelch warning
relay/dhcrelay.c
request_v4_interface() - replace strncpy with memcpy to
squelch warning (len is already checked above it)
server/confpars.c
parse_failover_peer() - pass token value into log_fatal
calls rather than null pointer
Diffstat (limited to 'server')
| -rw-r--r-- | server/confpars.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/confpars.c b/server/confpars.c index d2cedfe0..7ad28d55 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -3,7 +3,7 @@ Parser for dhcpd config file... */ /* - * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1995-2003 by Internet Software Consortium * * This Source Code Form is subject to the terms of the Mozilla Public @@ -911,7 +911,7 @@ void parse_failover_peer (cfile, group, type) if (is_identifier (token) || token == STRING) { name = dmalloc (strlen (val) + 1, MDL); if (!name) - log_fatal ("no memory for peer name %s", name); + log_fatal ("no memory for peer name %s", val); strcpy (name, val); } else { parse_warn (cfile, "expecting failover peer name."); @@ -1226,7 +1226,7 @@ void parse_failover_state_declaration (struct parse *cfile, name = dmalloc (strlen (val) + 1, MDL); if (!name) log_fatal ("failover peer name %s: no memory", - name); + val); strcpy (name, val); } else { parse_warn (cfile, "expecting failover peer name."); |