 @@ -1,21 +1,21 @@
-/*	$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $	*/
+/*	$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $	*/
 /* dhclient.c
    DHCP Client. */
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 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
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 @@ -23,27 +23,27 @@
  *   Internet Systems Consortium, Inc.
  *   950 Charter Street
  *   Redwood City, CA 94063
  *   <info@isc.org>
  *   https://www.isc.org/
+ *
  * This code is based on the original client state machine that was
  * written by Elliot Poger.  The code has been extensively hacked on
  * by Ted Lemon since then, so any mistakes you find are probably his
  * fault and not Elliot's.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 #include "dhcpd.h"
 #include <isc/util.h>
 #include <isc/file.h>
 #include <dns/result.h>
 #include <syslog.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <limits.h>
 TIME default_lease_time = 43200; /* 12 hours... */
 @@ -74,27 +74,27 @@ struct sockaddr_in sockaddr_broadcast;
 struct in_addr giaddr;
 struct data_string default_duid;
 int duid_type = 0;
 int duid_v4 = 0;
 int std_dhcid = 0;
 int decline_wait_time = 10; /* Default to 10 secs per, RFC 2131, 3.1.5 */
 /* ASSERT_STATE() does nothing now; it used to be
    assert (state_is == state_shouldbe). */
 #define ASSERT_STATE(state_is, state_shouldbe) {}
 #ifndef UNIT_TEST
