diff options
| author | Thomas Markwalder <tmark@isc.org> | 2019-06-12 10:06:30 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-06-12 10:06:30 -0400 |
| commit | 97c155273c0df0c8518f226e2b5e338e3ad63e87 (patch) | |
| tree | b4510c673655b2befb98ab9f77cbf203cc636dd5 /server | |
| parent | 9bb1ce338651eefdaff33558f30ed6acdc4057c6 (diff) | |
| parent | 71277027e98bcd94692406746b0685a7032d9fba (diff) | |
| download | isc-dhcp-97c155273c0df0c8518f226e2b5e338e3ad63e87.tar.gz | |
[master] GCC 9 compilation errors fixed.
Merge branch '15-confpars-c-has-invalid-error-messages-when-memory-allocation-fails'
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."); |