diff options
| -rw-r--r-- | RELNOTES | 3 | ||||
| -rw-r--r-- | common/parse.c | 4 | ||||
| -rw-r--r-- | includes/dhcpd.h | 4 | ||||
| -rw-r--r-- | relay/dhcrelay.c | 4 | ||||
| -rw-r--r-- | server/confpars.c | 6 |
5 files changed, 12 insertions, 9 deletions
@@ -135,6 +135,9 @@ by Eric Young (eay@cryptsoft.com). and submitting a patch. [ISC-Bugs #13,!7 git dfcbe359ab278cad70015994ca73ef50d626b23a] +- Made minor changes to eliminate warnings when compiled with GCC 9. + [ISC-Bugs #15,!10] git #TBD] + Changes since 4.4.0 (New Features) - none Changes since 4.4.0 (Bug Fixes) diff --git a/common/parse.c b/common/parse.c index 3ac4ebf7..35b0b8de 100644 --- a/common/parse.c +++ b/common/parse.c @@ -3,7 +3,7 @@ Common parser code for dhcpd and dhclient. */ /* - * 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 @@ -5567,7 +5567,7 @@ int parse_warn (struct parse *cfile, const char *fmt, ...) va_list list; char lexbuf [256]; char mbuf [1024]; - char fbuf [1024]; + char fbuf [2048]; unsigned i, lix; do_percentm (mbuf, fmt); diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 2907fcfa..0ce3d00c 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -3,7 +3,7 @@ Definitions for dhcpd... */ /* - * Copyright (c) 2004-2018 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-2003 by Internet Software Consortium * * This Source Code Form is subject to the terms of the Mozilla Public @@ -1392,7 +1392,7 @@ struct interface_info { interface (if any). */ unsigned remote_id_len; /* Length of Remote ID. */ - char name [IFNAMSIZ]; /* Its name... */ + char name [IFNAMSIZ+1]; /* Its name... */ int index; /* Its if_nametoindex(). */ int rfdesc; /* Its read file descriptor. */ int wfdesc; /* Its write file descriptor, if diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index d8caaaf6..dd8e446d 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -3,7 +3,7 @@ DHCP/BOOTP Relay Agent. */ /* - * Copyright(c) 2004-2018 by Internet Systems Consortium, Inc.("ISC") + * Copyright(c) 2004-2019 by Internet Systems Consortium, Inc.("ISC") * Copyright(c) 1997-2003 by Internet Software Consortium * * This Source Code Form is subject to the terms of the Mozilla Public @@ -2119,7 +2119,7 @@ void request_v4_interface(const char* name, int flags) { (flags & INTERFACE_UPSTREAM ? 'Y' : 'N'), (flags & INTERFACE_DOWNSTREAM ? 'Y' : 'N')); - strncpy(tmp->name, name, len); + memcpy(tmp->name, name, len); interface_snorf(tmp, (INTERFACE_REQUESTED | flags)); interface_dereference(&tmp, MDL); } 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."); |