-static const char copyright[] = "Copyright 2004-2020 Internet Systems Consortium.";
+static const char copyright[] = "Copyright 2004-2021 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Client";
 static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/";
 #endif /* UNIT_TEST */
 u_int16_t local_port = 0;
 u_int16_t remote_port = 0;
 #if defined(DHCPv6) && defined(DHCP4o6)
 int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
 #endif
 int no_daemon = 0;
 int dfd[2] = { -1, -1 };
 struct string_list *client_env = NULL;
 @@ -231,27 +231,27 @@ add_interfaces(char **ifaces, int niface
  * If the user has provided an incorrect command line print out
  * the description of the command line.  The arguments provide
  * a way for the caller to request more specific information about
  * the error be printed as well.  Mostly this will be that some
  * comamnd doesn't include its argument.
+ *
  * \param sfmt - The basic string and format for the specific error
  * \param sarg - Generally the offending argument from the comamnd line.
+ *
  * \return Nothing
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 #if defined(DHCPv6) && defined(DHCP4o6)
 static void dhcp4o6_poll(void *dummy);
 static void dhcp4o6_resume(void);
 static void recv_dhcpv4_response(struct data_string *raw);
 static int send_dhcpv4_query(struct client_state *client, int broadcast);
 static void dhcp4o6_stop(void);
 static void forw_dhcpv4_response(struct packet *packet);
 static void forw_dhcpv4_query(struct data_string *raw);
 #endif
 #ifndef UNIT_TEST
 @@ -1220,27 +1220,27 @@ int find_subnet (struct subnet **sp,
  *		     been sent to us by DHCP servers.
  *   acked_leases: leases corresponding to DHCPACK messages that have been
  *		   sent to us by DHCP servers.
  *   sendpacket: DHCP packet we're trying to send.
  *   destination: IP address to send sendpacket to
  * In addition, there are several relevant per-lease variables.
  *   T1_expiry, T2_expiry, lease_expiry: lease milestones
  * In the active lease, these control the process of renewing the lease;
  * In leases on the acked_leases list, this simply determines when we
  * can no longer legitimately use the lease.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhclient.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: dhclient.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 void state_reboot (cpp)
 	void *cpp;
+{
 	struct client_state *client = cpp;
 #if defined(DHCPv6) && defined(DHCP4o6)
 	if (dhcpv4_over_dhcpv6 && (dhcp4o6_state <= 0)) {
 		if (dhcp4o6_state < 0)
 			dhcp4o6_poll(NULL);
 		client->pending = P_REBOOT;
 		return;
+	}

 @@ -1,45 +1,45 @@
-/*	$NetBSD: parse.c,v 1.3 2020/08/03 21:10:56 christos Exp $	*/
+/*	$NetBSD: parse.c,v 1.4 2021/05/26 22:52:31 christos Exp $	*/
 /* parse.c
    Common parser code for dhcpd and dhclient. */
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 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
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  *   Internet Systems Consortium, Inc.
  *   950 Charter Street
  *   Redwood City, CA 94063
  *   <info@isc.org>
  *   https://www.isc.org/
+ *
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: parse.c,v 1.3 2020/08/03 21:10:56 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.4 2021/05/26 22:52:31 christos Exp $");
 #include "dhcpd.h"
 #include <isc/util.h>
 #include <syslog.h>
 struct collection default_collection = { NULL, "default", NULL };
 struct collection *collections = &default_collection;
 /* Enumerations can be specified in option formats, and are used for
    parsing, so we define the routines that manage them here. */
 struct enumeration *enumerations;
 @@ -5551,33 +5551,34 @@ int parse_X (cfile, buf, max)
 	unsigned len;
 	token = peek_token (&val, (unsigned *)0, cfile);
 	if (token == NUMBER_OR_NAME || token == NUMBER) {
 		len = 0;
 		do {
 			token = next_token (&val, (unsigned *)0, cfile);
 			if (token != NUMBER && token != NUMBER_OR_NAME) {
 				parse_warn (cfile,
 					    "expecting hexadecimal constant.");
 				skip_to_semi (cfile);
 				return 0;
+			}
-			convert_num (cfile, &buf [len], val, 16, 8);
+			if (len >= max) {
 			if (len++ > max) {
 				parse_warn (cfile,
 					    "hexadecimal constant too long.");
 				skip_to_semi (cfile);
 				return 0;
+			}
 			convert_num (cfile, &buf [len], val, 16, 8);
 			len++;
 			token = peek_token (&val, (unsigned *)0, cfile);
 			if (token == COLON)
 				token = next_token (&val,
 						    (unsigned *)0, cfile);
 		} while (token == COLON);
 		val = (char *)buf;
 	} else if (token == STRING) {
 		skip_token(&val, &len, cfile);
 		if (len + 1 > max) {
 			parse_warn (cfile, "string constant too long.");
 			skip_to_semi (cfile);
 			return 0;
+		}

 @@ -1,17 +1,17 @@
-/*	$NetBSD: option_unittest.c,v 1.2 2018/04/07 22:37:29 christos Exp $	*/
+/*	$NetBSD: option_unittest.c,v 1.3 2021/05/26 22:52:31 christos Exp $	*/
 /*
- * Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+ *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
  * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS.	 IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
  * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
  * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 @@ -121,24 +121,108 @@ ATF_TC_BODY(pretty_print_option, tc)
+    }
     /* Now we'll try a data value that's too large */
     output_buf = pretty_print_option (option, bad_data, sizeof(bad_data),
                                       emit_commas, emit_quotes);
     /* Make sure we safely get an error */
     if (!output_buf || strcmp(output_buf, "<error>")) {
 	    atf_tc_fail("pretty_print_option did not return \"<error>\"");
+    }
+}
 ATF_TC(parse_X);
 ATF_TC_HEAD(parse_X, tc)
+{
     atf_tc_set_md_var(tc, "descr",
 		      "Verify parse_X survices option too big.");
+}
 /* Initializes a parse struct from an input buffer of data. */
 static void init_parse(struct parse *cfile, char* name, char *input) {
     memset(cfile, 0, sizeof(struct parse));
     cfile->tlname = name;
     cfile->lpos = cfile->line = 1;
     cfile->cur_line = cfile->line1;
     cfile->prev_line = cfile->line2;
     cfile->token_line = cfile->cur_line;
     cfile->cur_line[0] = cfile->prev_line[0] = 0;
     cfile->file = -1;
     cfile->eol_token = 0;
     cfile->inbuf = input;
     cfile->buflen = strlen(input);
     cfile->bufsiz = 0;
+}
 /*
  * This test verifies that parse_X does not overwrite the output
  * buffer when given input data that exceeds the output buffer
  * capacity.
 */
 ATF_TC_BODY(parse_X, tc)
+{
     struct parse cfile;
     u_int8_t output[10];
     unsigned len;
     /* Input hex literal */
     char *input = "01:02:03:04:05:06:07:08";
     unsigned expected_len = 8;
     /* Normal output plus two filler bytes */
     u_int8_t expected_plus_two[] = {
 x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0xff, 0xff
     };
     /* Safe output when option is too long */
     unsigned short_buf_len = 4;
     u_int8_t expected_too_long[] = {
 x01, 0x02, 0x03, 0x04, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
     };
     /* First we'll run one that works normally */
     memset(output, 0xff, sizeof(output));
     init_parse(&cfile, "hex_fits", input);
     len = parse_X(&cfile, output, expected_len);
     // Len should match the expected len.
     if (len != expected_len) {
 	    atf_tc_fail("parse_X failed, output len: %d", len);
+    }
     // We should not have written anything past the end of the buffer.
     if (memcmp(output, expected_plus_two, sizeof(output))) {
 	    atf_tc_fail("parse_X failed, output does not match expected");
+    }
     // Now we'll try it with a buffer that's too small.
     init_parse(&cfile, "hex_too_long", input);
     memset(output, 0xff, sizeof(output));
     len = parse_X(&cfile, output, short_buf_len);
     // On errors, len should be zero.
     if (len != 0) {
 	    atf_tc_fail("parse_X failed, we should have had an error");
+    }
     // We should not have written anything past the end of the buffer.
     if (memcmp(output, expected_too_long, sizeof(output))) {
         atf_tc_fail("parse_X overwrote buffer!");
+    }
+}
 /* This macro defines main() method that will call specified
    test cases. tp and simple_test_case names can be whatever you want
    as long as it is a valid variable identifier. */
 ATF_TP_ADD_TCS(tp)
+{
     ATF_TP_ADD_TC(tp, option_refcnt);
     ATF_TP_ADD_TC(tp, pretty_print_option);
     ATF_TP_ADD_TC(tp, parse_X);
     return (atf_no_error());
+}

 @@ -1,45 +1,45 @@
-/*	$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $	*/
+/*	$NetBSD: dhcrelay.c,v 1.5 2021/05/26 22:52:32 christos Exp $	*/
 /* dhcrelay.c
    DHCP/BOOTP Relay Agent. */
 /*
- * Copyright(c) 2004-2020 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2021 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
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  *   Internet Systems Consortium, Inc.
  *   950 Charter Street
  *   Redwood City, CA 94063
  *   <info@isc.org>
  *   https://www.isc.org/
+ *
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.5 2021/05/26 22:52:32 christos Exp $");
 #include "dhcpd.h"
 #include <syslog.h>
 #include <signal.h>
 #include <sys/time.h>
 #include <isc/file.h>
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 struct tree_cache *global_options[256];
 struct option *requested_opts[2];
 @@ -159,27 +159,27 @@ extern int add_relay_agent_options(struc
 				            struct dhcp_packet *, unsigned,
 				            struct in_addr);
 extern int find_interface_by_agent_option(struct dhcp_packet *,
 			                       struct interface_info **, u_int8_t *, int);
 extern int strip_relay_agent_options(struct interface_info *,
 				              struct interface_info **,
 				              struct dhcp_packet *, unsigned);
 #ifndef UNIT_TEST
 static void request_v4_interface(const char* name, int flags);
 static const char copyright[] =
-"Copyright 2004-2020 Internet Systems Consortium.";
+"Copyright 2004-2021 Internet Systems Consortium.";
 static const char arr[] = "All rights reserved.";
 static const char message[] =
 "Internet Systems Consortium DHCP Relay Agent";
 static const char url[] =
 "For info, please visit https://www.isc.org/software/dhcp/";
 char *progname;
 #ifdef DHCPv6
 #ifdef RELAY_PORT
 #define DHCRELAY_USAGE \
 "Usage: %s [-4] [-d] [-q] [-a] [-D]\n" \
 "                     [-A <length>] [-c <hops>]\n" \
 @@ -254,27 +254,27 @@ char *progname;
  * If the user has provided an incorrect command line print out
  * the description of the command line.  The arguments provide
  * a way for the caller to request more specific information about
  * the error be printed as well.  Mostly this will be that some
  * comamnd doesn't include its argument.
+ *
  * \param sfmt - The basic string and format for the specific error
  * \param sarg - Generally the offending argument from the comamnd line.
+ *
  * \return Nothing
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcrelay.c,v 1.4 2021/05/21 21:07:37 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.5 2021/05/26 22:52:32 christos Exp $");
 static const char use_noarg[] = "No argument for command: %s";
 #ifdef RELAY_PORT
 static const char use_port_defined[] = "Port already set, %s inappropriate";
 #if !defined (USE_BPF_RECEIVE) && !defined (USE_LPF_RECEIVE)
 static const char bpf_sock_support[] = "Only LPF and BPF are supported: %s";
 #endif
 #endif
 #ifdef DHCPv6
 static const char use_badproto[] = "Protocol already set, %s inappropriate";
 static const char use_v4command[] = "Command not used for DHCPv6: %s";
 static const char use_v6command[] = "Command not used for DHCPv4: %s";
 #endif
 @@ -1455,28 +1455,29 @@ add_relay_agent_options(struct interface
 	/* Recalculate total packet length. */
 	length = sp -((u_int8_t *)packet);
 	/* Make sure the packet isn't short(this is unlikely, but WTH) */
 	if (length < BOOTP_MIN_LEN) {
 		memset(sp, DHO_PAD, BOOTP_MIN_LEN - length);
 		return (BOOTP_MIN_LEN);
+	}
 	return (length);
+}
 #ifdef DHCPv6
 #ifndef UNIT_TEST
 #ifdef DHCPv6
 /*
  * Parse a downstream argument: [address%]interface[#index].
  */
 static struct stream_list *
 parse_downstream(char *arg) {
 	struct stream_list *dp, *up;
 	struct interface_info *ifp = NULL;
 	char *ifname, *addr, *iid;
 	isc_result_t status;
 	if (!supports_multiple_interfaces(ifp) &&
 	    (downstreams != NULL))
 		log_fatal("No support for multiple interfaces.");
 @@ -2041,59 +2042,56 @@ process_down6(struct packet *packet) {
 		goto cleanup;
+	}
 	/* Send the message to the downstream. */
 	send_packet6(dp->ifp, (unsigned char *) relay_msg.data,
 		     (size_t) relay_msg.len, &to);
       cleanup:
 	if (relay_msg.data != NULL)
 		data_string_forget(&relay_msg, MDL);
 	if (if_id.data != NULL)
 		data_string_forget(&if_id, MDL);
+}
 #endif /* UNIT_TEST */
 /*
  * Called by the dispatch packet handler with a decoded packet.
  */
 void
 dhcpv6(struct packet *packet) {
 #ifndef UNIT_TEST
 	struct stream_list *dp;
 	/* Try all relay-replies downwards. */
 	if (packet->dhcpv6_msg_type == DHCPV6_RELAY_REPL) {
 		process_down6(packet);
 		return;
+	}
 	/* Others are candidates to go up if they come from down. */
 	for (dp = downstreams; dp; dp = dp->next) {
 		if (packet->interface != dp->ifp)
 			continue;
 		process_up6(packet, dp);
 		return;
+	}
 	/* Relay-forward could work from an unknown interface. */
 	if (packet->dhcpv6_msg_type == DHCPV6_RELAY_FORW) {
 		process_up6(packet, NULL);
 		return;
+	}
 	log_info("Can't process packet from interface '%s'.",
 		 packet->interface->name);
 #endif /* UNIT_TEST */
+}
-#endif /* DHCPv6 */
+#endif
 /* Stub routines needed for linking with DHCP libraries. */
 void
 bootp(struct packet *packet) {
 	return;
+}
 void
 dhcp(struct packet *packet) {
 	return;
+}
 #if defined(DHCPv6) && defined(DHCP4o6)
 @@ -2171,13 +2169,14 @@ void request_v4_interface(const char* na
         if (status != ISC_R_SUCCESS) {
                 log_fatal("%s: interface_allocate: %s", name,
                           isc_result_totext(status));
+        }
 	log_debug("Requesting: %s as upstream: %c downstream: %c", name,
 		  (flags & INTERFACE_UPSTREAM ? 'Y' : 'N'),
 		  (flags & INTERFACE_DOWNSTREAM ? 'Y' : 'N'));
         memcpy(tmp->name, name, len);
         interface_snorf(tmp, (INTERFACE_REQUESTED | flags));
         interface_dereference(&tmp, MDL);
+}
 #endif /* UNIT_TEST */

 @@ -1,40 +1,40 @@
-/*	$NetBSD: relay_unittests.c,v 1.2 2020/08/03 21:10:57 christos Exp $	*/
+/*	$NetBSD: relay_unittests.c,v 1.3 2021/05/26 22:52:32 christos Exp $	*/
 /*
  * Copyright (c) 2019-2020 by Internet Systems Consortium, Inc. ("ISC")
+ *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  *   Internet Systems Consortium, Inc.
  *   950 Charter Street
  *   Redwood City, CA 94063
  *   <info@isc.org>
  *   https://www.isc.org/
+ *
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: relay_unittests.c,v 1.2 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: relay_unittests.c,v 1.3 2021/05/26 22:52:32 christos Exp $");
 #include "config.h"
 #include <atf-c.h>
 #include <omapip/omapip_p.h>
 #include "dhcpd.h"
 /* @brief Externs for dhcrelay.c functions under test */
 extern int add_agent_options;
 extern int add_relay_agent_options(struct interface_info *,
                                    struct dhcp_packet *, unsigned,
                                    struct in_addr);
 extern int find_interface_by_agent_option(struct dhcp_packet *,
 @@ -401,13 +401,39 @@ ATF_TC_BODY(add_relay_agent_options_test
         if (check_with_pad(packet.options, output_data, sizeof(output_data),
                            pad) != 0) {
             atf_tc_fail("input_data2: expected output does not match");
+        }
+    }
+}
 ATF_TP_ADD_TCS(tp) {
     ATF_TP_ADD_TC(tp, strip_relay_agent_options_test);
     ATF_TP_ADD_TC(tp, add_relay_agent_options_test);
     return (atf_no_error());
+}
 /* Below are dummy function definitions to satisfy "required" symbols */
 isc_result_t find_class (struct class **c, const char *s,
                          const char *file, int line) {
 	return 0;
+}
 int check_collection (struct packet *packet, struct lease *lease,
                       struct collection *collection) {
 	return 0;
+}
 void classify (struct packet *packet, struct class *class){}
 void bootp(struct packet *packet){}
 void dhcp(struct packet *packet){}
 void dhcpv6(struct packet *packet){}
 int parse_allow_deny (struct option_cache **oc, struct parse *cfile,
                       int flag) {
     return 0;
+}
 isc_result_t dhcp_set_control_state (control_object_state_t oldstate,
                                      control_object_state_t newstate) {
     return (ISC_R_SUCCESS);
+}

 @@ -1,48 +1,48 @@
-/*	$NetBSD: dhcpd.c,v 1.3 2020/08/03 21:10:57 christos Exp $	*/
+/*	$NetBSD: dhcpd.c,v 1.4 2021/05/26 22:52:32 christos Exp $	*/
 /* dhcpd.c
    DHCP Server Daemon. */
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 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
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  *   Internet Systems Consortium, Inc.
  *   950 Charter Street
  *   Redwood City, CA 94063
  *   <info@isc.org>
  *   https://www.isc.org/
+ *
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcpd.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcpd.c,v 1.4 2021/05/26 22:52:32 christos Exp $");
 static const char copyright[] =
-"Copyright 2004-2020 Internet Systems Consortium.";
+"Copyright 2004-2021 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Server";
 static const char url [] =
 "For info, please visit https://www.isc.org/software/dhcp/";
 #include "dhcpd.h"
 #include <omapip/omapip_p.h>
 #include <syslog.h>
 #include <signal.h>
 #include <errno.h>
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/time.h>
 @@ -216,27 +216,27 @@ static void omapi_listener_start (void *
  * If the user has provided an incorrect command line print out
  * the description of the command line.  The arguments provide
  * a way for the caller to request more specific information about
  * the error be printed as well.  Mostly this will be that some
  * comamnd doesn't include its argument.
+ *
  * \param sfmt - The basic string and format for the specific error
  * \param sarg - Generally the offending argument from the comamnd line.
+ *
  * \return Nothing
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcpd.c,v 1.3 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: dhcpd.c,v 1.4 2021/05/26 22:52:32 christos Exp $");
 static char use_noarg[] = "No argument for command: %s ";
 static void
 usage(const char *sfmt, const char *sarg) {
 	log_info("%s %s", message, PACKAGE_VERSION);
 	log_info(copyright);
 	log_info(arr);
 	log_info(url);
 	/* If desired print out the specific error message */
 #ifdef PRINT_SPECIFIC_CL_ERRORS
 	if (sfmt != NULL)
 		log_error(sfmt, sarg);