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 /includes | |
| 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 'includes')
| -rw-r--r-- | includes/dhcpd.h | 3 | ||||
| -rw-r--r-- | includes/omapip/omapip_p.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 2907fcfa..d4c81fc1 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 @@ -1393,6 +1393,7 @@ struct interface_info { unsigned remote_id_len; /* Length of Remote ID. */ char name [IFNAMSIZ]; /* Its name... */ + int index; /* Its if_nametoindex(). */ int rfdesc; /* Its read file descriptor. */ int wfdesc; /* Its write file descriptor, if diff --git a/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h index 7fe1eba5..c92f9420 100644 --- a/includes/omapip/omapip_p.h +++ b/includes/omapip/omapip_p.h @@ -288,7 +288,8 @@ int log_info (const char *, ...) __attribute__((__format__(__printf__,1,2))); int log_debug (const char *, ...) __attribute__((__format__(__printf__,1,2))); -void do_percentm (char *obuf, const char *ibuf); + +void do_percentm (char *obuf, size_t obufsize, const char *ibuf); isc_result_t uerr2isc (int); isc_result_t ns_rcode_to_isc (int); |