开源软件构建与测试

_service:tar_scm:dhcp.spec Changed

@@ -2,8 +2,8 @@
 %global dhcpconfdir %{_sysconfdir}/dhcp
 
 Name: dhcp
-Version: 4.4.2
-Release: 12
+Version: 4.4.3
+Release: 1
 Summary: Dynamic host configuration protocol software
 #Please don't change the epoch on this package
 Epoch: 12
@@ -45,25 +45,24 @@
 Patch25: backport-0025-bind-Detect-system-time-changes.patch
 Patch26: backport-0026-Add-dhclient-5-B-option-description.patch
 Patch27: backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch
-
 Patch28: bugfix-dhcp-4.2.5-check-dhclient-pid.patch
 Patch29: bugfix-reduce-getifaddr-calls.patch
-
 Patch30: bugfix-dhcpd-2038-problem.patch
 Patch31: dhcpd-coredump-infiniband.patch
 Patch32: bugfix-dhclient-check-if-pid-was-held.patch
 Patch33: bugfix-dhcp-64-bit-lease-parse.patch
-Patch34: backport-CVE-2021-25217.patch
-Patch35: fix-multiple-definition-with-gcc-10-1.patch
-Patch36: fix-multiple-definition-with-gcc-10-2.patch
-
-Patch37: fix-coredump-when-client-active-is-NULL.patch
-Patch38: feature-lease-time-config-ipv6.patch
-Patch39: add-a-test-case-to-parse-code93-in-option_unittest.patch
-Patch40: bugfix-error-message-display.patch
+Patch34: fix-coredump-when-client-active-is-NULL.patch
+Patch35: feature-lease-time-config-ipv6.patch
+Patch36: add-a-test-case-to-parse-code93-in-option_unittest.patch
+Patch37: bugfix-error-message-display.patch
+Patch38: backport-Fix-CVE-2021-25220.patch
+Patch39: backport-Fix-CVE-2022-2928.patch
+Patch40: backport-Fix-CVE-2022-2929.patch
 
 BuildRequires: gcc autoconf automake libtool openldap-devel krb5-devel libcap-ng-devel
 BuildRequires: systemd systemd-devel
+# run tests need
+BuildRequires: kyua atf-tests
 
 Requires: shadow-utils coreutils grep sed systemd gawk ipcalc iproute iputils
 
@@ -116,8 +115,12 @@
 --with-cli-pid-file=%{_localstatedir}/run/dhclient.pid \
 --with-cli6-pid-file=%{_localstatedir}/run/dhclient6.pid \
 --with-relay-pid-file=%{_localstatedir}/run/dhcrelay.pid \
- --with-ldap --with-ldapcrypto --with-ldap-gssapi --disable-static --enable-log-pid --enable-paranoia --enable-early-chroot \
- --enable-binary-leases --with-systemd
+ --with-ldap --with-ldapcrypto --with-ldap-gssapi --enable-log-pid --enable-paranoia --enable-early-chroot \
+ --enable-binary-leases --with-systemd \
+ --with-atf
+
+# define LDAP_CONFIGURATION when run common tests
+sed -i "s/ATF_CFLAGS =/ATF_CFLAGS = -DLDAP_CONFIGURATION/g" common/tests/Makefile
 
 make
 
@@ -184,16 +187,17 @@
 EOF
 
 rm -f $RPM_BUILD_ROOT/usr/lib/debug/usr/sbin/dhcrelay-4.3.6-28.7.aarch64.debug
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/dhclient.conf.example
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/dhcpd.conf.example
-
-
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/dhcp-client
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/dhcp-server
+
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/dhclient.conf.example doc/examples/dhclient-dhcpv4.conf
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/dhcpd.conf.example doc/examples/dhcpd-dhcpv4.conf
+install -p -m 0755 doc/examples/dhclient-dhcpv4.conf $RPM_BUILD_ROOT%{_datadir}/doc/dhcp-client/dhclient.conf.example
+install -p -m 0755 doc/examples/dhcpd-dhcpv4.conf $RPM_BUILD_ROOT%{_datadir}/doc/dhcp-server/dhcpd.conf.example
+
 install -p -m 0755 doc/examples/dhclient-dhcpv6.conf $RPM_BUILD_ROOT%{_datadir}/doc/dhcp-client/dhclient6.conf.example
 install -p -m 0755 doc/examples/dhcpd-dhcpv6.conf $RPM_BUILD_ROOT%{_datadir}/doc/dhcp-server/dhcpd6.conf.example
-install -p -m 0755 server/dhcpd.conf.example $RPM_BUILD_ROOT%{_datadir}/doc/dhcp-server/dhcpd.conf.example
 
 install -D -p -m 0644 contrib/ldap/dhcp.schema $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/dhcp.schema
 
@@ -245,11 +249,12 @@
 %defattr(-,root,root)
 %license LICENSE
 %doc README RELNOTES doc/References.txt
-%doc README.dhclient.d client/dhclient.conf.example
+%doc README.dhclient.d
 %doc contrib/ldap/ contrib/dhcp-lease-list.pl
+%{_datadir}/doc/dhcp-client/dhclient.conf.example
+%{_datadir}/doc/dhcp-server/dhcpd.conf.example
 %{_datadir}/doc/dhcp-client/dhclient6.conf.example
 %{_datadir}/doc/dhcp-server/dhcpd6.conf.example
-%{_datadir}/doc/dhcp-server/dhcpd.conf.example
 %dir %{_sysconfdir}/openldap/schema
 %config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
 %attr(0750,root,root) %dir %{dhcpconfdir}
@@ -301,6 +306,30 @@
 %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Oct 25 2022 renmingshuai <renmingshuai@huawei.com> - 12:4.4.3-1
+- Type:requirement
+- ID:
+- SUG:restart
+- DESC:update to 4.4.3
+
+* Mon Oct 17 2022 renmingshuai <renmingshuai@huawei.com> - 12:4.4.2-15
+- Type:cves
+- ID:CVE-2022-2928,CVE-2022-2929
+- SUG:restart
+- DESC:Fix CVE-2022-2928 and CVE-2022-2929
+
+* Tue Sep 27 2022 renmingshuai <renmingshuai@huawei.com> - 12:4.4.2-14
+- Type:cves
+- ID:CVE-2021-25214, CVE-2021-25215, CVE-2021-25219, CVE-2021-25220
+- SUG:restart
+- DESC:Fix CVE-2021-25214 CVE-2021-25215 CVE-2021-25219 CVE-2021-25220
+
+* Sat Jul 30 2022 renmingshuai <renmingshuai@huawei.com> - 4.4.2-13
+- Type:bugfix
+- ID:NA
+- SUG:restart
+- DESC:add dhX.conf.example in doc
+
 * Tue Feb 22 2022 zengwefeng <zwfeng@huawei.com> - 4.4.2-12
 - Type:bugfix
 - ID:NA

_service:tar_scm:add-a-test-case-to-parse-code93-in-option_unittest.patch Changed

@@ -4,14 +4,14 @@
 Subject: PATCH add a test case to parse code93 in option_unittest
 
 ---
- common/tests/option_unittest.c | 70 ++++++++++++++++++++++++++++++++++
- 1 file changed, 70 insertions(+)
+ common/tests/option_unittest.c | 71 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 71 insertions(+)
 
 diff --git a/common/tests/option_unittest.c b/common/tests/option_unittest.c
-index cd52cfb..0bb6517 100644
+index 600ebe6..688762d 100644
 --- a/common/tests/option_unittest.c
 +++ b/common/tests/option_unittest.c
-@@ -129,6 +129,75 @@ ATF_TC_BODY(pretty_print_option, tc)
+@@ -213,6 +213,76 @@ ATF_TC_BODY(parse_X, tc)
 }
 }
 
@@ -84,17 +84,18 @@
 + atf_tc_fail("pretty_print_option did not return \"<error>\"");
 + }
 +}
- 
++
 /* This macro defines main() method that will call specified
 test cases. tp and simple_test_case names can be whatever you want
-@@ -137,6 +206,7 @@ ATF_TP_ADD_TCS(tp)
- {
+ as long as it is a valid variable identifier. */
+@@ -221,6 +291,7 @@ 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);
 + ATF_TP_ADD_TC(tp, parse_code93_option);
 
 return (atf_no_error());
 }
 -- 
-2.19.1
+2.23.0

_service:tar_scm:backport-0002-additional-dhclient-options.patch Changed

@@ -1,24 +1,24 @@
-Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0002-additional-dhclient-options.patch
-From a26161b0fd45cdbeed3038ac63ff04e3b727248f Mon Sep 17 00:00:00 2001
+Reference:
+https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0002-additional-dhclient-options.patch
+From af18c830fe55f6be0b89997a36b611d981e3c25d Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:19:47 +0100
-Subject: PATCH 02/26 additional dhclient options
-Cc: pzhukov@redhat.com
+Subject: PATCH 02/28 additional dhclient options
 
 ---
 client/clparse.c | 10 +-
- client/dhclient.8 | 27 ++++++
- client/dhclient.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ client/dhclient.8 | 27 +++++
+ client/dhclient.c | 271 +++++++++++++++++++++++++++++++++++++++++++-
 common/conflex.c | 2 +
 includes/dhcpd.h | 3 +
- includes/dhctoken.h | 1 +
- 6 files changed, 308 insertions(+), 6 deletions(-)
+ includes/dhctoken.h | 3 +-
+ 6 files changed, 309 insertions(+), 7 deletions(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index eaf48a8..7212e3a 100644
+index 74ca499..bb63825 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
-@@ -189,6 +189,7 @@ isc_result_t read_client_conf ()
+@@ -192,6 +192,7 @@ isc_result_t read_client_conf ()
 	/* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
 	 */
 	top_level_config.requested_lease = 7200;
@@ -26,7 +26,7 @@
 
 	group_allocate (&top_level_config.on_receipt, MDL);
 	if (!top_level_config.on_receipt)
-@@ -394,7 +395,8 @@ void read_client_leases ()
+@@ -397,7 +398,8 @@ void read_client_leases ()
 	interface-declaration |
 	LEASE client-lease-statement |
 	ALIAS client-lease-statement |
@@ -36,7 +36,7 @@
 
 void parse_client_statement (cfile, ip, config)
 	struct parse *cfile;
-@@ -817,6 +819,12 @@ void parse_client_statement (cfile, ip, config)
+@@ -820,6 +822,12 @@ void parse_client_statement (cfile, ip, config)
 		parse_lease_id_format(cfile);
 		break;
 
@@ -50,10 +50,10 @@
 	 default:
 		lose = 0;
 diff --git a/client/dhclient.8 b/client/dhclient.8
-index ebc750f..6d7fbdb 100644
+index 861ff56..5029dac 100644
 --- a/client/dhclient.8
 +++ b/client/dhclient.8
-@@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Protocol Client
+@@ -135,6 +135,33 @@ dhclient - Dynamic Host Configuration Protocol Client
 .B -w
 
 
@@ -88,7 +88,7 @@
 .I seconds
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 825ab00..26a333c 100644
+index 46dc3a7..6c1c09a 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
 @@ -41,6 +41,12 @@
@@ -104,7 +104,7 @@
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 
-@@ -110,6 +116,10 @@ char *mockup_relay = NULL;
+@@ -113,6 +119,10 @@ char *mockup_relay = NULL;
 
 char *progname = NULL;
 
@@ -115,7 +115,7 @@
 void run_stateless(int exit_mode, u_int16_t port);
 
 static isc_result_t write_duid(struct data_string *duid);
-@@ -183,8 +193,12 @@ static const char use_v6command = "Command not used for DHCPv4: %s";
+@@ -189,8 +199,12 @@ static const char use_v6command = "Command not used for DHCPv4: %s";
 " -s server-addr -cf config-file\n" \
 " -df duid-file -lf lease-file\n" \
 " -pf pid-file --no-pid -e VAR=val\n" \
@@ -130,7 +130,7 @@
 #define DHCLIENT_USAGEH "{--version|--help|-h}"
 
 static void
-@@ -243,6 +257,16 @@ main(int argc, char **argv) {
+@@ -249,6 +263,16 @@ main(int argc, char **argv) {
 #else
 	progname = argv0;
 #endif
@@ -147,7 +147,7 @@
 	/* Initialize client globals. */
 	memset(&default_duid, 0, sizeof(default_duid));
 
-@@ -558,6 +582,89 @@ main(int argc, char **argv) {
+@@ -564,6 +588,89 @@ main(int argc, char **argv) {
 			std_dhcid = 1;
 		} else if (!strcmp(argvi, "-v")) {
 			quiet = 0;
@@ -237,7 +237,7 @@
 		} else if (argvi0 == '-') {
 			usage("Unknown command: %s", argvi);
 		} else if (interfaces_requested < 0) {
-@@ -754,6 +861,156 @@ main(int argc, char **argv) {
+@@ -760,6 +867,156 @@ main(int argc, char **argv) {
 	/* Parse the dhclient.conf file. */
 	read_client_conf();
 
@@ -394,7 +394,7 @@
 	/* Parse the lease database. */
 	read_client_leases();
 
-@@ -3226,7 +3483,8 @@ void make_discover (client, lease)
+@@ -3472,7 +3729,8 @@ void make_discover (client, lease)
 	client -> packet.xid = random ();
 	client -> packet.secs = 0; /* filled in by send_discover. */
 
@@ -404,7 +404,7 @@
 		client -> packet.flags = 0;
 	else
 		client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3311,7 +3569,9 @@ void make_request (client, lease)
+@@ -3557,7 +3815,9 @@ void make_request (client, lease)
 	} else {
 		memset (&client -> packet.ciaddr, 0,
 			sizeof client -> packet.ciaddr);
@@ -415,7 +415,7 @@
 			client -> packet.flags = 0;
 		else
 			client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -3374,7 +3634,8 @@ void make_decline (client, lease)
+@@ -3620,7 +3880,8 @@ void make_decline (client, lease)
 	client -> packet.hops = 0;
 	client -> packet.xid = client -> xid;
 	client -> packet.secs = 0; /* Filled in by send_request. */
@@ -426,7 +426,7 @@
 	else
 		client -> packet.flags = htons (BOOTP_BROADCAST);
 diff --git a/common/conflex.c b/common/conflex.c
-index 045b655..71c0bf5 100644
+index 8b01dfb..1fa2be3 100644
 --- a/common/conflex.c
 +++ b/common/conflex.c
 @@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) {
@@ -439,10 +439,10 @@
 	 case 'c':
 		if (!strcasecmp(atom + 1, "ase"))
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 5930e6a..018fa34 100644
+index f68b228..3b2e2ca 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -1269,6 +1269,9 @@ struct client_config {
+@@ -1284,6 +1284,9 @@ struct client_config {
 
 	int lease_id_format;		/* format for IDs in lease file,
 					 TOKEN_OCTAL or TOKEN_HEX */
@@ -453,17 +453,19 @@
 
 /* Per-interface state used in the dhcp client... */
 diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index 5920f4f..7e7215a 100644
+index e6d125f..6daa422 100644
 --- a/includes/dhctoken.h
 +++ b/includes/dhctoken.h
-@@ -377,6 +377,7 @@ enum dhcp_token {
+@@ -377,7 +377,8 @@ enum dhcp_token {
 	TOKEN_HEX = 677,
 	TOKEN_OCTAL = 678,
- 	KEY_ALGORITHM = 679
-+ BOOTP_BROADCAST_ALWAYS = 680
+ 	KEY_ALGORITHM = 679,
+-	DISCONNECT = 680
++	BOOTP_BROADCAST_ALWAYS = 680,
++	DISCONNECT = 681
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch Changed

@@ -1,19 +1,18 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch
-From af504e99abde04b881768d18eaa0054b36b16303 Mon Sep 17 00:00:00 2001
+From be8f73c399c0f89192e57453db153aaa48fcbb2e Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:21:14 +0100
-Subject: PATCH 03/26 Handle releasing interfaces requested by /sbin/ifup
-Cc: pzhukov@redhat.com
+Subject: PATCH 03/28 Handle releasing interfaces requested by /sbin/ifup
 
 ---
- client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 26a333c..2a2e9e6 100644
+index 6c1c09a..07679a7 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -787,9 +787,81 @@ main(int argc, char **argv) {
+@@ -793,9 +793,81 @@ main(int argc, char **argv) {
 				}
 			}
 			fclose(pidfd);
@@ -96,5 +95,5 @@
 		log_info("%s %s", message, PACKAGE_VERSION);
 		log_info(copyright);
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch Changed

@@ -1,10 +1,9 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch
-From 7e8cc8388ac31c5c2b1a423c6b2da0491b19f6f9 Mon Sep 17 00:00:00 2001
+From 0a640394cb6f4a97fb87e53f049fba23523035c8 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:22:41 +0100
-Subject: PATCH 04/26 Support unicast BOOTP for IBM pSeries systems (and
+Subject: PATCH 04/28 Support unicast BOOTP for IBM pSeries systems (and
 maybe others)
-Cc: pzhukov@redhat.com
 
 ---
 server/bootp.c | 12 +++++++++++-
@@ -12,7 +11,7 @@
 2 files changed, 37 insertions(+), 8 deletions(-)
 
 diff --git a/server/bootp.c b/server/bootp.c
-index 26a7607..2212f31 100644
+index 919d483..338aac0 100644
 --- a/server/bootp.c
 +++ b/server/bootp.c
 @@ -52,6 +52,7 @@ void bootp (packet)
@@ -49,10 +48,10 @@
 	/* If it comes from a client that already knows its address
 	 and is not requesting a broadcast response, and we can
 diff --git a/server/dhcp.c b/server/dhcp.c
-index 6f3a91f..20f2a62 100644
+index 0b261c2..ae805a6 100644
 --- a/server/dhcp.c
 +++ b/server/dhcp.c
-@@ -5224,6 +5224,7 @@ int locate_network (packet)
+@@ -5332,6 +5332,7 @@ int locate_network (packet)
 	struct data_string data;
 	struct subnet *subnet = (struct subnet *)0;
 	struct option_cache *oc;
@@ -60,7 +59,7 @@
 
 #if defined(DHCPv6) && defined(DHCP4o6)
 	if (dhcpv4_over_dhcpv6 && (packet->dhcp4o6_response != NULL)) {
-@@ -5245,12 +5246,24 @@ int locate_network (packet)
+@@ -5353,12 +5354,24 @@ int locate_network (packet)
 	 from the interface, if there is one. If not, fail. */
 	if (!oc && !packet -> raw -> giaddr.s_addr) {
 		if (packet -> interface -> shared_network) {
@@ -90,7 +89,7 @@
 	}
 
 	/* If there's an option indicating link connection, and it's valid,
-@@ -5277,7 +5290,10 @@ int locate_network (packet)
+@@ -5384,7 +5397,10 @@ int locate_network (packet)
 		data_string_forget (&data, MDL);
 	} else {
 		ia.len = 4;
@@ -102,7 +101,7 @@
 	}
 
 	/* If we know the subnet on which the IP address lives, use it. */
-@@ -5285,7 +5301,10 @@ int locate_network (packet)
+@@ -5392,7 +5408,10 @@ int locate_network (packet)
 		shared_network_reference (&packet -> shared_network,
 					 subnet -> shared_network, MDL);
 		subnet_dereference (&subnet, MDL);
@@ -115,5 +114,5 @@
 
 	/* Otherwise, fail. */
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0005-Change-default-requested-options.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0005-Change-default-requested-options.patch
-From a2a3554ff9e05d1a8e2c8aa843f1b6a33fce87e3 Mon Sep 17 00:00:00 2001
+From f994c4d208a8fe88cbf78d4374c8d44793f0598e Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:24:24 +0100
-Subject: PATCH 05/26 Change default requested options
-Cc: pzhukov@redhat.com
+Subject: PATCH 05/28 Change default requested options
 
 Add NIS domain, NIS servers, NTP servers, interface-mtu and domain-search
 to the list of default requested DHCP options
@@ -12,7 +11,7 @@
 1 file changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index 7212e3a..39b95a0 100644
+index bb63825..e63ea08 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
 @@ -31,7 +31,7 @@
@@ -24,7 +23,7 @@
 /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
 struct option *default_requested_optionsNUM_DEFAULT_REQUESTED_OPTS + 2 + 1;
 
-@@ -116,6 +116,31 @@ isc_result_t read_client_conf ()
+@@ -119,6 +119,31 @@ isc_result_t read_client_conf ()
 	option_code_hash_lookup(&default_requested_options8,
 				dhcpv6_universe.code_hash, &code, 0, MDL);
 
@@ -57,5 +56,5 @@
 		if (default_requested_optionscode == NULL)
 			log_fatal("Unable to find option definition for "
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0006-Various-man-page-only-fixes.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0006-Various-man-page-only-fixes.patch
-From 846779467f7393b19e8d206405116e1e26e16efc Mon Sep 17 00:00:00 2001
+From d359a7dc30e0423f9b90129291538cad1ee6a6d9 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:25:53 +0100
-Subject: PATCH 06/26 Various man-page-only fixes
-Cc: pzhukov@redhat.com
+Subject: PATCH 06/28 Various man-page-only fixes
 
 ---
 client/dhclient-script.8 | 22 +++++++++++++++++++++-
@@ -13,7 +12,7 @@
 4 files changed, 58 insertions(+), 7 deletions(-)
 
 diff --git a/client/dhclient-script.8 b/client/dhclient-script.8
-index 3553afd..0db5516 100644
+index 5e5bd3d..37ecdc5 100644
 --- a/client/dhclient-script.8
 +++ b/client/dhclient-script.8
 @@ -43,7 +43,7 @@ customizations are needed, they should be possible using the enter and
@@ -53,7 +52,7 @@
 When dhclient needs to invoke the client configuration script, it
 defines a set of variables in the environment, and then invokes
 diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5
-index fa3b908..566a881 100644
+index dbe6f7e..8bac980 100644
 --- a/client/dhclient.conf.5
 +++ b/client/dhclient.conf.5
 @@ -228,7 +228,8 @@ responding to the client send the client its values for the specified
@@ -85,10 +84,10 @@
 .SH SAMPLE
 The following configuration file was used on a laptop running NetBSD
 diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
-index 33d4804..d9e1197 100644
+index 51f80f7..a784b32 100644
 --- a/common/dhcp-options.5
 +++ b/common/dhcp-options.5
-@@ -1068,6 +1068,21 @@ classless IP routing - it does not include a subnet mask. Since
+@@ -1075,6 +1075,21 @@ classless IP routing - it does not include a subnet mask. Since
 classless IP routing is now the most widely deployed routing standard,
 this option is virtually useless, and is not implemented by any of the
 popular DHCP clients, for example the Microsoft DHCP client.
@@ -111,7 +110,7 @@
 .PP
 .nf
 diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
-index 17330d4..89b5540 100644
+index 691e5dd..b7e79ea 100644
 --- a/server/dhcpd.conf.5
 +++ b/server/dhcpd.conf.5
 @@ -527,6 +527,9 @@ pool {
@@ -154,7 +153,7 @@
 secret pRP5FapFoJ95JEL06sv4PQ==;
 };
 
-@@ -2912,7 +2915,8 @@ statement
+@@ -2918,7 +2921,8 @@ statement
 The \fInext-server\fR statement is used to specify the host address of
 the server from which the initial boot file (specified in the
 \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
@@ -165,5 +164,5 @@
 .PP
 The
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0007-Change-paths-to-conform-to-our-standards.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0007-Change-paths-to-conform-to-our-standards.patch
-From ac65289663532db0bc1de449ca2a0eb4c8c2ca6f Mon Sep 17 00:00:00 2001
+From d8da92991d93a3d1c9fc474696aee25b99623c42 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:26:34 +0100
-Subject: PATCH 07/26 Change paths to conform to our standards
-Cc: pzhukov@redhat.com
+Subject: PATCH 07/28 Change paths to conform to our standards
 
 ---
 doc/examples/dhcpd-dhcpv6.conf | 2 +-
@@ -24,10 +23,10 @@
 # Static definition (must be global)
 host myclient {
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 018fa34..3632a6b 100644
+index 3b2e2ca..4a57002 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -1545,7 +1545,7 @@ typedef unsigned char option_mask 16;
+@@ -1561,7 +1561,7 @@ typedef unsigned char option_mask 16;
 #else /* !DEBUG */
 
 #ifndef _PATH_DHCPD_CONF
@@ -36,7 +35,7 @@
 #endif /* DEBUG */
 
 #ifndef _PATH_DHCPD_DB
-@@ -1567,11 +1567,11 @@ typedef unsigned char option_mask 16;
+@@ -1583,11 +1583,11 @@ typedef unsigned char option_mask 16;
 #endif /* DEBUG */
 
 #ifndef _PATH_DHCLIENT_CONF
@@ -51,5 +50,5 @@
 
 #ifndef _PATH_DHCLIENT_PID
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch Changed

@@ -1,10 +1,9 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch
-From d2da34706f140101c34f6a9806c258411806a939 Mon Sep 17 00:00:00 2001
+From 39ce1ca26128f4a5d018a567157320ba1f68f4ea Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:27:18 +0100
-Subject: PATCH 08/26 Make sure all open file descriptors are closed-on-exec
+Subject: PATCH 08/28 Make sure all open file descriptors are closed-on-exec
 for SELinux
-Cc: pzhukov@redhat.com
 
 ISC-bug: #19148
 ---
@@ -24,10 +23,10 @@
 13 files changed, 40 insertions(+), 40 deletions(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index 39b95a0..44387ed 100644
+index e63ea08..902b523 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
-@@ -288,7 +288,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip,
+@@ -291,7 +291,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip,
 	int token;
 	isc_result_t status;
 
@@ -36,7 +35,7 @@
 		return uerr2isc (errno);
 
 	cfile = NULL;
-@@ -364,7 +364,7 @@ void read_client_leases ()
+@@ -367,7 +367,7 @@ void read_client_leases ()
 
 	/* Open the lease file. If we can't open it, just return -
 	 we can safely trust the server to remember our state. */
@@ -46,10 +45,10 @@
 
 	cfile = NULL;
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 2a2e9e6..a86ab9e 100644
+index 07679a7..aefc119 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -273,11 +273,11 @@ main(int argc, char **argv) {
+@@ -279,11 +279,11 @@ main(int argc, char **argv) {
 	/* Make sure that file descriptors 0 (stdin), 1, (stdout), and
 	 2 (stderr) are open. To do this, we assume that when we
 	 open a file the lowest available file descriptor is used. */
@@ -64,7 +63,7 @@
 	if (fd == 2)
 		log_perror = 0; /* No sense logging to /dev/null. */
 	else if (fd != -1)
-@@ -765,7 +765,7 @@ main(int argc, char **argv) {
+@@ -771,7 +771,7 @@ main(int argc, char **argv) {
 		long temp;
 		int e;
 
@@ -73,7 +72,7 @@
 			e = fscanf(pidfd, "%ld\n", &temp);
 			oldpid = (pid_t)temp;
 
-@@ -820,7 +820,7 @@ main(int argc, char **argv) {
+@@ -826,7 +826,7 @@ main(int argc, char **argv) {
 					strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
 					sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
 
@@ -82,7 +81,7 @@
 						e = fscanf(pidfd, "%ld\n", &temp);
 						oldpid = (pid_t)temp;
 
-@@ -845,7 +845,7 @@ main(int argc, char **argv) {
+@@ -851,7 +851,7 @@ main(int argc, char **argv) {
 		int dhc_running = 0;
 		char procfn256 = "";
 
@@ -91,7 +90,7 @@
 			if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
 				snprintf(procfn,256,"/proc/%u",dhcpid);
 				dhc_running = (access(procfn, F_OK) == 0);
-@@ -3808,7 +3808,7 @@ void rewrite_client_leases ()
+@@ -4054,7 +4054,7 @@ void rewrite_client_leases ()
 
 	if (leaseFile != NULL)
 		fclose (leaseFile);
@@ -100,7 +99,7 @@
 	if (leaseFile == NULL) {
 		log_error ("can't create %s: %m", path_dhclient_db);
 		return;
-@@ -4003,7 +4003,7 @@ write_duid(struct data_string *duid)
+@@ -4249,7 +4249,7 @@ write_duid(struct data_string *duid)
 		return DHCP_R_INVALIDARG;
 
 	if (leaseFile == NULL) {	/* XXX? */
@@ -109,7 +108,7 @@
 		if (leaseFile == NULL) {
 			log_error("can't create %s: %m", path_dhclient_db);
 			return ISC_R_IOERROR;
-@@ -4207,7 +4207,7 @@ int write_client_lease (client, lease, rewrite, makesure)
+@@ -4453,7 +4453,7 @@ int write_client_lease (client, lease, rewrite, makesure)
 		return 1;
 
 	if (leaseFile == NULL) {	/* XXX */
@@ -118,7 +117,7 @@
 		if (leaseFile == NULL) {
 			log_error ("can't create %s: %m", path_dhclient_db);
 			return 0;
-@@ -4786,9 +4786,9 @@ void detach ()
+@@ -5039,9 +5039,9 @@ void detach ()
 	(void) close(2);
 
 	/* Reopen them on /dev/null. */
@@ -131,7 +130,7 @@
 
 	write_client_pid_file ();
 
-@@ -4806,14 +4806,14 @@ void write_client_pid_file ()
+@@ -5059,14 +5059,14 @@ void write_client_pid_file ()
 		return;
 	}
 
@@ -149,7 +148,7 @@
 		close(pfdesc);
 		log_error ("Can't fdopen %s: %m", path_dhclient_pid);
 diff --git a/common/bpf.c b/common/bpf.c
-index 16076fe..67b6d64 100644
+index 0bffcbf..d2a0549 100644
 --- a/common/bpf.c
 +++ b/common/bpf.c
 @@ -94,7 +94,7 @@ int if_register_bpf (info)
@@ -162,20 +161,20 @@
 			if (errno == EBUSY) {
 				continue;
 diff --git a/common/dlpi.c b/common/dlpi.c
-index 3990bf1..a941258 100644
+index f2332c0..bf6e21f 100644
 --- a/common/dlpi.c
 +++ b/common/dlpi.c
 @@ -817,7 +817,7 @@ dlpiopen(const char *ifname) {
 	}
 	*dp = '\0';
- 	
+ 
 -	return open (devname, O_RDWR, 0);
 +	return open (devname, O_RDWR | O_CLOEXEC, 0);
 }
 
 /*
 diff --git a/common/nit.c b/common/nit.c
-index d822c15..a9132bc 100644
+index ba62488..4ebfa4a 100644
 --- a/common/nit.c
 +++ b/common/nit.c
 @@ -75,7 +75,7 @@ int if_register_nit (info)
@@ -188,7 +187,7 @@
 		log_fatal ("Can't open NIT device for %s: %m", info -> name);
 
 diff --git a/common/resolv.c b/common/resolv.c
-index a01f520..b209e3f 100644
+index 5fd683f..3535f3e 100644
 --- a/common/resolv.c
 +++ b/common/resolv.c
 @@ -43,7 +43,7 @@ void read_resolv_conf (parse_time)
@@ -201,7 +200,7 @@
 		return;
 	}
 diff --git a/common/upf.c b/common/upf.c
-index 9785879..e0a524f 100644
+index 37e5cb2..b7c0649 100644
 --- a/common/upf.c
 +++ b/common/upf.c
 @@ -71,7 +71,7 @@ int if_register_upf (info)
@@ -214,7 +213,7 @@
 			if (errno == EBUSY) {
 				continue;
 diff --git a/omapip/trace.c b/omapip/trace.c
-index 45bd508..5ea7486 100644
+index dc9185f..a605d18 100644
 --- a/omapip/trace.c
 +++ b/omapip/trace.c
 @@ -136,10 +136,10 @@ isc_result_t trace_begin (const char *filename,
@@ -240,10 +239,10 @@
 		log_error("Can't open tracefile %s: %m", filename);
 		return;
 diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index d8caaaf..ea1be18 100644
+index 946ef1b..a7b1286 100644
 --- a/relay/dhcrelay.c
 +++ b/relay/dhcrelay.c
-@@ -296,11 +296,11 @@ main(int argc, char **argv) {
+@@ -305,11 +305,11 @@ main(int argc, char **argv) {
 	/* Make sure that file descriptors 0(stdin), 1,(stdout), and
 	 2(stderr) are open. To do this, we assume that when we
 	 open a file the lowest available file descriptor is used. */
@@ -258,7 +257,7 @@
 	if (fd == 2)
 		log_perror = 0; /* No sense logging to /dev/null. */
 	else if (fd != -1)
-@@ -776,13 +776,13 @@ main(int argc, char **argv) {
+@@ -800,13 +800,13 @@ main(int argc, char **argv) {
 		/* Create the pid file. */
 		if (no_pid_file == ISC_FALSE) {
 			pfdesc = open(path_dhcrelay_pid,
@@ -275,7 +274,7 @@
 					log_error("Can't fdopen %s: %m",
 						 path_dhcrelay_pid);
 diff --git a/server/confpars.c b/server/confpars.c
-index d2cedfe..2743979 100644
+index 103af1e..5a6396b 100644
 --- a/server/confpars.c
 +++ b/server/confpars.c
 @@ -118,7 +118,7 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
@@ -288,7 +287,7 @@
 			log_error ("Can't open lease database %s: %m --",
 				 path_dhcpd_db);
 diff --git a/server/db.c b/server/db.c
-index 67e6cc1..6181528 100644
+index cecbf6b..4243a92 100644
 --- a/server/db.c
 +++ b/server/db.c
 @@ -1154,7 +1154,7 @@ int new_lease_file (int test_mode)
@@ -310,7 +309,7 @@
 		close(db_fd);
 		goto fdfail;
 diff --git a/server/dhcpd.c b/server/dhcpd.c
-index 55ffae7..530a923 100644
+index 3522889..845d0cc 100644
 --- a/server/dhcpd.c
 +++ b/server/dhcpd.c
 @@ -300,11 +300,11 @@ main(int argc, char **argv) {
@@ -351,10 +350,10 @@
 
 		IGNORE_RET (chdir("/"));
 diff --git a/server/ldap.c b/server/ldap.c
-index 5126d24..555545c 100644
+index e3e48f4..1a68936 100644
 --- a/server/ldap.c
 +++ b/server/ldap.c
-@@ -1446,7 +1446,7 @@ ldap_start (void)
+@@ -1447,7 +1447,7 @@ ldap_start (void)
 
 if (ldap_debug_file != NULL && ldap_debug_fd == -1)
 {
@@ -364,5 +363,5 @@
 log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
 strerror (errno));
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0009-Fix-garbage-in-format-string-error.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0009-Fix-garbage-in-format-string-error.patch
-From a0a2186ce52a31357d4eb3c32d7d6887e4603814 Mon Sep 17 00:00:00 2001
+From cfe6414644b68d5b6b5ba150bf57cff0a709a59e Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:28:13 +0100
-Subject: PATCH 09/26 Fix 'garbage in format string' error
-Cc: pzhukov@redhat.com
+Subject: PATCH 09/28 Fix 'garbage in format string' error
 
 RHBZ: 450042
 ---
@@ -11,10 +10,10 @@
 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/common/tables.c b/common/tables.c
-index c1aa214..d2294c0 100644
+index be37737..ce12fcd 100644
 --- a/common/tables.c
 +++ b/common/tables.c
-@@ -215,7 +215,7 @@ static struct option dhcp_options = {
+@@ -222,7 +222,7 @@ static struct option dhcp_options = {
 	{ "name-service-search", "Sa",		&dhcp_universe, 117, 1 },
 #endif
 	{ "subnet-selection", "I",		&dhcp_universe, 118, 1 },
@@ -24,5 +23,5 @@
 	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
 #if 0
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0010-Handle-null-timeout.patch Changed

_service:tar_scm:backport-0011-Drop-unnecessary-capabilities.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0011-Drop-unnecessary-capabilities.patch
-From 3b37f4b7bb3a17f8bd655be919915a1912062ea6 Mon Sep 17 00:00:00 2001
+From 7ea2433d716172f160c9380ed0bb852fafe845a2 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:30:28 +0100
-Subject: PATCH 11/26 Drop unnecessary capabilities
-Cc: pzhukov@redhat.com
+Subject: PATCH 11/28 Drop unnecessary capabilities
 
 dhclient (#517649, #546765), dhcpd/dhcrelay (#699713)
 ---
@@ -30,10 +29,10 @@
 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
 EXTRA_DIST = $(man_MANS)
 diff --git a/client/dhclient-script.8 b/client/dhclient-script.8
-index 0db5516..2eddb8f 100644
+index 37ecdc5..1a88e0e 100644
 --- a/client/dhclient-script.8
 +++ b/client/dhclient-script.8
-@@ -243,6 +243,16 @@ repeatedly initialized to the values provided by one server, and then
+@@ -249,6 +249,16 @@ repeatedly initialized to the values provided by one server, and then
 the other. Assuming the information provided by both servers is
 valid, this shouldn't cause any real problems, but it could be
 confusing.
@@ -51,10 +50,10 @@
 dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
 dhclient.leases(5).
 diff --git a/client/dhclient.8 b/client/dhclient.8
-index 6d7fbdb..0145b9f 100644
+index 5029dac..bacf3bc 100644
 --- a/client/dhclient.8
 +++ b/client/dhclient.8
-@@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Protocol Client
+@@ -135,6 +135,9 @@ dhclient - Dynamic Host Configuration Protocol Client
 .B -w
 
 
@@ -64,7 +63,7 @@
 .B -B
 
 
-@@ -328,6 +331,32 @@ not to exit when it doesn't find any such interfaces. The
+@@ -329,6 +332,32 @@ not to exit when it doesn't find any such interfaces. The
 program can then be used to notify the client when a network interface
 has been added or removed, so that the client can attempt to configure an IP
 address on that interface.
@@ -98,7 +97,7 @@
 .BI \-n
 Do not configure any interfaces. This is most likely to be useful in
 diff --git a/client/dhclient.c b/client/dhclient.c
-index a86ab9e..5d3f5bc 100644
+index aefc119..b49fcb3 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
 @@ -41,6 +41,10 @@
@@ -112,7 +111,7 @@
 /*
 * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
 * that when building ISC code.
-@@ -266,6 +270,9 @@ main(int argc, char **argv) {
+@@ -272,6 +276,9 @@ main(int argc, char **argv) {
 	int timeout_arg = 0;
 	char *arg_conf = NULL;
 	int arg_conf_len = 0;
@@ -122,7 +121,7 @@
 
 	/* Initialize client globals. */
 	memset(&default_duid, 0, sizeof(default_duid));
-@@ -665,6 +672,10 @@ main(int argc, char **argv) {
+@@ -671,6 +678,10 @@ main(int argc, char **argv) {
 
 			dhclient_request_options = argvi;
 
@@ -133,7 +132,7 @@
 		} else if (argvi0 == '-') {
 			usage("Unknown command: %s", argvi);
 		} else if (interfaces_requested < 0) {
-@@ -725,6 +736,19 @@ main(int argc, char **argv) {
+@@ -731,6 +742,19 @@ main(int argc, char **argv) {
 		path_dhclient_script = s;
 	}
 
@@ -154,10 +153,10 @@
 	initialize_common_option_spaces();
 
 diff --git a/configure.ac b/configure.ac
-index a797438..15fc0d7 100644
+index b2c306b..300117f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -612,6 +612,41 @@ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(, void foo() __attribute__((noreturn));
+@@ -603,6 +603,41 @@ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(, void foo() __attribute__((noreturn));
 # Look for optional headers.
 AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
 
@@ -200,7 +199,7 @@
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(inet_ntoa, nsl)
 diff --git a/relay/Makefile.am b/relay/Makefile.am
-index 2ba5979..8900e0b 100644
+index 5562b69..4c5cfa6 100644
 --- a/relay/Makefile.am
 +++ b/relay/Makefile.am
 @@ -8,6 +8,7 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
@@ -212,9 +211,8 @@
 +		 $(CAPNG_LDADD)
 man_MANS = dhcrelay.8
 EXTRA_DIST = $(man_MANS)
- 
 diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index ea1be18..7b4f4f1 100644
+index a7b1286..0dc17d6 100644
 --- a/relay/dhcrelay.c
 +++ b/relay/dhcrelay.c
 @@ -32,6 +32,11 @@
@@ -229,7 +227,7 @@
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 struct tree_cache *global_options256;
-@@ -590,6 +595,10 @@ main(int argc, char **argv) {
+@@ -614,6 +619,10 @@ main(int argc, char **argv) {
 			if (++i == argc)
 				usage(use_noarg, argvi-1);
 			dhcrelay_sub_id = argvi;
@@ -240,7 +238,7 @@
 #endif
 		} else if (!strcmp(argvi, "-pf")) {
 			if (++i == argc)
-@@ -660,6 +669,17 @@ main(int argc, char **argv) {
+@@ -684,6 +693,17 @@ main(int argc, char **argv) {
 #endif
 	}
 
@@ -258,7 +256,7 @@
 	if (!quiet) {
 		log_info("%s %s", message, PACKAGE_VERSION);
 		log_info(copyright);
-@@ -816,6 +836,15 @@ main(int argc, char **argv) {
+@@ -840,6 +860,15 @@ main(int argc, char **argv) {
 	signal(SIGTERM, dhcp_signal_handler); /* kill */
 #endif
 
@@ -275,5 +273,5 @@
 	dispatch();
 
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch Changed

@@ -1,26 +1,25 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch
-From 01b1dcfef129a4eccfaf0f63a216774019f82dca Mon Sep 17 00:00:00 2001
+From 7e6299e72feaaf7e8bd499614999ba8a07dd1a8a Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:32:35 +0100
-Subject: PATCH 12/26 RFC 3442 - Classless Static Route Option for DHCPv4
+Subject: PATCH 12/28 RFC 3442 - Classless Static Route Option for DHCPv4
 (#516325)
-Cc: pzhukov@redhat.com
 
 (Submitted to dhcp-bugs@isc.org - ISC-Bugs #24572)
 ---
- client/clparse.c | 13 ++++++++++--
- common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++++++++
- common/inet.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
- common/options.c | 49 +++++++++++++++++++++++++++++++++++++++++++-
- common/parse.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ client/clparse.c | 13 ++++++++--
+ common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++
+ common/inet.c | 54 +++++++++++++++++++++++++++++++++++++++++
+ common/options.c | 49 ++++++++++++++++++++++++++++++++++++-
+ common/parse.c | 56 ++++++++++++++++++++++++++++++++++++++++++-
 common/tables.c | 2 ++
 includes/dhcp.h | 1 +
 includes/dhcpd.h | 2 ++
- includes/dhctoken.h | 5 +++--
- 9 files changed, 219 insertions(+), 6 deletions(-)
+ includes/dhctoken.h | 3 ++-
+ 9 files changed, 218 insertions(+), 5 deletions(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index 44387ed..862e4f9 100644
+index 902b523..57f6456 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
 @@ -31,7 +31,7 @@
@@ -32,7 +31,7 @@
 /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */
 struct option *default_requested_optionsNUM_DEFAULT_REQUESTED_OPTS + 2 + 1;
 
-@@ -87,7 +87,11 @@ isc_result_t read_client_conf ()
+@@ -90,7 +90,11 @@ isc_result_t read_client_conf ()
 				dhcp_universe.code_hash, &code, 0, MDL);
 
 	/* 4 */
@@ -45,7 +44,7 @@
 	option_code_hash_lookup(&default_requested_options3,
 				dhcp_universe.code_hash, &code, 0, MDL);
 
-@@ -141,6 +145,11 @@ isc_result_t read_client_conf ()
+@@ -144,6 +148,11 @@ isc_result_t read_client_conf ()
 	option_code_hash_lookup(&default_requested_options13,
 				dhcp_universe.code_hash, &code, 0, MDL);
 
@@ -58,10 +57,10 @@
 		if (default_requested_optionscode == NULL)
 			log_fatal("Unable to find option definition for "
 diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
-index d9e1197..2343b19 100644
+index a784b32..86f04ed 100644
 --- a/common/dhcp-options.5
 +++ b/common/dhcp-options.5
-@@ -110,6 +110,26 @@ hexadecimal, separated by colons. For example:
+@@ -117,6 +117,26 @@ hexadecimal, separated by colons. For example:
 or
 option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
 .fi
@@ -88,7 +87,7 @@
 .SH SETTING OPTION VALUES USING EXPRESSIONS
 Sometimes it's helpful to be able to set the value of a DHCP option
 based on some value that the client has sent. To do this, you can
-@@ -1086,6 +1106,29 @@ dhclient-script will create routes:
+@@ -1093,6 +1113,29 @@ dhclient-script will create routes:
 .RE
 .PP
 .nf
@@ -119,7 +118,7 @@
 \fB,\fR \fIip-address\fR...\fB;\fR
 .fi
 diff --git a/common/inet.c b/common/inet.c
-index c4da73c..981fb92 100644
+index 0f7f168..7c446d4 100644
 --- a/common/inet.c
 +++ b/common/inet.c
 @@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrnetlist **result) {
@@ -184,10 +183,10 @@
 /* XXX: should use a const pointer rather than passing the structure */
 const char *
 diff --git a/common/options.c b/common/options.c
-index fc0e088..3034cf0 100644
+index 92c8fee..66433c4 100644
 --- a/common/options.c
 +++ b/common/options.c
-@@ -729,7 +729,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
+@@ -734,7 +734,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
 		 * packet.
 		 */
 		priority_listpriority_len++ = DHO_SUBNET_MASK;
@@ -200,7 +199,7 @@
 		priority_listpriority_len++ = DHO_DOMAIN_NAME_SERVERS;
 		priority_listpriority_len++ = DHO_HOST_NAME;
 		priority_listpriority_len++ = DHO_FQDN;
-@@ -1804,6 +1808,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -1812,6 +1816,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
 	unsigned long tval;
 	isc_boolean_t a_array = ISC_FALSE;
 	int len_used;
@@ -208,7 +207,7 @@
 
 	if (emit_commas)
 		comma = ',';
-@@ -1812,6 +1817,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -1820,6 +1825,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
 
 	memset (enumbuf, 0, sizeof enumbuf);
 
@@ -216,7 +215,7 @@
 	/* Figure out the size of the data. */
 	for (l = i = 0; option -> format i; i++, l++) {
 		if (l >= sizeof(fmtbuf) - 1)
-@@ -2004,6 +2010,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -2029,6 +2035,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
 	if (numhunk < 0)
 		numhunk = 1;
 
@@ -250,7 +249,7 @@
 	/* Cycle through the array (or hunk) printing the data. */
 	for (i = 0; i < numhunk; i++) {
 		if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) {
-@@ -2159,6 +2192,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
+@@ -2197,6 +2230,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
 				strcpy(op, piaddr(iaddr));
 				dp += 4;
 				break;
@@ -272,12 +271,12 @@
 				iaddr.len = 16;
 				memcpy(iaddr.iabuf, dp, 16);
 diff --git a/common/parse.c b/common/parse.c
-index 3ac4ebf..f17bc0b 100644
+index b123a6c..7cf4f2a 100644
 --- a/common/parse.c
 +++ b/common/parse.c
 @@ -344,6 +344,39 @@ int parse_ip_addr (cfile, addr)
 	return 0;
- }	
+ }
 
 +/*
 + * destination-descriptor :== NUMBER DOT NUMBER |
@@ -337,7 +336,7 @@
 	 case IP6_ADDRESS:
 		type = '6';
 		break;
-@@ -5101,6 +5139,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups)
+@@ -5124,6 +5162,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups)
 		}
 		break;
 
@@ -353,7 +352,7 @@
 	 case '6': /* IPv6 address. */
 		if (!parse_ip6_addr(cfile, &addr)) {
 			return 0;
-@@ -5378,6 +5425,13 @@ int parse_option_decl (oc, cfile)
+@@ -5401,6 +5448,13 @@ int parse_option_decl (oc, cfile)
 					goto exit;
 				len = ip_addr.len;
 				dp = ip_addr.iabuf;
@@ -368,7 +367,7 @@
 			 alloc:
 				if (hunkix + len > sizeof hunkbuf) {
 diff --git a/common/tables.c b/common/tables.c
-index d2294c0..f1be07d 100644
+index ce12fcd..96521a6 100644
 --- a/common/tables.c
 +++ b/common/tables.c
 @@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option,
@@ -379,7 +378,7 @@
 6 - IPv6 address
 l - 32-bit signed integer
 L - 32-bit unsigned integer
-@@ -216,6 +217,7 @@ static struct option dhcp_options = {
+@@ -223,6 +224,7 @@ static struct option dhcp_options = {
 #endif
 	{ "subnet-selection", "I",		&dhcp_universe, 118, 1 },
 	{ "domain-search", "D",			&dhcp_universe, 119, 1 },
@@ -388,11 +387,11 @@
 	{ "vivso", "Evendor.",			&dhcp_universe, 125, 1 },
 #if 0
 diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 0a74137..95bf539 100644
+index cafe172..5a73129 100644
 --- a/includes/dhcp.h
 +++ b/includes/dhcp.h
-@@ -158,6 +158,7 @@ struct dhcp_packet {
- #define DHO_ASSOCIATED_IP			92
+@@ -159,6 +159,7 @@ struct dhcp_packet {
+ #define DHO_V6_ONLY_PREFERRED			108 /* RFC8925 */
 #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
 #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
 +#define DHO_CLASSLESS_STATIC_ROUTES		121 /* RFC3442 */
@@ -400,10 +399,10 @@
 #define DHO_VIVSO_SUBOPTIONS			125
 
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 3632a6b..2ac39ae 100644
+index 4a57002..25e1c72 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -2951,6 +2951,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result,
+@@ -2967,6 +2967,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result,
 			const struct iaddr *lo, const struct iaddr *hi);
 isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
 const char *piaddr (struct iaddr);
@@ -411,7 +410,7 @@
 char *piaddrmask(struct iaddr *, struct iaddr *);
 char *piaddrcidr(const struct iaddr *, unsigned int);
 u_int16_t validate_port(char *);
-@@ -3169,6 +3170,7 @@ void parse_client_lease_declaration (struct parse *,
+@@ -3189,6 +3190,7 @@ void parse_client_lease_declaration (struct parse *,
 int parse_option_decl (struct option_cache **, struct parse *);
 void parse_string_list (struct parse *, struct string_list **, int);
 int parse_ip_addr (struct parse *, struct iaddr *);
@@ -420,21 +419,19 @@
 void parse_reject_statement (struct parse *, struct client_config *);
 
 diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index 7e7215a..b4d93ba 100644
+index 6daa422..3f5334e 100644
 --- a/includes/dhctoken.h
 +++ b/includes/dhctoken.h
-@@ -376,8 +376,9 @@ enum dhcp_token {
- 	LEASE_ID_FORMAT = 676,
- 	TOKEN_HEX = 677,
+@@ -378,7 +378,8 @@ enum dhcp_token {
 	TOKEN_OCTAL = 678,
--	KEY_ALGORITHM = 679
-- BOOTP_BROADCAST_ALWAYS = 680
-+	KEY_ALGORITHM = 679,
-+ BOOTP_BROADCAST_ALWAYS = 680,
-+	DESTINATION_DESCRIPTOR = 681
+ 	KEY_ALGORITHM = 679,
+ 	BOOTP_BROADCAST_ALWAYS = 680,
+-	DISCONNECT = 681
++	DESTINATION_DESCRIPTOR = 681,
++	DISCONNECT = 682
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0013-DHCPv6-over-PPP-support-626514.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0013-DHCPv6-over-PPP-support-626514.patch
-From 234747fbfd6c6429619ba843713d5b39fb4a513d Mon Sep 17 00:00:00 2001
+From fe89d58ea8627c66feffa81997daa024834eeb15 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:33:06 +0100
-Subject: PATCH 13/26 DHCPv6 over PPP support (#626514)
-Cc: pzhukov@redhat.com
+Subject: PATCH 13/28 DHCPv6 over PPP support (#626514)
 
 ---
 client/dhc6.c | 3 ++-
@@ -16,10 +15,10 @@
 7 files changed, 54 insertions(+), 5 deletions(-)
 
 diff --git a/client/dhc6.c b/client/dhc6.c
-index 16a0838..3171828 100644
+index 35cf3d0..88fd07d 100644
 --- a/client/dhc6.c
 +++ b/client/dhc6.c
-@@ -5744,7 +5744,8 @@ make_client6_options(struct client_state *client, struct option_state **op,
+@@ -5737,7 +5737,8 @@ make_client6_options(struct client_state *client, struct option_state **op,
 	 */
 	if ((oc = lookup_option(&dhcpv6_universe, *op,
 				D6O_CLIENTID)) == NULL) {
@@ -30,10 +29,10 @@
 			log_fatal("Failure assembling a DUID.");
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 5d3f5bc..301132c 100644
+index b49fcb3..a99e21f 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1202,8 +1202,8 @@ main(int argc, char **argv) {
+@@ -1223,8 +1223,8 @@ main(int argc, char **argv) {
 			if (default_duid.buffer != NULL)
 				data_string_forget(&default_duid, MDL);
 
@@ -44,7 +43,7 @@
 		}
 	}
 
-@@ -3956,7 +3956,7 @@ write_options(struct client_state *client, struct option_state *options,
+@@ -4202,7 +4202,7 @@ write_options(struct client_state *client, struct option_state *options,
 * is not how it is intended. Upcoming rearchitecting the client should
 * address this "one daemon model."
 */
@@ -53,7 +52,7 @@
 form_duid(struct data_string *duid, const char *file, int line)
 {
 	struct interface_info *ip;
-@@ -3969,6 +3969,15 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4215,6 +4215,15 @@ form_duid(struct data_string *duid, const char *file, int line)
 	if (ip == NULL)
 		log_fatal("Impossible condition at %s:%d.", MDL);
 
@@ -69,7 +68,7 @@
 	if ((ip->hw_address.hlen == 0) ||
 	 (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
 		log_fatal("Impossible hardware address length at %s:%d.", MDL);
-@@ -4014,6 +4023,8 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4260,6 +4269,8 @@ form_duid(struct data_string *duid, const char *file, int line)
 		log_info("Created duid %s.", str);
 		dfree(str, MDL);
 	}
@@ -79,7 +78,7 @@
 
 /* Write the default DUID to the lease store. */
 diff --git a/common/bpf.c b/common/bpf.c
-index 67b6d64..ffbd09a 100644
+index d2a0549..aede242 100644
 --- a/common/bpf.c
 +++ b/common/bpf.c
 @@ -650,6 +650,22 @@ get_hw_addr(const char *name, struct hardware *hw) {
@@ -106,7 +105,7 @@
 log_fatal("Unsupported device type %d for \"%s\"",
 sa->sdl_type, name);
 diff --git a/common/lpf.c b/common/lpf.c
-index 82a279b..b0ed01c 100644
+index bd20b3f..bb8822a 100644
 --- a/common/lpf.c
 +++ b/common/lpf.c
 @@ -563,6 +563,22 @@ get_hw_addr(const char *name, struct hardware *hw) {
@@ -133,7 +132,7 @@
 			log_fatal("Unsupported device type %ld for \"%s\"",
 				 (long int)sa->sa_family, name);
 diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 95bf539..4cc547a 100644
+index 5a73129..7202f1d 100644
 --- a/includes/dhcp.h
 +++ b/includes/dhcp.h
 @@ -80,6 +80,8 @@ struct dhcp_packet {
@@ -146,10 +145,10 @@
 extensions field). */
 #define DHCP_OPTIONS_COOKIE	"\143\202\123\143"
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 2ac39ae..faa9251 100644
+index 25e1c72..4c5e877 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -3051,7 +3051,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr);
+@@ -3071,7 +3071,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr);
 
 void dhcpv4_client_assignments(void);
 void dhcpv6_client_assignments(void);
@@ -159,7 +158,7 @@
 void dhcp4o6_start(void);
 
 diff --git a/server/dhcpv6.c b/server/dhcpv6.c
-index a7110f9..c5ce7e8 100644
+index 0ea0532..7d61dc5 100644
 --- a/server/dhcpv6.c
 +++ b/server/dhcpv6.c
 @@ -482,6 +482,9 @@ generate_new_server_duid(void) {
@@ -173,5 +172,5 @@
 	if (p == NULL) {
 		return ISC_R_UNEXPECTED;
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0014-IPoIB-support-660681.patch Changed

@@ -1,25 +1,24 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0014-IPoIB-support-660681.patch
-From 6d74c2d0ceadef2eb1c43c2da47f1d5b732adf8c Mon Sep 17 00:00:00 2001
+From 90d64318e17df066c27b8e99ba6ab7f51154917b Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:34:21 +0100
-Subject: PATCH 14/26 IPoIB support (#660681)
-Cc: pzhukov@redhat.com
+Subject: PATCH 14/28 IPoIB support (#660681)
 
 (Submitted to dhcp-bugs@isc.org - ISC-Bugs #24249)
 ---
- client/dhclient.c | 32 +++++++
- common/bpf.c | 32 +++++++
+ client/dhclient.c | 33 ++++++
+ common/bpf.c | 32 ++++++
 common/discover.c | 4 +-
- common/lpf.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++-----
+ common/lpf.c | 274 ++++++++++++++++++++++++++++++++++++++++++----
 common/socket.c | 8 +-
 includes/dhcpd.h | 6 +-
- 6 files changed, 315 insertions(+), 29 deletions(-)
+ 6 files changed, 329 insertions(+), 28 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 301132c..dc9080e 100644
+index a99e21f..48edddf 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -205,6 +205,8 @@ static const char use_v6command = "Command not used for DHCPv4: %s";
+@@ -211,6 +211,8 @@ static const char use_v6command = "Command not used for DHCPv4: %s";
 
 #define DHCLIENT_USAGEH "{--version|--help|-h}"
 
@@ -28,9 +27,9 @@
 static void
 usage(const char *sfmt, const char *sarg)
 {
-@@ -1191,6 +1193,13 @@ main(int argc, char **argv) {
+@@ -1213,6 +1215,14 @@ main(int argc, char **argv) {
 	}
- 	srandom(seed + cur_time + (unsigned)getpid());
+ 	srandom(seed);
 
 +	/* Setup specific Infiniband options */
 +	for (ip = interfaces; ip; ip = ip->next) {
@@ -39,10 +38,11 @@
 +			setup_ib_interface(ip);
 +		}
 +	}
- 
++
 	/*
 	 * Establish a default DUID. We always do so for v6 and
-@@ -1486,6 +1495,29 @@ int find_subnet (struct subnet **sp,
+ 	 * do so if desired for v4 via the -D or -i options
+@@ -1507,6 +1517,29 @@ int find_subnet (struct subnet **sp,
 	return 0;
 }
 
@@ -73,7 +73,7 @@
 *
 * Each routine is called from the dhclient_state_machine() in one of
 diff --git a/common/bpf.c b/common/bpf.c
-index ffbd09a..568e3d9 100644
+index aede242..812cac3 100644
 --- a/common/bpf.c
 +++ b/common/bpf.c
 @@ -237,11 +237,43 @@ int dhcp_bpf_relay_filter_len =
@@ -121,10 +121,10 @@
 struct bpf_insn dhcp_bpf_tr_filter = {
 /* accept all token ring packets due to variable length header */
 diff --git a/common/discover.c b/common/discover.c
-index 6ef8852..65881fc 100644
+index ed338b4..e562225 100644
 --- a/common/discover.c
 +++ b/common/discover.c
-@@ -894,7 +894,7 @@ discover_interfaces(int state) {
+@@ -899,7 +899,7 @@ discover_interfaces(int state) {
 				if_register_send(tmp);
 			} else {
 				/* get_hw_addr() was called by register. */
@@ -133,7 +133,7 @@
 			}
 			break;
 #ifdef DHCPv6
-@@ -907,7 +907,7 @@ discover_interfaces(int state) {
+@@ -912,7 +912,7 @@ discover_interfaces(int state) {
 				 so now we have to call it explicitly
 				 to not leave the hardware address unknown
 				 (some code expects it cannot be. */
@@ -143,7 +143,7 @@
 				if_register_linklocal6(tmp);
 			}
 diff --git a/common/lpf.c b/common/lpf.c
-index b0ed01c..b732a86 100644
+index bb8822a..fcaa13d 100644
 --- a/common/lpf.c
 +++ b/common/lpf.c
 @@ -45,6 +45,17 @@
@@ -231,7 +231,35 @@
 		}
 	}
 	}
-@@ -330,6 +353,54 @@ static void lpf_tr_filter_setup (info)
+@@ -253,6 +276,18 @@ static void lpf_gen_filter_setup (info)
+ 
+ 	memset(&p, 0, sizeof(p));
+ 
++	if (info->hw_address.hbuf0 == HTYPE_INFINIBAND) {
++		p.len = dhcp_ib_bpf_filter_len;
++		p.filter = dhcp_ib_bpf_filter;
++
++		/* Patch the server port into the LPF program...
++		 XXX
++		 changes to filter program may require changes
++		 to the insn number(s) used below!
++		 XXX */
++		dhcp_ib_bpf_filter6.k = ntohs (local_port);
++	} else {
++
+ 	/* Set up the bpf filter program structure. This is defined in
+ 	 bpf.c */
+ 	p.len = dhcp_bpf_filter_len;
+@@ -275,6 +310,8 @@ static void lpf_gen_filter_setup (info)
+ #endif
+ 	dhcp_bpf_filter 8.k = ntohs (local_port);
+ 
++	}
++
+ 	if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
+ 			sizeof p) < 0) {
+ 		if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+@@ -330,6 +367,54 @@ static void lpf_tr_filter_setup (info)
 #endif /* USE_LPF_RECEIVE */
 
 #ifdef USE_LPF_SEND
@@ -286,7 +314,7 @@
 ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 	struct interface_info *interface;
 	struct packet *packet;
-@@ -350,6 +421,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+@@ -350,6 +435,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 		return send_fallback (interface, packet, raw,
 				 len, from, to, hto);
 
@@ -298,7 +326,7 @@
 	if (hto == NULL && interface->anycast_mac_addr.hlen)
 		hto = &interface->anycast_mac_addr;
 
-@@ -370,6 +446,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+@@ -370,6 +460,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
 #endif /* USE_LPF_SEND */
 
 #ifdef USE_LPF_RECEIVE
@@ -341,7 +369,7 @@
 ssize_t receive_packet (interface, buf, len, from, hfrom)
 	struct interface_info *interface;
 	unsigned char *buf;
-@@ -408,6 +520,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom)
+@@ -408,6 +534,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom)
 	};
 #endif /* PACKET_AUXDATA */
 
@@ -352,7 +380,7 @@
 	length = recvmsg (interface->rfdesc, &msg, 0);
 	if (length <= 0)
 		return length;
-@@ -521,11 +637,33 @@ void maybe_setup_fallback ()
+@@ -521,11 +651,33 @@ void maybe_setup_fallback ()
 #endif
 
 #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
@@ -389,12 +417,8 @@
 
 	if (strlen(name) >= sizeof(tmp.ifr_name)) {
 		log_fatal("Device name too long: \"%s\"", name);
-@@ -539,16 +677,61 @@ get_hw_addr(const char *name, struct hardware *hw) {
- 	memset(&tmp, 0, sizeof(tmp));
- 	strcpy(tmp.ifr_name, name);
- 	if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
--		log_fatal("Error getting hardware address for \"%s\": %m", 
-+		log_fatal("Error getting hardware address for \"%s\": %m",
+@@ -542,13 +694,58 @@ get_hw_addr(const char *name, struct hardware *hw) {
+ 		log_fatal("Error getting hardware address for \"%s\": %m",
 			 name);
 	}
 +	close(sock);
@@ -454,7 +478,7 @@
 			break;
 		case ARPHRD_IEEE802:
 #ifdef ARPHRD_IEEE802_TR
-@@ -556,18 +739,50 @@ get_hw_addr(const char *name, struct hardware *hw) {
+@@ -556,18 +753,50 @@ get_hw_addr(const char *name, struct hardware *hw) {
 #endif /* ARPHRD_IEEE802_TR */
 			hw->hlen = 7;
 			hw->hbuf0 = HTYPE_IEEE802;
@@ -509,7 +533,7 @@
 			hw->hlen = 0;
 			hw->hbuf0 = HTYPE_RESERVED;
 			/* 0xdeadbeef should never occur on the wire,
-@@ -580,10 +795,13 @@ get_hw_addr(const char *name, struct hardware *hw) {
+@@ -580,10 +809,13 @@ get_hw_addr(const char *name, struct hardware *hw) {
 			break;
 #endif
 		default:
@@ -527,10 +551,10 @@
 }
 #endif
 diff --git a/common/socket.c b/common/socket.c
-index 483eb9c..6e1caac 100644
+index 3953eac..903d034 100644
 --- a/common/socket.c
 +++ b/common/socket.c
-@@ -350,7 +350,7 @@ void if_register_send (info)
+@@ -358,7 +358,7 @@ void if_register_send (info)
 	info->wfdesc = if_register_socket(info, AF_INET, 0, NULL);
 	/* If this is a normal IPv4 address, get the hardware address. */
 	if (strcmp(info->name, "fallback") != 0)
@@ -539,7 +563,7 @@
 #if defined (USE_SOCKET_FALLBACK)
 	/* Fallback only registers for send, but may need to receive as
 	 well. */
-@@ -413,7 +413,7 @@ void if_register_receive (info)
+@@ -421,7 +421,7 @@ void if_register_receive (info)
 #endif /* IP_PKTINFO... */
 	/* If this is a normal IPv4 address, get the hardware address. */
 	if (strcmp(info->name, "fallback") != 0)
@@ -548,7 +572,7 @@
 
 	if (!quiet_interface_discovery)
 		log_info ("Listening on Socket/%s%s%s",
-@@ -567,7 +567,7 @@ if_register6(struct interface_info *info, int do_multicast) {
+@@ -577,7 +577,7 @@ if_register6(struct interface_info *info, int do_multicast) {
 	if (req_multi)
 		if_register_multicast(info);
 
@@ -557,7 +581,7 @@
 
 	if (!quiet_interface_discovery) {
 		if (info->shared_network != NULL) {
-@@ -623,7 +623,7 @@ if_register_linklocal6(struct interface_info *info) {
+@@ -633,7 +633,7 @@ if_register_linklocal6(struct interface_info *info) {
 	info->rfdesc = sock;
 	info->wfdesc = sock;
 
@@ -567,7 +591,7 @@
 	if (!quiet_interface_discovery) {
 		if (info->shared_network != NULL) {
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index faa9251..0c1a0aa 100644
+index 4c5e877..e9e52e7 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
 @@ -485,6 +485,9 @@ struct packet {
@@ -580,7 +604,7 @@
 struct hardware {
 	u_int8_t hlen;
 	u_int8_t hbufHARDWARE_ADDR_LEN + 1;
-@@ -1365,6 +1368,7 @@ struct interface_info {
+@@ -1380,6 +1383,7 @@ struct interface_info {
 	struct shared_network *shared_network;
 				/* Networks connected to this interface. */
 	struct hardware hw_address;	/* Its physical address. */
@@ -588,7 +612,7 @@
 	struct in_addr *addresses;	/* Addresses associated with this
 					 * interface.
 					 */
-@@ -2633,7 +2637,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
+@@ -2649,7 +2653,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
 #endif
 const char *print_time(TIME);
 
@@ -598,5 +622,5 @@
 const char *file, int line);
 char *format_lease_id(const unsigned char *s, unsigned len, int format,
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch Changed

@@ -1,20 +1,20 @@
-Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch
-From 3d3e442ed1316930a5360e4d5a56b46a42a29419 Mon Sep 17 00:00:00 2001
+Reference:
+https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch
+From 3baf35269555e2223dbd1733cb1c475cb7f2ed7a Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:35:47 +0100
-Subject: PATCH 15/26 Add GUID/DUID to dhcpd logs (#1064416)
-Cc: pzhukov@redhat.com
+Subject: PATCH 15/28 Add GUID/DUID to dhcpd logs (#1064416)
 
 ---
- client/dhclient.c | 75 ++++++++++++++++++++++++++++++++++++++++++----------
- server/dhcp.c | 78 +++++++++++++++++++++++++++++++++----------------------
- 2 files changed, 108 insertions(+), 45 deletions(-)
+ client/dhclient.c | 70 ++++++++++++++++++++++++++++++++++--------
+ server/dhcp.c | 78 ++++++++++++++++++++++++++++-------------------
+ 2 files changed, 105 insertions(+), 43 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index dc9080e..8e57da9 100644
+index 48edddf..181f6e1 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1170,6 +1170,26 @@ main(int argc, char **argv) {
+@@ -1176,6 +1176,26 @@ main(int argc, char **argv) {
 		}
 	}
 
@@ -41,60 +41,56 @@
 	/* At this point, all the interfaces that the script thinks
 	 are relevant should be running, so now we once again call
 	 discover_interfaces(), and this time ask it to actually set
-@@ -1184,14 +1204,36 @@ main(int argc, char **argv) {
- 	 Not much entropy, but we're booting, so we're not likely to
- 	 find anything better. */
- 	seed = 0;
-+	int seed_flag = 0;
- 	for (ip = interfaces; ip; ip = ip->next) {
- 		int junk;
-+		if ( ip -> hw_address.hlen <= sizeof seed )
-+		 continue;
- 		memcpy(&junk,
- 		 &ip->hw_address.hbufip->hw_address.hlen -
- 					 sizeof seed, sizeof seed);
- 		seed += junk;
-+		seed_flag = 1;
- 	}
--	srandom(seed + cur_time + (unsigned)getpid());
-+	if ( seed_flag == 0 ) {
-+		if ( backup_seed != 0 ) {
-+		 seed = backup_seed;
-+		 log_info ("xid: rand init seed (0x%x) built using all"
-+			 " available interfaces",seed);
-+		}
-+		else {
-+		 seed = cur_time^((unsigned) gethostid()) ;
-+		 log_info ("xid: warning: no netdev with useable HWADDR found"
-+			 " for seed's uniqueness enforcement");
-+		 log_info ("xid: rand init seed (0x%x) built using gethostid",
-+			 seed);
+@@ -1204,14 +1224,34 @@ main(int argc, char **argv) {
+ 		 Not much entropy, but we're booting, so we're not likely to
+ 		 find anything better. */
+ 
++		int seed_flag = 0;
+ 		for (ip = interfaces; ip; ip = ip->next) {
+ 			int junk;
++			if ( ip -> hw_address.hlen <= sizeof seed )
++			 continue;
+ 			memcpy(&junk,
+ 			 &ip->hw_address.hbufip->hw_address.hlen -
+ 						 sizeof seed, sizeof seed);
+ 			seed += junk;
++			seed_flag = 1;
+ 		}
+-		seed += cur_time + (unsigned)getpid();
++		if ( seed_flag == 0 ) {
++			if ( backup_seed != 0 ) {
++			 seed = backup_seed;
++			 log_info ("xid: rand init seed (0x%x) built using all"
++				 " available interfaces",seed);
++			}
++			else {
++			 seed = cur_time^((unsigned) gethostid()) ;
++			 log_info ("xid: warning: no netdev with useable HWADDR found"
++				 " for seed's uniqueness enforcement");
++			 log_info ("xid: rand init seed (0x%x) built using gethostid",
++				 seed);
++			}
++			/* we only use seed and no current time as a broadcast reply */
++			/* will certainly be used by the hwaddrless interface */
 +		}
-+		/* we only use seed and no current time as a broadcast reply */
-+		/* will certainly be used by the hwaddrless interface */
-+		srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
-+	}
-+	else
-+	 srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid());
++		seed += ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid();
+ 	}
+ 	srandom(seed);
 
- 	/* Setup specific Infiniband options */
- 	for (ip = interfaces; ip; ip = ip->next) {
-@@ -1746,10 +1788,10 @@ void dhcpack (packet)
- #endif
+@@ -1869,9 +1909,10 @@ void dhcpack (packet)
 		return;
 	}
--
+ 
 -	log_info ("DHCPACK of %s from %s",
--		 inet_ntoa(packet->raw->yiaddr),
--		 piaddr (packet->client_addr));
 +	log_info ("DHCPACK of %s from %s (xid=0x%x)",
-+ inet_ntoa(packet->raw->yiaddr),
-+ piaddr (packet -> client_addr),
-+ ntohl(client -> xid));
+ 		 inet_ntoa(packet->raw->yiaddr),
+-		 piaddr (packet->client_addr));
++		 piaddr (packet -> client_addr),
++		 ntohl(client -> xid));
 
- 	lease = packet_to_lease (packet, client);
- 	if (!lease) {
-@@ -2669,7 +2711,7 @@ void dhcpnak (packet)
+ 	/* Check v6only first. */
+ 	v6only_wait = check_v6only(packet, client);
+@@ -2825,7 +2866,7 @@ void dhcpnak (packet)
 		return;
 	}
 
@@ -103,7 +99,7 @@
 
 	if (!client -> active) {
 #if defined (DEBUG)
-@@ -2802,10 +2844,10 @@ void send_discover (cpp)
+@@ -2958,10 +2999,10 @@ void send_discover (cpp)
 			 (long)(client -> interval));
 	} else
 #endif
@@ -116,7 +112,7 @@
 
 	/* Send out a packet. */
 #if defined(DHCPv6) && defined(DHCP4o6)
-@@ -3108,10 +3150,12 @@ void send_request (cpp)
+@@ -3355,10 +3396,12 @@ void send_request (cpp)
 	}
 
 	strncpy(rip_buf, rip_str, sizeof(rip_buf)-1);
@@ -131,7 +127,7 @@
 
 #if defined(DHCPv6) && defined(DHCP4o6)
 	if (dhcpv4_over_dhcpv6) {
-@@ -3168,11 +3212,13 @@ void send_decline (cpp)
+@@ -3415,11 +3458,13 @@ void send_decline (cpp)
 		log_info ("DHCPDECLINE");
 	} else
 #endif
@@ -147,7 +143,7 @@
 
 	/* Send out a packet. */
 #if defined(DHCPv6) && defined(DHCP4o6)
-@@ -3231,11 +3277,12 @@ void send_release (cpp)
+@@ -3478,11 +3523,12 @@ void send_release (cpp)
 		log_info ("DHCPRELEASE");
 	} else
 #endif
@@ -163,10 +159,10 @@
 #if defined(DHCPv6) && defined(DHCP4o6)
 	if (dhcpv4_over_dhcpv6) {
 diff --git a/server/dhcp.c b/server/dhcp.c
-index 20f2a62..0582c4c 100644
+index ae805a6..8363840 100644
 --- a/server/dhcp.c
 +++ b/server/dhcp.c
-@@ -87,6 +87,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *));
+@@ -93,6 +93,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *));
 
 static TIME leaseTimeCheck(TIME calculated, TIME alternate);
 
@@ -209,7 +205,7 @@
 void
 dhcp (struct packet *packet) {
 	int ms_nulltp = 0;
-@@ -129,9 +165,7 @@ dhcp (struct packet *packet) {
+@@ -135,9 +171,7 @@ dhcp (struct packet *packet) {
 
 		log_info("%s from %s via %s: %s", s,
 			 (packet->raw->htype
@@ -220,7 +216,7 @@
 			 : "<no identifier>"),
 			 packet->raw->giaddr.s_addr
 			 ? inet_ntoa(packet->raw->giaddr)
-@@ -328,9 +362,7 @@ void dhcpdiscover (packet, ms_nulltp)
+@@ -334,9 +368,7 @@ void dhcpdiscover (packet, ms_nulltp)
 #endif
 	snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s",
 		 (packet -> raw -> htype
@@ -231,7 +227,7 @@
 		 : (lease
 		 ? print_hex_1(lease->uid_len, lease->uid, 60)
 		 : "<no identifier>")),
-@@ -542,9 +574,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease)
+@@ -548,9 +580,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease)
 		 "DHCPREQUEST for %s%s from %s %s%s%svia %s",
 		 piaddr (cip), smbuf,
 		 (packet -> raw -> htype
@@ -242,7 +238,7 @@
 		 : (lease
 		 ? print_hex_1(lease->uid_len, lease->uid, 60)
 		 : "<no identifier>")),
-@@ -785,9 +815,7 @@ void dhcprelease (packet, ms_nulltp)
+@@ -791,9 +821,7 @@ void dhcprelease (packet, ms_nulltp)
 	if ((oc = lookup_option (&dhcp_universe, packet -> options,
 				 DHO_DHCP_REQUESTED_ADDRESS))) {
 		log_info ("DHCPRELEASE from %s specified requested-address.",
@@ -253,7 +249,7 @@
 	}
 
 	oc = lookup_option (&dhcp_universe, packet -> options,
-@@ -879,9 +907,7 @@ void dhcprelease (packet, ms_nulltp)
+@@ -885,9 +913,7 @@ void dhcprelease (packet, ms_nulltp)
 		 "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)",
 		 cstr,
 		 (packet -> raw -> htype
@@ -264,7 +260,7 @@
 		 : (lease
 		 ? print_hex_1(lease->uid_len, lease->uid, 60)
 		 : "<no identifier>")),
-@@ -986,9 +1012,7 @@ void dhcpdecline (packet, ms_nulltp)
+@@ -992,9 +1018,7 @@ void dhcpdecline (packet, ms_nulltp)
 		 "DHCPDECLINE of %s from %s %s%s%svia %s",
 		 piaddr (cip),
 		 (packet -> raw -> htype
@@ -275,7 +271,7 @@
 		 : (lease
 		 ? print_hex_1(lease->uid_len, lease->uid, 60)
 		 : "<no identifier>")),
-@@ -1732,8 +1756,7 @@ void dhcpinform (packet, ms_nulltp)
+@@ -1740,8 +1764,7 @@ void dhcpinform (packet, ms_nulltp)
 	/* Report what we're sending. */
 	snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip),
 		 (packet->raw->htype && packet->raw->hlen) ?
@@ -285,7 +281,7 @@
 			"<no client hardware address>");
 	log_info("%s %s", msgbuf, gip.len ? piaddr(gip) :
 					 packet->interface->name);
-@@ -1918,9 +1941,7 @@ void nak_lease (packet, cip, network_group)
+@@ -1926,9 +1949,7 @@ void nak_lease (packet, cip, network_group)
 #endif
 	log_info ("DHCPNAK on %s to %s via %s",
 	 piaddr (*cip),
@@ -296,7 +292,7 @@
 	 packet -> raw -> giaddr.s_addr
 	 ? inet_ntoa (packet -> raw -> giaddr)
 	 : packet -> interface -> name);
-@@ -3936,7 +3957,7 @@ void dhcp_reply (lease)
+@@ -4044,7 +4065,7 @@ void dhcp_reply (lease)
 		 ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER")
 		 : "BOOTREPLY"),
 		 piaddr (lease -> ip_addr),
@@ -305,7 +301,7 @@
 		 ? print_hw_addr (lease -> hardware_addr.hbuf 0,
 				 lease -> hardware_addr.hlen - 1,
 				 &lease -> hardware_addr.hbuf 1)
-@@ -4497,10 +4518,7 @@ int find_lease (struct lease **lp,
+@@ -4605,10 +4626,7 @@ int find_lease (struct lease **lp,
 			if (uid_lease) {
 			 if (uid_lease->binding_state == FTS_ACTIVE) {
 				log_error ("client %s has duplicate%s on %s",
@@ -317,7 +313,7 @@
 					 " leases",
 					 (ip_lease -> subnet ->
 					 shared_network -> name));
-@@ -4667,9 +4685,7 @@ int find_lease (struct lease **lp,
+@@ -4775,9 +4793,7 @@ int find_lease (struct lease **lp,
 			log_error("uid lease %s for client %s is duplicate "
 				 "on %s",
 				 piaddr(uid_lease->ip_addr),
@@ -329,5 +325,5 @@
 
 			if (!packet -> raw -> ciaddr.s_addr &&
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0016-Turn-on-creating-sending-of-DUID.patch Changed

@@ -1,20 +1,19 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0016-Turn-on-creating-sending-of-DUID.patch
-From 2f6b827e89305adcff45288c632785ac054adb8e Mon Sep 17 00:00:00 2001
+From 0a0a7e1afa171289b9e9d855c519101bbd71b5fe Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:36:30 +0100
-Subject: PATCH 16/26 Turn on creating/sending of DUID
-Cc: pzhukov@redhat.com
+Subject: PATCH 16/28 Turn on creating/sending of DUID
 
 as client identifier with DHCPv4 clients (#560361c#40, rfc4361)
 ---
- client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 8e57da9..ccc98e4 100644
+index 181f6e1..444d251 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -4021,6 +4021,59 @@ write_options(struct client_state *client, struct option_state *options,
+@@ -4267,6 +4267,59 @@ write_options(struct client_state *client, struct option_state *options,
 	}
 }
 
@@ -74,7 +73,7 @@
 /*
 * The "best" default DUID, since we cannot predict any information
 * about the system (such as whether or not the hardware addresses are
-@@ -4041,6 +4094,7 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4287,6 +4340,7 @@ form_duid(struct data_string *duid, const char *file, int line)
 	struct interface_info *ip;
 	int len;
 	char *str;
@@ -82,7 +81,7 @@
 
 	/* For now, just use the first interface on the list. */
 	ip = interfaces;
-@@ -4061,9 +4115,16 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4307,9 +4361,16 @@ form_duid(struct data_string *duid, const char *file, int line)
 	 (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
 		log_fatal("Impossible hardware address length at %s:%d.", MDL);
 
@@ -102,7 +101,7 @@
 	/*
 	 * 2 bytes for the 'duid type' field.
 	 * 2 bytes for the 'htype' field.
-@@ -4074,13 +4135,18 @@ form_duid(struct data_string *duid, const char *file, int line)
+@@ -4320,13 +4381,18 @@ form_duid(struct data_string *duid, const char *file, int line)
 	len = 4 + (ip->hw_address.hlen - 1);
 	if (duid_type == DUID_LLT)
 		len += 4;
@@ -123,5 +122,5 @@
 		putUShort(duid->buffer->data + 2, ip->hw_address.hbuf0);
 		putULong(duid->buffer->data + 4, cur_time - DUID_TIME_EPOCH);
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0017-Send-unicast-request-release-via-correct-interface.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0017-Send-unicast-request-release-via-correct-interface.patch
-From 193c4d7631fd623efa601f52fdab6018bf8be771 Mon Sep 17 00:00:00 2001
+From d45463c2007a78623f2c90c250bb8e2f3e34a852 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:39:36 +0100
-Subject: PATCH 17/26 Send unicast request/release via correct interface
-Cc: pzhukov@redhat.com
+Subject: PATCH 17/28 Send unicast request/release via correct interface
 
 (#800561, #1177351)
 (Submitted to dhcp-bugs@isc.org - ISC-Bugs #30544)
@@ -12,10 +11,10 @@
 1 file changed, 30 insertions(+)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index ccc98e4..27fde69 100644
+index 444d251..d607975 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -3171,6 +3171,14 @@ void send_request (cpp)
+@@ -3417,6 +3417,14 @@ void send_request (cpp)
 #endif
 	if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
 	 fallback_interface) {
@@ -30,7 +29,7 @@
 		result = send_packet(fallback_interface, NULL, &client->packet,
 				 client->packet_length, from, &destination,
 				 NULL);
-@@ -3180,6 +3188,13 @@ void send_request (cpp)
+@@ -3426,6 +3434,13 @@ void send_request (cpp)
 				 client->packet_length,
 				 fallback_interface->name);
 		}
@@ -44,7 +43,7 @@
 }
 	else {
 		/* Send out a packet. */
-@@ -3297,6 +3312,14 @@ void send_release (cpp)
+@@ -3543,6 +3558,14 @@ void send_release (cpp)
 	} else
 #endif
 	if (fallback_interface) {
@@ -59,7 +58,7 @@
 		result = send_packet(fallback_interface, NULL, &client->packet,
 				 client->packet_length, from, &destination,
 				 NULL);
-@@ -3306,6 +3329,13 @@ void send_release (cpp)
+@@ -3552,6 +3575,13 @@ void send_release (cpp)
 				 client->packet_length,
 				 fallback_interface->name);
 		}
@@ -74,5 +73,5 @@
 		/* Send out a packet. */
 		result = send_packet(client->interface, NULL, &client->packet,
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch Changed

@@ -1,20 +1,19 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch
-From 2277d041692b8ebdf6b86d41e3a0bc0381cd1e47 Mon Sep 17 00:00:00 2001
+From 840c4f2175d14fa485f2a5e50a005847940b7e1f Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:40:51 +0100
-Subject: PATCH 18/26 No subnet declaration for <iface>' should be info, not
+Subject: PATCH 18/28 No subnet declaration for <iface>' should be info, not
 error.
-Cc: pzhukov@redhat.com
 
 ---
 common/discover.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/common/discover.c b/common/discover.c
-index 65881fc..056342c 100644
+index e562225..b4b1959 100644
 --- a/common/discover.c
 +++ b/common/discover.c
-@@ -801,9 +801,9 @@ discover_interfaces(int state) {
+@@ -806,9 +806,9 @@ discover_interfaces(int state) {
 
 		/* We must have a subnet declaration for each interface. */
 		if (!tmp->shared_network && (state == DISCOVER_SERVER)) {
@@ -23,10 +22,10 @@
 			if (local_family == AF_INET) {
 -				log_error("No subnet declaration for %s (%s).",
 +				log_info("No subnet declaration for %s (%s).",
- 					 tmp->name, 
+ 					 tmp->name,
 					 (tmp->addresses == NULL) ?
 					 "no IPv4 addresses" :
-@@ -818,26 +818,26 @@ discover_interfaces(int state) {
+@@ -823,26 +823,26 @@ discover_interfaces(int state) {
 				} else {
 					strcpy(abuf, "no IPv6 addresses");
 				}
@@ -60,5 +59,5 @@
 			} else {
 				log_error ("You must write a %s",
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch Changed

@@ -1,10 +1,9 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch
-From 6ea56e988df1da51f7d0bdd8984b38e40102c17b Mon Sep 17 00:00:00 2001
+From eeb2e5bcedd62f21472da165b80741f8072420cf Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:41:14 +0100
-Subject: PATCH 19/26 dhclient: write DUID_LLT even in stateless mode
+Subject: PATCH 19/28 dhclient: write DUID_LLT even in stateless mode
 (#1156356)
-Cc: pzhukov@redhat.com
 
 (Submitted to dhcp-bugs@isc.org - ISC-Bugs #38144)
 ---
@@ -12,10 +11,10 @@
 1 file changed, 3 insertions(+)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 27fde69..4e5546a 100644
+index d607975..6bbefc7 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -1442,6 +1442,9 @@ void run_stateless(int exit_mode, u_int16_t port)
+@@ -1462,6 +1462,9 @@ void run_stateless(int exit_mode, u_int16_t port)
 			data_string_forget(&default_duid, MDL);
 
 		form_duid(&default_duid, MDL);
@@ -26,5 +25,5 @@
 
 #ifdef DHCP4o6
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0020-Discover-all-hwaddress-for-xid-uniqueness.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0020-Discover-all-hwaddress-for-xid-uniqueness.patch
-From 01ce61b8a0331a2f068ca2191bfb897b505c1b9d Mon Sep 17 00:00:00 2001
+From 908ea5f3a45a050a878de16d5acde6eda1b77d9f Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 21 Feb 2019 10:42:50 +0100
-Subject: PATCH 20/26 Discover all hwaddress for xid uniqueness
-Cc: pzhukov@redhat.com
+Subject: PATCH 20/28 Discover all hwaddress for xid uniqueness
 
 ---
 common/discover.c | 2 ++
@@ -12,10 +11,10 @@
 3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/common/discover.c b/common/discover.c
-index 056342c..e66e1c5 100644
+index b4b1959..96dcdcf 100644
 --- a/common/discover.c
 +++ b/common/discover.c
-@@ -648,6 +648,8 @@ discover_interfaces(int state) {
+@@ -653,6 +653,8 @@ discover_interfaces(int state) {
 			interface_dereference(&tmp, MDL);
 			tmp = interfaces; /* XXX */
 		}
@@ -25,10 +24,10 @@
 		if (dhcp_interface_discovery_hook) {
 			(*dhcp_interface_discovery_hook)(tmp);
 diff --git a/common/lpf.c b/common/lpf.c
-index b732a86..a708a5d 100644
+index fcaa13d..77a5668 100644
 --- a/common/lpf.c
 +++ b/common/lpf.c
-@@ -699,8 +699,22 @@ ioctl_get_ll(char *name)
+@@ -713,8 +713,22 @@ ioctl_get_ll(char *name)
 	return sll;
 }
 
@@ -51,7 +50,7 @@
 {
 	struct hardware *hw = &info->hw_address;
 	char *name = info->name;
-@@ -710,7 +724,8 @@ get_hw_addr(struct interface_info *info)
+@@ -724,7 +738,8 @@ get_hw_addr(struct interface_info *info)
 	int sll_allocated = 0;
 	char *dup = NULL;
 	char *colon = NULL;
@@ -61,7 +60,7 @@
 	if (getifaddrs(&ifaddrs) == -1)
 		log_fatal("Failed to get interfaces");
 
-@@ -794,14 +809,16 @@ get_hw_addr(struct interface_info *info)
+@@ -808,14 +823,16 @@ get_hw_addr(struct interface_info *info)
 			hw->hbuf4 = 0xef;
 			break;
 #endif
@@ -83,10 +82,10 @@
 }
 #endif
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 0c1a0aa..635c510 100644
+index e9e52e7..fabad01 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
-@@ -2637,7 +2637,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
+@@ -2653,7 +2653,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t);
 #endif
 const char *print_time(TIME);
 
@@ -98,5 +97,5 @@
 const char *file, int line);
 char *format_lease_id(const unsigned char *s, unsigned len, int format,
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0021-Load-leases-DB-in-non-replay-mode-only.patch Changed

_service:tar_scm:backport-0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch Changed

@@ -1,10 +1,9 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch
-From 9975d198a2c02e32c31c3e0f43d2aa79dfa7f508 Mon Sep 17 00:00:00 2001
+From 1f8681acba9ab70fbe17c85e5a1f4ce6a648b55d Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 28 Feb 2019 15:30:21 +0100
-Subject: PATCH 22/26 dhclient: make sure link-local address is ready in
+Subject: PATCH 22/28 dhclient: make sure link-local address is ready in
 stateless mode
-Cc: pzhukov@redhat.com
 
 Bug-url: https://bugzilla.redhat.com/1263466
 ---
@@ -12,10 +11,10 @@
 1 file changed, 20 insertions(+), 10 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 4e5546a..9b65438 100644
+index 6bbefc7..60836b4 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -937,6 +937,12 @@ main(int argc, char **argv) {
+@@ -943,6 +943,12 @@ main(int argc, char **argv) {
 
 	inaddr_any.s_addr = INADDR_ANY;
 
@@ -28,7 +27,7 @@
 	/* Stateless special case. */
 	if (stateless) {
 		if (release_mode || (wanted_ia_na > 0) ||
-@@ -953,12 +959,6 @@ main(int argc, char **argv) {
+@@ -959,12 +965,6 @@ main(int argc, char **argv) {
 		finish(0);
 	}
 
@@ -41,7 +40,7 @@
 	/* Parse any extra command line configuration arguments: */
 	if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
 		arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
-@@ -1413,20 +1413,30 @@ void run_stateless(int exit_mode, u_int16_t port)
+@@ -1433,20 +1433,30 @@ void run_stateless(int exit_mode, u_int16_t port)
 	IGNORE_UNUSED(port);
 #endif
 
@@ -77,5 +76,5 @@
 	/* Parse the lease database. */
 	read_client_leases();
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0023-option-97-pxe-client-id.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0023-option-97-pxe-client-id.patch
-From 6fd7894ea57791c8eee16c21d19da34b909e016e Mon Sep 17 00:00:00 2001
+From f01a29a90269c98a86accb0923d65aecf5f59b44 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 28 Feb 2019 16:40:38 +0100
-Subject: PATCH 23/26 option 97 - pxe-client-id
-Cc: pzhukov@redhat.com
+Subject: PATCH 23/28 option 97 - pxe-client-id
 
 Bug-url: https://bugzilla.redhat.com/1058674
 ISC-Bugs #38110
@@ -19,10 +18,10 @@
 8 files changed, 69 insertions(+), 16 deletions(-)
 
 diff --git a/common/options.c b/common/options.c
-index 3034cf0..686dd12 100644
+index 66433c4..4e26094 100644
 --- a/common/options.c
 +++ b/common/options.c
-@@ -4465,13 +4465,26 @@ int validate_packet(struct packet *packet)
+@@ -4551,13 +4551,26 @@ int validate_packet(struct packet *packet)
 				"a future version of ISC DHCP will reject this");
 		}
 	} else {
@@ -57,10 +56,10 @@
 	}
 
 diff --git a/common/tables.c b/common/tables.c
-index f1be07d..4419220 100644
+index 96521a6..8034d94 100644
 --- a/common/tables.c
 +++ b/common/tables.c
-@@ -196,8 +196,9 @@ static struct option dhcp_options = {
+@@ -200,8 +200,9 @@ static struct option dhcp_options = {
 	/* Defined by RFC 4578 */
 	{ "pxe-system-type", "Sa",		&dhcp_universe, 93, 1 },
 	{ "pxe-interface-id", "BBB",		&dhcp_universe, 94, 1 },
@@ -72,7 +71,7 @@
 #if defined(RFC4776_OPTIONS)
 { "geoconf-civic", "X", &dhcp_universe, 99, 1 },
 diff --git a/includes/dhcp.h b/includes/dhcp.h
-index 4cc547a..4eb9791 100644
+index 7202f1d..4ad3874 100644
 --- a/includes/dhcp.h
 +++ b/includes/dhcp.h
 @@ -158,6 +158,7 @@ struct dhcp_packet {
@@ -80,14 +79,14 @@
 #define DHO_CLIENT_LAST_TRANSACTION_TIME	91
 #define DHO_ASSOCIATED_IP			92
 +#define DHO_PXE_CLIENT_ID			97 /* RFC4578 */
+ #define DHO_V6_ONLY_PREFERRED			108 /* RFC8925 */
 #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
 #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
- #define DHO_CLASSLESS_STATIC_ROUTES		121 /* RFC3442 */
 diff --git a/server/dhcp.c b/server/dhcp.c
-index 0582c4c..4e86262 100644
+index 8363840..29d9c69 100644
 --- a/server/dhcp.c
 +++ b/server/dhcp.c
-@@ -222,6 +222,10 @@ dhcp (struct packet *packet) {
+@@ -228,6 +228,10 @@ dhcp (struct packet *packet) {
 		if (lease -> uid_len) {
 			oc = lookup_option (&dhcp_universe, packet -> options,
 					 DHO_DHCP_CLIENT_IDENTIFIER);
@@ -98,7 +97,7 @@
 			if (!oc)
 				goto nolease;
 
-@@ -820,6 +824,9 @@ void dhcprelease (packet, ms_nulltp)
+@@ -826,6 +830,9 @@ void dhcprelease (packet, ms_nulltp)
 
 	oc = lookup_option (&dhcp_universe, packet -> options,
 			 DHO_DHCP_CLIENT_IDENTIFIER);
@@ -108,7 +107,7 @@
 	memset (&data, 0, sizeof data);
 	if (oc &&
 	 evaluate_option_cache (&data, packet, (struct lease *)0,
-@@ -1331,6 +1338,9 @@ void dhcpinform (packet, ms_nulltp)
+@@ -1338,6 +1345,9 @@ void dhcpinform (packet, ms_nulltp)
 */
 	oc = lookup_option(&dhcp_universe, packet->options,
 			 DHO_DHCP_CLIENT_IDENTIFIER);
@@ -118,7 +117,7 @@
 	memset(&d1, 0, sizeof(d1));
 	if (oc &&
 	 evaluate_option_cache(&d1, packet, NULL, NULL,
-@@ -2441,6 +2451,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+@@ -2448,6 +2458,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
 		 can be used. */
 		oc = lookup_option (&dhcp_universe, packet -> options,
 				 DHO_DHCP_CLIENT_IDENTIFIER);
@@ -128,7 +127,7 @@
 		if (oc &&
 		 evaluate_option_cache (&d1, packet, lease,
 					 (struct client_state *)0,
-@@ -3033,6 +3046,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+@@ -3040,6 +3053,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
 		/* Record the uid, if given... */
 		oc = lookup_option (&dhcp_universe, packet -> options,
 				 DHO_DHCP_CLIENT_IDENTIFIER);
@@ -138,7 +137,7 @@
 		if (oc &&
 		 evaluate_option_cache(&d1, packet, lease, NULL,
 					 packet->options, state->options,
-@@ -4150,6 +4166,9 @@ int find_lease (struct lease **lp,
+@@ -4258,6 +4274,9 @@ int find_lease (struct lease **lp,
 	 specified unique client identifier. */
 	oc = lookup_option (&dhcp_universe, packet -> options,
 			 DHO_DHCP_CLIENT_IDENTIFIER);
@@ -149,7 +148,7 @@
 	if (oc &&
 	 evaluate_option_cache (&client_identifier,
 diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
-index 89b5540..4751a8b 100644
+index b7e79ea..2354b1d 100644
 --- a/server/dhcpd.conf.5
 +++ b/server/dhcpd.conf.5
 @@ -1664,10 +1664,12 @@ should be a name identifying the host. If a \fIhostname\fR option is
@@ -178,7 +177,7 @@
 parameter for DHCPv6 servers. For example, it is not possible to
 match a host declaration to a \fIhost-name\fR option. This is
 diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c
-index 7be0788..2fee698 100644
+index 0f1d4f7..dae4ae7 100644
 --- a/server/dhcpleasequery.c
 +++ b/server/dhcpleasequery.c
 @@ -276,7 +276,7 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) {
@@ -214,7 +213,7 @@
 				 sizeof(dbg_info), 
 				 "client-id %s",
 diff --git a/server/failover.c b/server/failover.c
-index 72f7b00..40fa691 100644
+index 5b36d3a..a641e86 100644
 --- a/server/failover.c
 +++ b/server/failover.c
 @@ -5988,6 +5988,9 @@ int load_balance_mine (struct packet *packet, dhcp_failover_state_t *state)
@@ -228,7 +227,7 @@
 	if (oc &&
 	 evaluate_option_cache(&ds, packet, NULL, NULL,
 diff --git a/server/mdb.c b/server/mdb.c
-index 052df67..8851366 100644
+index 60a40e1..2cd5605 100644
 --- a/server/mdb.c
 +++ b/server/mdb.c
 @@ -129,8 +129,9 @@ static int find_uid_statement (struct executable_statement *esp,
@@ -244,5 +243,5 @@
 			log_error ("dhcp client identifier may not be %s",
 				 "specified conditionally.");
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0024-Detect-system-time-changes.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0024-Detect-system-time-changes.patch
-From 41c6032ace65119e6a400365f7e90283c930afd4 Mon Sep 17 00:00:00 2001
+From a2fb8759ab48c88e3f8df94ae6e156c357d932a2 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Tue, 22 Oct 2019 16:23:01 +0200
-Subject: PATCH 24/26 Detect system time changes
-Cc: pzhukov@redhat.com
+Subject: PATCH 24/28 Detect system time changes
 
 ---
 client/dhclient.c | 6 ++++++
@@ -13,10 +12,10 @@
 4 files changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/client/dhclient.c b/client/dhclient.c
-index 9b65438..44d508a 100644
+index 60836b4..fd18813 100644
 --- a/client/dhclient.c
 +++ b/client/dhclient.c
-@@ -5408,6 +5408,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate,
+@@ -5665,6 +5665,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate,
 		 case server_awaken:
 		 state_reboot (client);
 		 break;
@@ -30,7 +29,7 @@
 	 }
 	}
 diff --git a/common/dispatch.c b/common/dispatch.c
-index d7fe200..8a24499 100644
+index 9741ff5..11c1787 100644
 --- a/common/dispatch.c
 +++ b/common/dispatch.c
 @@ -118,7 +118,6 @@ dispatch(void)
@@ -59,7 +58,7 @@
 
 	log_fatal ("Dispatch routine failed: %s -- exiting",
 diff --git a/includes/dhcpd.h b/includes/dhcpd.h
-index 635c510..ec6c227 100644
+index fabad01..9663508 100644
 --- a/includes/dhcpd.h
 +++ b/includes/dhcpd.h
 @@ -524,7 +524,8 @@ typedef enum {
@@ -73,7 +72,7 @@
 
 typedef struct {
 diff --git a/server/dhcpd.c b/server/dhcpd.c
-index 530a923..4aef16b 100644
+index 845d0cc..3b3bd3b 100644
 --- a/server/dhcpd.c
 +++ b/server/dhcpd.c
 @@ -1767,6 +1767,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate,
@@ -90,5 +89,5 @@
 		return DHCP_R_INVALIDARG;
 	/* Re-entry. */
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0025-bind-Detect-system-time-changes.patch Changed

@@ -1,23 +1,22 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0025-bind-Detect-system-time-changes.patch
-From ef4f5e80d8a1ea1507829ea6f5214f276478f475 Mon Sep 17 00:00:00 2001
+From 8e49f4b460ad20890c63a385c17d3e5decd45a82 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Tue, 22 Oct 2019 16:23:24 +0200
-Subject: PATCH 25/27 bind: Detect system time changes
-Cc: pzhukov@redhat.com
+Subject: PATCH 25/28 bind: Detect system time changes
 
 ---
- bind/bind/lib/isc/include/isc/result.h | 4 ++-
- bind/bind/lib/isc/include/isc/util.h | 4 +++
- bind/bind/lib/isc/result.c | 2 ++
- bind/bind/lib/isc/unix/app.c | 41 ++++++++++++++++++++++++++++---
- bind/bind/lib/isc/unix/include/isc/time.h | 20 +++++++++++++++
- bind/bind/lib/isc/unix/time.c | 22 +++++++++++++++++
+ .../bind-9.11.36/lib/isc/include/isc/result.h | 4 +-
+ bind/bind-9.11.36/lib/isc/include/isc/util.h | 4 ++
+ bind/bind-9.11.36/lib/isc/result.c | 2 +
+ bind/bind-9.11.36/lib/isc/unix/app.c | 41 +++++++++++++++++--
+ .../lib/isc/unix/include/isc/time.h | 20 +++++++++
+ bind/bind-9.11.36/lib/isc/unix/time.c | 22 ++++++++++
 6 files changed, 89 insertions(+), 4 deletions(-)
 
-diff --git a/bind/bind/lib/isc/include/isc/result.h b/bind/bind/lib/isc/include/isc/result.h
-index 0389efa..0e35f98 100644
---- a/bind/bind/lib/isc/include/isc/result.h
-+++ b/bind/bind/lib/isc/include/isc/result.h
+diff --git a/bind/bind-9.11.36/lib/isc/include/isc/result.h b/bind/bind-9.11.36/lib/isc/include/isc/result.h
+index 916641f..51c2468 100644
+--- a/bind/bind-9.11.36/lib/isc/include/isc/result.h
++++ b/bind/bind-9.11.36/lib/isc/include/isc/result.h
 @@ -89,7 +89,9 @@
 #define ISC_R_DISCFULL			67	/*%< disc full */
 #define ISC_R_DEFAULT			68	/*%< default */
@@ -29,11 +28,11 @@
 
 ISC_LANG_BEGINDECLS
 
-diff --git a/bind/bind/lib/isc/include/isc/util.h b/bind/bind/lib/isc/include/isc/util.h
-index 973c348..cceeb5e 100644
---- a/bind/bind/lib/isc/include/isc/util.h
-+++ b/bind/bind/lib/isc/include/isc/util.h
-@@ -289,6 +289,10 @@ extern void mock_assert(const int result, const char* const expression,
+diff --git a/bind/bind-9.11.36/lib/isc/include/isc/util.h b/bind/bind-9.11.36/lib/isc/include/isc/util.h
+index 9111c2a..20a05b4 100644
+--- a/bind/bind-9.11.36/lib/isc/include/isc/util.h
++++ b/bind/bind-9.11.36/lib/isc/include/isc/util.h
+@@ -325,6 +325,10 @@ extern void mock_assert(const int result, const char* const expression,
 * Time
 */
 #define TIME_NOW(tp) 	RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS)
@@ -44,10 +43,10 @@
 
 /*%
 * Alignment
-diff --git a/bind/bind/lib/isc/result.c b/bind/bind/lib/isc/result.c
-index a9db132..7c04831 100644
---- a/bind/bind/lib/isc/result.c
-+++ b/bind/bind/lib/isc/result.c
+diff --git a/bind/bind-9.11.36/lib/isc/result.c b/bind/bind-9.11.36/lib/isc/result.c
+index 887b08c..2106a3a 100644
+--- a/bind/bind-9.11.36/lib/isc/result.c
++++ b/bind/bind-9.11.36/lib/isc/result.c
 @@ -105,6 +105,7 @@ static const char *descriptionISC_R_NRESULTS = {
 	"disc full",				/*%< 67 */
 	"default",				/*%< 68 */
@@ -64,10 +63,10 @@
 };
 
 #define ISC_RESULT_RESULTSET			2
-diff --git a/bind/bind/lib/isc/unix/app.c b/bind/bind/lib/isc/unix/app.c
-index a6e9882..dbd23f7 100644
---- a/bind/bind/lib/isc/unix/app.c
-+++ b/bind/bind/lib/isc/unix/app.c
+diff --git a/bind/bind-9.11.36/lib/isc/unix/app.c b/bind/bind-9.11.36/lib/isc/unix/app.c
+index 8189c63..4aabaa4 100644
+--- a/bind/bind-9.11.36/lib/isc/unix/app.c
++++ b/bind/bind-9.11.36/lib/isc/unix/app.c
 @@ -442,15 +442,51 @@ isc__app_ctxonrun(isc_appctx_t *ctx0, isc_mem_t *mctx, isc_task_t *task,
 static isc_result_t
 evloop(isc__appctx_t *ctx) {
@@ -132,10 +131,10 @@
 				us = isc_time_microdiff(&when, &now);
 				if (us == 0)
 					call_timer_dispatch = true;
-diff --git a/bind/bind/lib/isc/unix/include/isc/time.h b/bind/bind/lib/isc/unix/include/isc/time.h
-index b864c29..5dd43c9 100644
---- a/bind/bind/lib/isc/unix/include/isc/time.h
-+++ b/bind/bind/lib/isc/unix/include/isc/time.h
+diff --git a/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h b/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h
+index 03512c1..99e0dfa 100644
+--- a/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h
++++ b/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h
 @@ -132,6 +132,26 @@ isc_time_isepoch(const isc_time_t *t);
 *\li	't' is a valid pointer.
 */
@@ -163,10 +162,10 @@
 isc_result_t
 isc_time_now(isc_time_t *t);
 /*%<
-diff --git a/bind/bind/lib/isc/unix/time.c b/bind/bind/lib/isc/unix/time.c
-index 8edc9df..fe0bb91 100644
---- a/bind/bind/lib/isc/unix/time.c
-+++ b/bind/bind/lib/isc/unix/time.c
+diff --git a/bind/bind-9.11.36/lib/isc/unix/time.c b/bind/bind-9.11.36/lib/isc/unix/time.c
+index bcca41b..af6ea7f 100644
+--- a/bind/bind-9.11.36/lib/isc/unix/time.c
++++ b/bind/bind-9.11.36/lib/isc/unix/time.c
 @@ -498,3 +498,25 @@ isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) {
 			 t->nanoseconds / NS_PER_MS);
 	}
@@ -194,5 +193,5 @@
 +};
 +#endif
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-0026-Add-dhclient-5-B-option-description.patch Changed

@@ -1,17 +1,19 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0026-Add-dhclient-5-B-option-description.patch
-commit 6acfd3125546a0e5db8fae8a9964cd2f88bf68c0
-Author: Pavel Zhukov <pzhukov@redhat.com>
-Date: Tue Oct 22 16:28:04 2019 +0200
+From aa328eef58ff93110f2a52cb3a80002ab8cee36e Mon Sep 17 00:00:00 2001
+From: Pavel Zhukov <pzhukov@redhat.com>
+Date: Tue, 22 Oct 2019 16:28:04 +0200
+Subject: PATCH 26/28 Add dhclient(5) -B option description
 
- Add dhclient(5) -B option description
- 
- Bug-Url: https://bugzilla.redhat.com/1764088
+Bug-Url: https://bugzilla.redhat.com/1764088
+---
+ client/dhclient.8 | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/client/dhclient.8 b/client/dhclient.8
-index 0145b9f..5226de5 100644
+index bacf3bc..76f0cc0 100644
 --- a/client/dhclient.8
 +++ b/client/dhclient.8
-@@ -552,6 +552,11 @@ Path to the network configuration script invoked by
+@@ -553,6 +553,11 @@ Path to the network configuration script invoked by
 when it gets a lease. If unspecified, the default
 .B CLIENTBINDIR/dhclient-script
 is used. See \fBdhclient-script(8)\fR for a description of this file.
@@ -23,3 +25,6 @@
 .PP
 .SH PORTS
 During operations the client may use multiple UDP ports
+-- 
+2.35.1
+

_service:tar_scm:backport-0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch Changed

@@ -1,9 +1,8 @@
 Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch
-From 8d974fd1f667e1b957ad4092fe66a8bb94f5f8fd Mon Sep 17 00:00:00 2001
+From d1b1f91a7982be28acdfb580996c93aafcc76cc2 Mon Sep 17 00:00:00 2001
 From: Pavel Zhukov <pzhukov@redhat.com>
 Date: Thu, 7 Nov 2019 14:47:45 +0100
-Subject: PATCH 1/1 Add missed sd notify patch to manage dhcpd with systemd
-Cc: pzhukov@redhat.com
+Subject: PATCH 27/28 Add missed sd notify patch to manage dhcpd with systemd
 
 ---
 configure.ac | 11 +++++++++++
@@ -12,10 +11,10 @@
 3 files changed, 35 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 15fc0d7..0c08000 100644
+index 300117f..f644e71 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1014,6 +1014,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes;
+@@ -1005,6 +1005,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes;
 AC_SUBST(LDAP_CFLAGS, $LDAP_CFLAGS)
 fi
 
@@ -34,7 +33,7 @@
 # AC_COMPILE_IFELSE(AC_LANG_PROGRAM(, ),,) & etc).
 CFLAGS="$CFLAGS $STD_CWARNINGS"
 diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index 7b4f4f1..9eb5bfd 100644
+index 0dc17d6..d3ad31e 100644
 --- a/relay/dhcrelay.c
 +++ b/relay/dhcrelay.c
 @@ -37,6 +37,10 @@
@@ -48,7 +47,7 @@
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 struct tree_cache *global_options256;
-@@ -845,6 +849,14 @@ main(int argc, char **argv) {
+@@ -869,6 +873,14 @@ main(int argc, char **argv) {
 	}
 #endif
 
@@ -64,7 +63,7 @@
 	dispatch();
 
 diff --git a/server/dhcpd.c b/server/dhcpd.c
-index 4aef16b..778ef8d 100644
+index 3b3bd3b..9223d5b 100644
 --- a/server/dhcpd.c
 +++ b/server/dhcpd.c
 @@ -60,6 +60,10 @@ gid_t set_gid = 0;
@@ -94,5 +93,5 @@
 	 * Receive packets and dispatch them...
 	 * dispatch() will never return.
 -- 
-2.14.5
+2.35.1

_service:tar_scm:backport-CVE-2021-25217.patch Deleted

@@ -1,34 +0,0 @@
-Reference: https://downloads.isc.org/isc/dhcp/4.4.2-P1/patches/4.4.2.CVE-2021-25217.patch
-diff --git a/common/parse.c b/common/parse.c
-index 3329657..8772540 100644
---- a/common/parse.c
-+++ b/common/parse.c
-@@ -3,7 +3,7 @@
-    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
-@@ -5613,13 +5613,14 @@ int parse_X (cfile, buf, max)
- 				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,
--- 
-1.8.3.1
-

_service:tar_scm:backport-Fix-CVE-2021-25220.patch Added

@@ -0,0 +1,201 @@
+Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/CVE-2021-25220.patch
+diff --git a/bind/bind-9.11.36/lib/dns/resolver.c b/bind/bind-9.11.36/lib/dns/resolver.c
+index b34cb12..8ae9a99 100644
+--- a/bind/bind-9.11.36/lib/dns/resolver.c
++++ b/bind/bind-9.11.36/lib/dns/resolver.c
+@@ -63,6 +63,7 @@
+ #include <dns/stats.h>
+ #include <dns/tsig.h>
+ #include <dns/validator.h>
++#include <dns/zone.h>
+ 
+ #ifdef WANT_QUERYTRACE
+ #define RTRACE(m) isc_log_write(dns_lctx, \
+@@ -311,6 +312,8 @@ struct fetchctx {
+ 	bool			ns_ttl_ok;
+ 	uint32_t			ns_ttl;
+ 	isc_counter_t *			qc;
++	dns_fixedname_t			fwdfname;
++	dns_name_t			*fwdname;
+ 
+ 	/*%
+ 	 * The number of events we're waiting for.
+@@ -3389,6 +3392,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) {
+ 		if (result == ISC_R_SUCCESS) {
+ 			fwd = ISC_LIST_HEAD(forwarders->fwdrs);
+ 			fctx->fwdpolicy = forwarders->fwdpolicy;
++			dns_name_copy(domain, fctx->fwdname, NULL);
+ 			if (fctx->fwdpolicy == dns_fwdpolicy_only &&
+ 			 isstrictsubdomain(domain, &fctx->domain)) {
+ 				fcount_decr(fctx);
+@@ -4418,6 +4422,9 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
+ 	fctx->restarts = 0;
+ 	fctx->querysent = 0;
+ 	fctx->referrals = 0;
++
++	fctx->fwdname = dns_fixedname_initname(&fctx->fwdfname);
++
+ 	TIME_NOW(&fctx->start);
+ 	fctx->timeouts = 0;
+ 	fctx->lamecount = 0;
+@@ -4476,8 +4483,10 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
+ 		domain = dns_fixedname_initname(&fixed);
+ 		result = dns_fwdtable_find2(fctx->res->view->fwdtable, fwdname,
+ 					 domain, &forwarders);
+-		if (result == ISC_R_SUCCESS)
++		if (result == ISC_R_SUCCESS) {
+ 			fctx->fwdpolicy = forwarders->fwdpolicy;
++			dns_name_copy(domain, fctx->fwdname, NULL);
++		}
+ 
+ 		if (fctx->fwdpolicy != dns_fwdpolicy_only) {
+ 			/*
+@@ -6226,6 +6235,112 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset,
+ 		rdataset->attributes |= DNS_RDATASETATTR_EXTERNAL;
+ }
+ 
++/*
++ * Returns true if 'name' is external to the namespace for which
++ * the server being queried can answer, either because it's not a
++ * subdomain or because it's below a forward declaration or a
++ * locally served zone.
++ */
++static inline bool
++name_external(dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) {
++	isc_result_t result;
++	dns_forwarders_t *forwarders = NULL;
++	dns_fixedname_t fixed, zfixed;
++	dns_name_t *fname = dns_fixedname_initname(&fixed);
++	dns_name_t *zfname = dns_fixedname_initname(&zfixed);
++	dns_name_t *apex = NULL;
++	dns_name_t suffix;
++	dns_zone_t *zone = NULL;
++	unsigned int labels;
++	dns_namereln_t rel;
++	/*
++	 * The following two variables do not influence code flow; they are
++	 * only necessary for calling dns_name_fullcompare().
++	 */
++	int _orderp = 0;
++	unsigned int _nlabelsp = 0;
++
++	apex = ISFORWARDER(fctx->addrinfo) ? fctx->fwdname : &fctx->domain;
++
++	/*
++	 * The name is outside the queried namespace.
++	 */
++	rel = dns_name_fullcompare(name, apex, &_orderp, &_nlabelsp);
++	if (rel != dns_namereln_subdomain && rel != dns_namereln_equal) {
++		return (true);
++	}
++
++	/*
++	 * If the record lives in the parent zone, adjust the name so we
++	 * look for the correct zone or forward clause.
++	 */
++	labels = dns_name_countlabels(name);
++	if (dns_rdatatype_atparent(type) && labels > 1U) {
++		dns_name_init(&suffix, NULL);
++		dns_name_getlabelsequence(name, 1, labels - 1, &suffix);
++		name = &suffix;
++	} else if (rel == dns_namereln_equal) {
++		/* If 'name' is 'apex', no further checking is needed. */
++		return (false);
++	}
++
++	/*
++	 * If there is a locally served zone between 'apex' and 'name'
++	 * then don't cache.
++	 */
++	LOCK(&fctx->res->view->lock);
++	if (fctx->res->view->zonetable != NULL) {
++		unsigned int options = DNS_ZTFIND_NOEXACT;
++		result = dns_zt_find(fctx->res->view->zonetable, name, options,
++				 zfname, &zone);
++		if (zone != NULL) {
++			dns_zone_detach(&zone);
++		}
++		if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
++			if (dns_name_fullcompare(zfname, apex, &_orderp,
++						 &_nlabelsp) ==
++			 dns_namereln_subdomain)
++			{
++				UNLOCK(&fctx->res->view->lock);
++				return (true);
++			}
++		}
++	}
++	UNLOCK(&fctx->res->view->lock);
++
++	/*
++	 * Look for a forward declaration below 'name'.
++	 */
++	result = dns_fwdtable_find2(fctx->res->view->fwdtable, name, fname,
++				 &forwarders);
++
++	if (ISFORWARDER(fctx->addrinfo)) {
++		/*
++		 * See if the forwarder declaration is better.
++		 */
++		if (result == ISC_R_SUCCESS) {
++			return (!dns_name_equal(fname, fctx->fwdname));
++		}
++
++		/*
++		 * If the lookup failed, the configuration must have
++		 * changed: play it safe and don't cache.
++		 */
++		return (true);
++	} else if (result == ISC_R_SUCCESS &&
++		 forwarders->fwdpolicy == dns_fwdpolicy_only &&
++		 !ISC_LIST_EMPTY(forwarders->fwdrs))
++	{
++		/*
++		 * If 'name' is covered by a 'forward only' clause then we
++		 * can't cache this repsonse.
++		 */
++		return (true);
++	}
++
++	return (false);
++}
++
+ static isc_result_t
+ check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type,
+ 	 dns_section_t section)
+@@ -6254,7 +6369,7 @@ check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type,
+ 	result = dns_message_findname(rmessage, section, addname,
+ 				 dns_rdatatype_any, 0, &name, NULL);
+ 	if (result == ISC_R_SUCCESS) {
+-		external = !dns_name_issubdomain(name, &fctx->domain);
++		external = name_external(name, type, fctx);
+ 		if (type == dns_rdatatype_a) {
+ 			for (rdataset = ISC_LIST_HEAD(name->list);
+ 			 rdataset != NULL;
+@@ -7136,6 +7251,13 @@ answer_response(fetchctx_t *fctx, dns_message_t *message) {
+ 			break;
+ 
+ 		case dns_namereln_subdomain:
++			/*
++			 * Don't accept DNAME from parent namespace.
++			 */
++			if (name_external(name, dns_rdatatype_dname, fctx)) {
++				continue;
++			}
++
+ 			/*
+ 			 * In-scope DNAME records must have at least
+ 			 * as many labels as the domain being queried.
+@@ -7371,11 +7493,9 @@ answer_response(fetchctx_t *fctx, dns_message_t *message) {
+ 	 */
+ 	result = dns_message_firstname(message, DNS_SECTION_AUTHORITY);
+ 	while (!done && result == ISC_R_SUCCESS) {
+-		bool external;
+ 		name = NULL;
+ 		dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name);
+-		external = !dns_name_issubdomain(name, &fctx->domain);
+-		if (!external) {
++		if (!name_external(name, dns_rdatatype_ns, fctx)) {
+ 			/*
+ 			 * We expect to find NS or SIG NS rdatasets, and
+ 			 * nothing else.

_service:tar_scm:backport-Fix-CVE-2022-2928.patch Added

@@ -0,0 +1,114 @@
+Conflict:NA
+Reference:https://downloads.isc.org/isc/dhcp/4.4.3-P1/patches/CVE-2022-2928.4-4-3.diff
+---
+ common/options.c               |  7 +++++
+ common/tests/option_unittest.c | 54 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+)
+
+diff --git a/common/options.c b/common/options.c
+index 4e26094..8e5dfb1 100644
+--- a/common/options.c
++++ b/common/options.c
+@@ -4499,6 +4499,8 @@ add_option(struct option_state *options,
+ 	if (!option_cache_allocate(&oc, MDL)) {
+ 		log_error("No memory for option cache adding %s (option %d).",
+ 			  option->name, option_num);
++		/* Get rid of reference created during hash lookup. */
++		option_dereference(&option, MDL);
+ 		return 0;
+ 	}
+ 
+@@ -4510,6 +4512,8 @@ add_option(struct option_state *options,
+ 			     MDL)) {
+ 		log_error("No memory for constant data adding %s (option %d).",
+ 			  option->name, option_num);
++		/* Get rid of reference created during hash lookup. */
++		option_dereference(&option, MDL);
+ 		option_cache_dereference(&oc, MDL);
+ 		return 0;
+ 	}
+@@ -4518,6 +4522,9 @@ add_option(struct option_state *options,
+ 	save_option(&dhcp_universe, options, oc);
+ 	option_cache_dereference(&oc, MDL);
+ 
++	/* Get rid of reference created during hash lookup. */
++	option_dereference(&option, MDL);
++
+ 	return 1;
+ }
+ 
+diff --git a/common/tests/option_unittest.c b/common/tests/option_unittest.c
+index 688762d..afd041c 100644
+--- a/common/tests/option_unittest.c
++++ b/common/tests/option_unittest.c
+@@ -283,6 +283,59 @@ ATF_TC_BODY(parse_code93_option, tc)
+     }
+ }
+ 
++ATF_TC(add_option_ref_cnt);
++
++ATF_TC_HEAD(add_option_ref_cnt, tc)
++{
++	atf_tc_set_md_var(tc, "descr",
++		"Verify add_option() does not leak option ref counts.");
++}
++
++ATF_TC_BODY(add_option_ref_cnt, tc)
++{
++	struct option_state *options = NULL;
++	struct option *option = NULL;
++	unsigned int cid_code = DHO_DHCP_CLIENT_IDENTIFIER;
++	char *cid_str = "1234";
++	int refcnt_before = 0;
++
++	// Look up the option we're going to add.
++	initialize_common_option_spaces();
++	if (!option_code_hash_lookup(&option, dhcp_universe.code_hash,
++				&cid_code, 0, MDL)) {
++		atf_tc_fail("cannot find option definition?");
++	}
++
++	// Get the option's reference count before we call add_options.
++	refcnt_before = option->refcnt;
++
++	// Allocate a option_state to which to add an option.
++	if (!option_state_allocate(&options, MDL)) {
++		atf_tc_fail("cannot allocat options state");
++	}
++
++	// Call add_option() to add the option to the option state.
++	if (!add_option(options, cid_code, cid_str, strlen(cid_str))) {
++		atf_tc_fail("add_option returned 0");
++	}
++
++	// Verify that calling add_option() only adds 1 to the option ref count.
++	if (option->refcnt != (refcnt_before + 1)) {
++		atf_tc_fail("after add_option(), count is wrong, before %d, after: %d",
++			    refcnt_before, option->refcnt);
++	}
++
++	// Derefrence the option_state, this should reduce the ref count to
++	// it's starting value.
++	option_state_dereference(&options, MDL);
++
++	// Verify that dereferencing option_state restores option ref count.
++	if (option->refcnt != refcnt_before) {
++		atf_tc_fail("after state deref, count is wrong, before %d, after: %d",
++			    refcnt_before, option->refcnt);
++	}
++}
++
+ /* 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. */
+@@ -292,6 +345,7 @@ ATF_TP_ADD_TCS(tp)
+     ATF_TP_ADD_TC(tp, pretty_print_option);
+     ATF_TP_ADD_TC(tp, parse_X);
+     ATF_TP_ADD_TC(tp, parse_code93_option);
++    ATF_TP_ADD_TC(tp, add_option_ref_cnt);
+ 
+     return (atf_no_error());
+ }
+-- 
+2.23.0
+

_service:tar_scm:backport-Fix-CVE-2022-2929.patch Added

_service:tar_scm:feature-lease-time-config-ipv6.patch Changed

@@ -2,7 +2,7 @@
 From: majun <majun65@huawei.com>
 Date: Tue, 1 Sep 2020 11:50:17 +0800
 Subject: PATCH lease-time-config
-Signed-off-by: majun <majun65@huawei.com> 
+Signed-off-by: majun <majun65@huawei.com>
 
 ---
 client/clparse.c | 5 +++++
@@ -11,7 +11,7 @@
 3 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/client/clparse.c b/client/clparse.c
-index d445bae..d43e8ae 100644
+index 57f6456..b548ff0 100644
 --- a/client/clparse.c
 +++ b/client/clparse.c
 @@ -453,6 +453,11 @@ void parse_client_statement (cfile, ip, config)
@@ -27,10 +27,10 @@
 		skip_token(&val, (unsigned *)0, cfile);
 		token = next_token (&val, (unsigned *)0, cfile);
 diff --git a/common/conflex.c b/common/conflex.c
-index 71c0bf5..fa3acb8 100644
+index 1fa2be3..a83cf47 100644
 --- a/common/conflex.c
 +++ b/common/conflex.c
-@@ -1146,6 +1146,9 @@ intern(char *atom, enum dhcp_token dfv) {
+@@ -1148,6 +1148,9 @@ intern(char *atom, enum dhcp_token dfv) {
 		if (!strcasecmp (atom + 1, "ease-id-format")) {
 			return LEASE_ID_FORMAT;
 		}
@@ -41,16 +41,16 @@
 	 case 'm':
 		if (!strncasecmp (atom + 1, "ax", 2)) {
 diff --git a/includes/dhctoken.h b/includes/dhctoken.h
-index b4d93ba..0bc31ca 100644
+index 3f5334e..b23d8ce 100644
 --- a/includes/dhctoken.h
 +++ b/includes/dhctoken.h
-@@ -378,7 +378,8 @@ enum dhcp_token {
- 	TOKEN_OCTAL = 678,
+@@ -379,7 +379,8 @@ enum dhcp_token {
 	KEY_ALGORITHM = 679,
- BOOTP_BROADCAST_ALWAYS = 680,
--	DESTINATION_DESCRIPTOR = 681
-+	DESTINATION_DESCRIPTOR = 681,
-+	LEASE_TIME_IPV6 = 682
+ 	BOOTP_BROADCAST_ALWAYS = 680,
+ 	DESTINATION_DESCRIPTOR = 681,
+-	DISCONNECT = 682
++	DISCONNECT = 682,
++ LEASE_TIME_IPV6 = 683
 };
 
 #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\

_service:tar_scm:fix-multiple-definition-with-gcc-10-1.patch Deleted

@@ -1,43 +0,0 @@
-From 49cbb576f142032e1fb687a58284a1d032d87770 Mon Sep 17 00:00:00 2001
-From: renmingshuai <renmingshuai@huawei.com>
-Date: Fri, 30 Jul 2021 21:35:20 +0800
-Subject: PATCH fix multiple definition with gcc 10
-
----
- client/dhclient.c | 4 ++--
- relay/dhcrelay.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 2a17bfd..f2c2630 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -93,8 +93,8 @@ 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;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
- #if defined(DHCPv6) && defined(DHCP4o6)
- int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
- #endif
-diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
-index 155dd37..b487373 100644
---- a/relay/dhcrelay.c
-+++ b/relay/dhcrelay.c
-@@ -104,8 +104,8 @@ enum { forward_and_append,	/* Forward and append our own relay option. */
- forward_untouched,	/* Forward without changes. */
- discard } agent_relay_mode = forward_and_replace;
- 
--u_int16_t local_port;
--u_int16_t remote_port;
-+extern u_int16_t local_port;
-+extern u_int16_t remote_port;
- 
- /* Relay agent server list. */
- struct server_list {
--- 
-1.8.3.1
-

_service:tar_scm:fix-multiple-definition-with-gcc-10-2.patch Deleted

_service Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/CONTRIBUTING.md -> _service:tar_scm:dhcp-4.4.3.tar.gz/CONTRIBUTING.md Changed

@@ -7,6 +7,12 @@
 you are agreeing that your code will be covered by the primary license for the project.
 ISC DHCP is currently licensed under the MPL2.0 license.
 
+**NOTE**: The client (dhclient) and relay (dhcrelay) component maintenance is coming to an end.
+The 4.4.3 release is the last one that included those components and they are now considered EOL.
+The 4.5.0 release will feature server (dhcpd) only. You may still submit bugs for a client or
+relay, but those will be kept for informational purposes only. There will not be any action
+taken by ISC team on those.
+
 Here's are the steps in contributing a patch:
 
 1. **create account** on gitlab(https://gitlab.isc.org)
@@ -193,4 +199,4 @@
 that in mind if you plan to submit a patch and forget about it. We may accept it eventually, but
 it's a much, much faster process if you participate in it.
 
-#### Thank you for contributing your time and expertise to the ISC DHCP Project.
+**Thank you for contributing your time and expertise to the ISC DHCP Project.**

_service:tar_scm:dhcp-4.4.2.tar.gz/LICENSE -> _service:tar_scm:dhcp-4.4.3.tar.gz/LICENSE Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -184,9 +184,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/doc/devel/doxyfile.in README compile \
 	config.guess config.sub depcomp install-sh missing
@@ -228,6 +225,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -259,6 +258,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -270,6 +271,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -558,7 +560,6 @@
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -642,6 +643,10 @@
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 
+dist-zstd: distdir
+	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+	$(am__post_remove_distdir)
+
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
@@ -684,6 +689,8 @@
 	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
+	*.tar.zst*) \
+	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
@@ -700,7 +707,7 @@
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -865,12 +872,12 @@
 	am--refresh check check-am clean clean-cscope clean-generic \
 	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
 	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-local \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man \
+	dist-zstd distcheck distclean distclean-generic \
+	distclean-local distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
 	install-nobase_includeHEADERS install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \

_service:tar_scm:dhcp-4.4.2.tar.gz/README -> _service:tar_scm:dhcp-4.4.3.tar.gz/README Changed

@@ -1,6 +1,6 @@
 	      Internet Systems Consortium DHCP Distribution
-			     Version 4.4.2
-			    22 January 2020
+			     Version 4.4.3
+			     9 March 2022
 
 			      README FILE
 
@@ -62,13 +62,15 @@
 client lease database is documented in the dhclient.leases man page.
 The source for all these man pages is in the client/ subdirectory in
 the distribution.   In addition, the dhcp-options man page should be
-referred to for information about DHCP options.
+referred to for information about DHCP options. The client component
+is End-of-Life and will not be part of future releases.
 
 DHCP relay agent documentation is in the dhcrelay man page, the source
-for which is distributed in the relay/ subdirectory.
+for which is distributed in the relay/ subdirectory. The relay component
+is End-of-Life and will not be part of future releases.
 
 KEA Migration Assistant documentation, including how to build, install
-and use it, is including in the keama directory.
+and use it, is included in the keama/ directory.
 
 To read installed manual pages, use the man command.  Type "man page"
 where page is the name of the manual page.   This will only work if
@@ -90,6 +92,12 @@
 'make install' (so if you're reading a manpage out of the source
 directory, it may not have up-to-date information).
 
+				RELEASE STATUS
+
+Version 4.4.3 is a maintenance release of the DHCP client, relay and
+server. It is the final release for the client and relay components,
+which have reached end-of-life and will no longer be maintained.
+
 		    BUILDING THE DHCP DISTRIBUTION
 
 			     UNPACKING IT
@@ -97,12 +105,12 @@
 To build the DHCP Distribution, unpack the compressed tar file using
 the tar utility and the gzip command - type something like:
 
-	gunzip dhcp-4.4.2.tar.gz
-	tar xvf dhcp-4.4.2.tar
+	gunzip dhcp-4.4.3.tar.gz
+	tar xvf dhcp-4.4.3.tar
 
 			    CONFIGURING IT
 
-Now, cd to the dhcp-4.4.2 subdirectory that you've just created and
+Now, cd to the dhcp-4.4.3 subdirectory that you've just created and
 configure the source tree by typing:
 
 	./configure
@@ -348,7 +356,7 @@
 			       ATF
 
 Please see the file DHCP/doc/devel/atf.dox for a description of building
-and using these tools.  
+and using these tools.
 
 The optional unit tests use ATF (Automated Testing Framework) including
 the atf-run and atf-report tools. ATF deprecated these tools in
@@ -384,7 +392,7 @@
 WHERE TO SEND FEATURE REQUESTS: We like to hear your feedback.  We may
 not respond to it all the time, but we do read it.  If ISC DHCP doesn't
 work well for you, or you have an idea that would improve it for your
-use, please create an issue at https://gitlab.isc.org/isc-projects/dhcp/issues.  
+use, please create an issue at https://gitlab.isc.org/isc-projects/dhcp/issues.
 This is also an excellent place to send patches that add new features.
 
 WHERE TO REPORT BUGS: If you want the act of sending in a bug report
@@ -393,17 +401,20 @@
 but fundamentally you are making a support request, so please use the
 addresses described in the previous paragraphs.  If you are _sure_ that
 your problem is a bug, and not user error, or if your bug report
-includes a patch, you can submit it to our ticketing system at 
-https://gitlab.isc.org/isc-projects/dhcp/issues.  If you have not received 
+includes a patch, you can submit it to our ticketing system at
+https://gitlab.isc.org/isc-projects/dhcp/issues.  If you have not received
 a notice that the ticket has been resolved, then we're still working on it.
+Notice that this is the final release that features client and relay
+components. Reporting bugs in them makes limited sense. The ISC team
+will not be fixing any issues related to client or relay. They may be
+useful for other users to document some problems or perhaps discuss
+and share workarounds.
 
 PLEASE DO NOT REPORT BUGS IN OLD SOFTWARE RELEASES!  Fetch the latest
 release and see if the bug is still in that version of the software,
-and if it is still present, _then_ report it.  ISC release versions 
-always have three numbers, for example: 1.2.3.  The 'major release' is 
-1 here, the 'minor release' is 2, and the 'maintenance release' is 3.  
-ISC will accept bug reports against the most recent two major.minor
-releases: for example, 1.0.0 and 0.9.0, but not 0.8.* or prior.
+and if it is still present, _then_ report it.  ISC release versions
+always have three numbers, for example: 1.2.3.  The 'major release' is
+1 here, the 'minor release' is 2, and the 'maintenance release' is 3.
 
 PLEASE take a moment to determine where the ISC DHCP distribution
 that you're using came from.  ISC DHCP is sometimes heavily modified
@@ -483,7 +494,8 @@
 support, OMAPI, Dynamic DNS, conditional behaviour, client classing,
 and more. Version 3 of the DHCP server was funded by Nominum, Inc.
 The 4.0 release in December 2007 introduced DHCPv6 protocol support
-for the server and client.
+for the server and client. The client and relay components reached
+their End-of-Life in January 2022.
 
 This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).

_service:tar_scm:dhcp-4.4.2.tar.gz/RELNOTES -> _service:tar_scm:dhcp-4.4.3.tar.gz/RELNOTES Changed

@@ -1,108 +1,107 @@
 Internet Systems Consortium DHCP Distribution
- Version 4.4.2
- 22 January 2020
- Release Notes
+ Version 4.4.3
+ 9 March 2022
+ Release Notes
 
- NEW FEATURES
+ NEW FEATURES
 
-Please note that that ISC DHCP is now licensed under the Mozilla Public License,
-MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0
-license terms.
+Please note that that ISC DHCP is licensed under the Mozilla Public
+License, MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read
+the MPL 2.0 license terms.
 
-While release 4.4.2 is primarily a maintenance release that addresses a number
-of defects, it does introduce a few new features:
+NOTE: The client and relay components are now End-Of-Life.
+4.4.3 is the final release for those components.
 
-- Keama - Keama is a migration utility that assists in converting ISC DHCP
- server configuration files to Kea configuration files. It is found in the
- keama subdirectory and includes a README.md file with instructions on how
- to build it as well as a manpage on its usage.
-
-- Two new server parameters related to ping checking were added:
-
-1. ping-cltt-secs which allows the user to specify the number of seconds
- that must elapse since CLTT before a ping check is conducted.
-
-2. ping-timeout-ms which allows the user to specify the amount of time the
- server waits for a ping-check response in milliseconds rather than in
- seconds.
-
-In general, the areas of focus for ISC DHCP 4.4 were:
-
-1. Dynamic DNS additions
-2. dhclient improvements
-3. Support for dynamic shared libraries
-
-Dynamic DNS Improvements:
-
-- We added three new server configuration parameters which influence DDNS
- conflict resolution:
-
- 1. ddns-dual-stack-mixed-mode - alters DNS conflict resolution behavior
- to mitigate issues with non-compliant clients in dual stack environments.
-
- 2. ddns-guard-id-must-match - relaxes the DHCID RR client id matching
- requirement of DNS conflict resolution.
-
- 3. ddns-other-guard-is-dynamic - alters dual-stack-mixed-mode behavior to
- allow unguarded DNS entries to be overwritten in certain cases
-
-- The server now honors update-static-leases parameter for static DHCPv6
- hosts.
-
-dhclient Improvements:
-
- - We've added three command line parameters to dhclient:
-
- 1. --prefix-len-hint - directs dhclient to use the given length as
- the prefix length hint when requesting prefixes
-
- 2. --decline-wait-time - instructs the client to wait the given number
- of seconds after declining an IPv4 address before issuing a discover
-
- 3. --address-prefix-len - specifies the prefix length passed by dhclient
- into the client script (via the environment variable ip6_prefixlen) with
- each IPv6 address. We added this parameter because we have changed the
- default value from 64 to 128 in order to be compliant with RFC3315bis
- draft (-09, page 64) and RFC5942, Section 4, point 1.
- **WARNING**: The new default value of 128 may not be backwardly compatible
- with your environment. If you are operating without a router, such as
- between VMs on a host, you may find they cannot see each other with prefix
- length of 128. In such cases, you'll need to either provide routing or use
- the command line parameter to set the value to 64. Alternatively you may
- change the default at compile time by setting DHCLIENT_DEFAULT_PREFIX_LEN
- in includes/site.h.
-
- - dhclient will now generate a DHCPv6 DECLINE message when the client script
- indicates a DAD failure
-
-Dynamic shared library support:
-
- Configure script, configure.ac+lt, which supports libtool is now provided
- with the source tar ball. This script can be used to configure ISC DHCP
- to build with libtool and thus use dynamic shared libraries.
-
-Other Highlights:
-
- - The server now supports dhcp-cache-threshold for DHCPv6 operations
- - The server now supports DHPv6 address allocation based on EUI-64 DUIDs
- - Experimental support for alternate relay port in the both the server
- and relay for IPv4, IPv6 and 4o6 (see: draft-ietf-dhc-relay-port-10.txt)
-
-For information on how to install, configure and run this software, as
+For information on how to install, configure, and run this software, as
 well as how to find documentation and report bugs, please consult the
 README file.
 
-ISC DHCP uses standard GNU configure for installation. Please review the
-output of "./configure --help" to see what options are available.
+ISC DHCP uses the standard GNU configure command for installation. Please review the
+output of `./configure --help` to see what options are available.
 
-The system has only been tested on Linux, FreeBSD, and Solaris, and may not
-work on other platforms. Please report any problems and suggested fixes to
-<dhcp-users@isc.org>.
+The system has only been tested on Linux and FreeBSD, and may not work on
+other platforms. Please subscribe to the dhcp-users mailing list at
+https://lists.isc.org/mailman/listinfo/dhcp-users and report any problems
+and/or suggested fixes to dhcp-users@lists.isc.org.
 
 ISC DHCP is open source software maintained by Internet Systems
 Consortium. This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
+		Changes since 4.4.2-P1 (New Features)
+
+- Two new OMAPI function calls were added, `dhcpctl_timed_connect()`
+ and `dhcpctl_timed_wait_for_completion()`. These provide timed
+ versions of creating a connection and waiting for an operation
+ to complete.
+ GitLab #76
+
+- The BIND libraries have been updated to the latest version, 9.11.36. This fixes a number
+ of compilation issues on various systems, including OpenWRT. Thanks to
+ Philip Prindeville for testing on OpenWRT.
+ GitLab #218, #171, #180, #192
+
+- Support was added for the new DHCPv4 option v6-only-preferred, specified
+ in RFC 8925. A new reason code, V6ONLY, was added to the client script
+ and the client Linux script sample was updated.
+ GitLab #132
+
+		Changes since 4.4.2-P1 (Bug Fixes)
+
+- Minor corrections were made to allow compilation under gcc 10.
+ GitLab #117
+
+- The logic in dhclient that causes it to decline DHCPv4 leases if the
+ client script exits abnormally (i.e. crashes) has been corrected.
+ GitLab #123
+
+- The limit on the size of a lease file that can be loaded at startup
+ is now only enforced on 32-bit systems.
+ GitLab #92
+
+- The PRNG initialization has been improved. It now uses the configure flag
+ `--with-randomdev=PATH`, which specifies the device from which to read the
+ initial seed. That is typically `/dev/random` (the default value) or
+ `/dev/urandom`, but may be specified otherwise on the local system. The old
+ behavior can be forced by disabling this feature (`--with-randomdev=no`).
+ If the initialization is disabled or reading from the random device fails,
+ the previous algorithm (retrieve the last four bytes of hardware addresses
+ from all network interfaces that have them, and use the current time and
+ process ID) is used.
+ GitLab #197
+
+- A minor dhclient code fix was made to remove compilation warnings.
+ GitLab #190
+
+- The hard-coded MD5 algorithm name was removed in OMAPI connection logic.
+ Previously, using any other algorithm via a key-algorithm statement would
+ allow OMAPI connections to be made, but subsequent actions such as updating
+ an object would fail.
+ GitLab #148
+
+- The parallel build has been improved. Thanks to Sergei Trofimovich for
+ the patch. The parallel build is still experimental, as officially the
+ BIND 9 code does not support the parallel build for libraries.
+ GitLab #91
+
+- Handling of LDAP options (`ldap-gssapi-principal` and `ldap-gssapi-keytab`)
+ has been improved. This is contributed code that has not been tested by ISC. Thank
+ you to Petr Mensik and Pavel Zhukov for the patches!
+ GitLab !56,!75
+
+- It is now possible to use `option -g ipaddr` in the dhcrelay to replace the giaddr sent to
+ clients with the given ipaddr, to work around bogus clients like Solaris 11
+ grub which use giaddr instead of the announced router (3) to set up their
+ default route. Thanks to Jens Elkner for the patch!
+ GitLab #223, !86, !92
+
+		Changes since 4.4.2 (Bug Fixes)
+
+- Corrected a buffer overwrite possible when parsing hexadecimal
+ literals with more than 1024 octets.
+ Gitlab #182
+ CVE: CVE-2021-25217
+
 		Changes since 4.4.2b1 (Bug Fixes)
 
 - Added a clarification on DHCPINFORMs and server authority to
@@ -121,11 +120,11 @@
 - Corrected buffer pointer logic in dhcrelay functions that manipulate
 agent relay options. Thanks to Thomas Imbert of MSRC Vulnerabilities
 & Mitigations for reporting the issue.
- #71
+ Gitlab #71
 
 - Corrected unresolved symbol errors building relay_unittests when
 configured to build using libtool.
- #80
+ Gitlab #80
 
 		Changes since 4.4.1 (New Features)

_service:tar_scm:dhcp-4.4.2.tar.gz/aclocal.m4 -> _service:tar_scm:dhcp-4.4.3.tar.gz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@
 am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if($1, 1.16.1, ,
+m4_if($1, 1.16.5, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -51,14 +51,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.16.1)dnl
+AM_AUTOMAKE_VERSION(1.16.5)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
 
 # AM_COND_IF                                            -*- Autoconf -*-
 
-# Copyright (C) 2008-2018 Free Software Foundation, Inc.
+# Copyright (C) 2008-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -147,7 +147,7 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -178,7 +178,7 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -369,7 +369,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -408,7 +408,9 @@
   done
   if test $am_rc -ne 0; then
     AC_MSG_FAILURE(Something went wrong bootstrapping makefile fragments
-    for automatic dependency tracking.  Try re-running configure with the
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE="gmake" (or whatever is
+    necessary).  You can also try re-running configure with the
     '--disable-dependency-tracking' option to at least be able to build
     the package (albeit without support for automatic dependency tracking).)
   fi
@@ -435,7 +437,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -463,6 +465,10 @@
 # release and drop the old call support.
 AC_DEFUN(AM_INIT_AUTOMAKE,
 AC_PREREQ(2.65)dnl
+m4_ifdef(_$0_ALREADY_INIT,
+  m4_fatal($0 expanded multiple times
+m4_defn(_$0_ALREADY_INIT)),
+  m4_define(_$0_ALREADY_INIT, m4_expansion_stack))dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
@@ -499,7 +505,7 @@
 _AM_SET_OPTIONS($1)dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
+  m4_ifset(AC_PACKAGE_NAME, ok):m4_ifset(AC_PACKAGE_VERSION, ok),
   ok:ok,,
   m4_fatal(AC_INIT should be called with package and version arguments))dnl
  AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
@@ -551,6 +557,20 @@
 		  m4_define(AC_PROG_OBJCXX,
 			     m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
 )
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST(CTAGS)
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST(ETAGS)
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST(CSCOPE)
+
 AC_REQUIRE(AM_SILENT_RULES)dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@@ -632,7 +652,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -653,7 +673,7 @@
 fi
 AC_SUBST(install_sh))
 
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -675,7 +695,7 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -710,7 +730,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -753,7 +773,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -774,12 +794,7 @@
 AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
 AC_REQUIRE_AUX_FILE(missing)dnl
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -792,7 +807,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -821,7 +836,7 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -868,7 +883,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -887,7 +902,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -968,7 +983,7 @@
 rm -f conftest.file
 )
 
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1028,7 +1043,7 @@
 _AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
 )
 
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1056,7 +1071,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1075,7 +1090,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

_service:tar_scm:dhcp-4.4.2.tar.gz/bind/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/bind/Makefile.in Changed

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2019  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2022  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -59,7 +59,7 @@
                  ./configure ${bindconfig} > ${binddir}/configure.log); \
 	fi
 
-atf:
+atf: bind1
 # Build and copy the ATF support if not yet installed.
 	@if test -d ./atf ; then                      \
 		echo ATF support already installed ;  \
@@ -70,7 +70,8 @@
 		 cp -rp atf ${binddir}) ;             \
 	fi
 
-bind2:
+@BIND_ATF_TRUE@bind2: atf
+bind2: bind1
 # Build and install the libraries
 # No need to do anything if we already have something installed.
 	@if test -d ${binddir}/lib ; then                                 \
@@ -116,5 +117,6 @@
 
 # Include the following so that this Makefile is happy when the parent
 # tries to use them.
+install-exec:
 
 check distdir distclean dvi installcheck:

_service:tar_scm:dhcp-4.4.2.tar.gz/bind/bind.tar.gz -> _service:tar_scm:dhcp-4.4.3.tar.gz/bind/bind.tar.gz Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/bind/version.tmp -> _service:tar_scm:dhcp-4.4.3.tar.gz/bind/version.tmp Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/client/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -211,8 +211,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -268,6 +266,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -279,6 +279,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -702,7 +703,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/client/client_tables.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/client_tables.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/client/clparse.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/clparse.c Changed

@@ -3,7 +3,7 @@
 Parser for dhclient config and lease files... */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -62,7 +62,7 @@
 	isc_result_t status;
 	unsigned code;
 
- /* 
+ /*
 * TODO: LATER constant is very undescriptive. We should review it and
 * change it to something more descriptive or even better remove it
 * completely as it is currently not used.
@@ -162,7 +162,7 @@
 		}
 	}
 #endif
-					
+
 	/* Initialize the top level client configuration. */
 	memset (&top_level_config, 0, sizeof top_level_config);
 
@@ -317,7 +317,7 @@
 		/*
 		 * All we care about is DUIDs - if we get anything else
 		 * just toss it and continue looking for DUIDs until we
-		 * run out of file. 
+		 * run out of file.
 		 */
 		if (token == DEFAULT_DUID) {
 			parse_client_default_duid(cfile);
@@ -377,7 +377,7 @@
 	end_parse (&cfile);
 }
 
-/* client-declaration :== 
+/* client-declaration :==
 	SEND option-decl |
 	DEFAULT option-decl |
 	SUPERSEDE option-decl |
@@ -430,7 +430,7 @@
 			parse_semi (cfile);
 		}
 		return;
-		
+
 	 case KEY:
 		skip_token(&val, (unsigned *)0, cfile);
 		if (ip) {
@@ -577,7 +577,7 @@
 			parse_warn (cfile, "expecting a policy type.");
 			skip_to_semi (cfile);
 			return;
-		} 
+		}
 		break;
 
 	 case OPTION:
@@ -705,7 +705,7 @@
 			config -> omapi_port = tmp;
 		parse_semi (cfile);
 		return;
-		
+
 	 case DO_FORWARD_UPDATE:
 		skip_token(&val, (unsigned *)0, cfile);
 		token = next_token (&val, (unsigned *)0, cfile);
@@ -799,7 +799,7 @@
 		strcpy (name, val);
 		parse_interface_declaration (cfile, config, name);
 		return;
-		
+
 	 case LEASE:
 		skip_token(&val, (unsigned *)0, cfile);
 		parse_client_lease_statement (cfile, 1);
@@ -1170,7 +1170,7 @@
 		client -> leases = lease;
 		return;
 	}
-		
+
 	/* The last lease in the lease file on a particular interface is
 	 the active lease for that interface. Of course, we don't know
 	 what the last lease in the file is until we've parsed the whole
@@ -2270,7 +2270,7 @@
 				 "for reject statement");
 		 skip_to_semi(cfile);
 		 return;
-		} 
+		}
 
 		list = dmalloc(sizeof(struct iaddrmatchlist), MDL);
 		if (!list)
@@ -2287,7 +2287,7 @@
 		parse_warn (cfile, "expecting semicolon.");
 		skip_to_semi (cfile);
 	}
-}	
+}
 
 /* allow-deny-keyword :== BOOTP
 			| BOOTING

_service:tar_scm:dhcp-4.4.2.tar.gz/client/dhc6.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/dhc6.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/client/dhclient-script.8 -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/dhclient-script.8 Changed

@@ -1,6 +1,6 @@
 .\"	dhclient-script.8
 .\"
-.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 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
@@ -16,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -129,7 +129,7 @@
 for example requested_subnet_mask=1. No such variable is defined for
 options not requested by the client or options that don't require a
 request option, such as the ip address (*_ip_address) or expiration
-time (*_expiry). 
+time (*_expiry).
 .PP
 Before actually configuring the address, dhclient-script should
 somehow ARP for it and exit with a nonzero status if it receives a
@@ -199,6 +199,12 @@
 test these parameters and, if it has reason to believe they are valid,
 should exit with a value of zero. If not, it should exit with a
 nonzero value.
+.SH V6ONLY
+The DHCPv4 client has received a requested valid v6-only-preferred
+option. The system should disable IPv4 on the interface. On its side
+the dhclient waits for V6ONLY_WAIT seconds (the timer is carried by
+the option with a minimum of MIN_V6ONLY_WAIT) before returning in
+the INIT state.
 .PP
 The usual way to test a lease is to set up the network as with REBIND
 (since this may be called to test more than one lease) and then ping

_service:tar_scm:dhcp-4.4.2.tar.gz/client/dhclient.8 -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/dhclient.8 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/client/dhclient.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/dhclient.c Changed

@@ -3,7 +3,7 @@
 DHCP Client. */
 
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -77,14 +77,15 @@
 #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-2022 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;
+extern u_int16_t local_port;
+extern u_int16_t remote_port;
+
 #if defined(DHCPv6) && defined(DHCP4o6)
 int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
 #endif
@@ -136,10 +137,10 @@
 * 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.
+ * command 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.
+ * \param sarg - Generally the offending argument from the command line.
 *
 * \return Nothing
 */
@@ -566,7 +567,7 @@
 		} else if (argvi0 == '-') {
 			usage("Unknown command: %s", argvi);
 		} else if (interfaces_requested < 0) {
-			usage("No interfaces comamnd -n and "
+			usage("No interfaces command -n and "
 			 " requested interface %s", argvi);
 		} else {
 		 struct interface_info *tmp = NULL;
@@ -828,21 +829,36 @@
 			 ? DISCOVER_REQUESTED
 			 : DISCOVER_RUNNING);
 
-	/* Make up a seed for the random number generator from current
-	 time plus the sum of the last four bytes of each
-	 interface's hardware address interpreted as an integer.
-	 Not much entropy, but we're booting, so we're not likely to
-	 find anything better. */
+	/* PLEASE PREFER the random device: not all systems use random
+	 * process identifiers so the alternative can be predictable. */
 	seed = 0;
-	for (ip = interfaces; ip; ip = ip->next) {
-		int junk;
-		memcpy(&junk,
-		 &ip->hw_address.hbufip->hw_address.hlen -
-					 sizeof seed, sizeof seed);
-		seed += junk;
-	}
-	srandom(seed + cur_time + (unsigned)getpid());
+	size_t nrnd = 0;
+#ifdef ISC_PATH_RANDOMDEV
+	FILE *frnd = fopen(ISC_PATH_RANDOMDEV, "r");
+	if (frnd) {
+		nrnd = fread(&seed, sizeof(seed), 1, frnd);
+		fclose(frnd);
+	}
+#endif
+	/* Please leave the compiler to emit a warning about a constant
+	 * condition in the if test. */
+	if (!nrnd) {
+		/* Make up a seed for the random number generator from current
+		 time plus the sum of the last four bytes of each
+		 interface's hardware address interpreted as an integer.
+		 Not much entropy, but we're booting, so we're not likely to
+		 find anything better. */
 
+		for (ip = interfaces; ip; ip = ip->next) {
+			int junk;
+			memcpy(&junk,
+			 &ip->hw_address.hbufip->hw_address.hlen -
+						 sizeof seed, sizeof seed);
+			seed += junk;
+		}
+		seed += cur_time + (unsigned)getpid();
+	}
+	srandom(seed);
 
 	/*
 	 * Establish a default DUID. We always do so for v6 and
@@ -1241,6 +1257,105 @@
 	send_discover (client);
 }
 
+/* check_v6only is called by dhcpoffer and dhcpack. It checks if a
+ * requested v6-only-preferred option is present and returned the
+ * V6ONLY_WAIT delay to suspend DHCPv4. */
+
+uint32_t check_v6only(packet, client)
+	struct packet *packet;
+	struct client_state *client;
+{
+	int i;
+	struct option **req;
+	isc_boolean_t found = ISC_FALSE;
+	struct option_cache *oc;
+	struct data_string data;
+	uint32_t v6only_wait = 0;
+
+	/* Check if the v6-only-preferred was requested. */
+	req = client->config->requested_options;
+
+	if (req == NULL)
+		return 0;
+
+	for (i = 0 ; reqi != NULL ; i++) {
+		if ((reqi->universe == &dhcp_universe) &&
+		 (reqi->code == DHO_V6_ONLY_PREFERRED)) {
+			found = ISC_TRUE;
+			break;
+		}
+	}
+
+	if (found == ISC_FALSE)
+		return 0;
+
+	/* Get the V6ONLY_WAIT timer. */
+	oc = lookup_option(&dhcp_universe, packet->options,
+			 DHO_V6_ONLY_PREFERRED);
+	if (!oc)
+		return 0;
+
+	memset(&data, 0, sizeof(data));
+
+	if (evaluate_option_cache(&data, packet, (struct lease *)0, client,
+				 packet->options, (struct option_state *)0,
+				 &global_scope, oc, MDL)) {
+		if (data.len == 4) {
+			v6only_wait = getULong(data.data);
+			if (v6only_wait < MIN_V6ONLY_WAIT)
+				v6only_wait = MIN_V6ONLY_WAIT;
+		}
+		data_string_forget(&data, MDL);
+	}
+
+	return (v6only_wait);
+}
+
+/* finish_v6only is called when the V6ONLY_WAIT timer expired. */
+
+void finish_v6only(cpp)
+	void *cpp;
+{
+	struct client_state *client = cpp;
+
+	cancel_timeout(finish_v6only, client);
+	client->state = S_INIT;
+	state_init(cpp);
+}
+
+/*
+ * start_v6only is called when a requested v6-only-preferred option was
+ * returned by the server. */
+
+void start_v6only(client, v6only_wait)
+	struct client_state *client;
+	uint32_t v6only_wait;
+{
+	struct timeval tv;
+
+	/* Enter V6ONLY state. */
+
+	client->state = S_V6ONLY;
+
+	/* Run the client script. */
+	script_init(client, "V6ONLY", NULL);
+	if (client->active) {
+		script_write_params(client, "old_", client->active);
+		destroy_client_lease(client->active);
+		client->active = NULL;
+	}
+	script_write_requested(client);
+	client_envadd(client, "", "v6-only-preferred", "%lu",
+		 (long unsigned)v6only_wait);
+	script_go(client);
+
+	/* Trigger finish_v6only after V6ONLY_WAIT seconds. */
+	tv.tv_sec = cur_tv.tv_sec + v6only_wait;
+	tv.tv_usec = cur_tv.tv_usec;
+
+	add_timeout(&tv, finish_v6only, client, 0, 0);
+}
+
 /*
 * state_selecting is called when one or more DHCPOFFER packets have been
 * received and a configurable period of time has passed.
@@ -1336,6 +1451,7 @@
 {
 	struct interface_info *ip = packet -> interface;
 	struct client_state *client;
+	uint32_t v6only_wait;
 	struct client_lease *lease;
 	struct option_cache *oc;
 	struct data_string ds;
@@ -1371,6 +1487,16 @@
 		 inet_ntoa(packet->raw->yiaddr),
 		 piaddr (packet->client_addr));
 
+	/* Check v6only first. */
+	v6only_wait = check_v6only(packet, client);
+	if (v6only_wait > 0) {
+		log_info("v6 only preferred for %lu seconds.",
+			 (long unsigned)v6only_wait);
+		cancel_timeout(send_request, client);
+		start_v6only(client, v6only_wait);
+		return;
+	}
+
 	lease = packet_to_lease (packet, client);
 	if (!lease) {
 		log_info ("packet_to_lease failed.");
@@ -1524,9 +1650,12 @@
 		script_write_params(client, "alias_", client->alias);
 
 	/* If the BOUND/RENEW code detects another machine using the
-	 offered address, it exits nonzero. We need to send a
-	 DHCPDECLINE and toss the lease. */
-	if (script_go(client)) {
+	 offered address, then per our man page it should exit with
+ a non-zero status, to which we send a DHCPDECLINE and toss
+ the lease. A return value of less than zero indicates
+ the script crashed (e.g. segfault) which script_go will log
+ but we will ignore here. */
+	if (script_go(client) > 0) {
 		make_decline(client, client->new);
 		send_decline(client);
 		destroy_client_lease(client->new);
@@ -1649,6 +1778,7 @@
 	cancel_timeout(send_discover, client);
 	cancel_timeout(send_request, client);
 	cancel_timeout(state_bound, client);
+	cancel_timeout(finish_v6only, client);
 
 	/* If we have an address, unconfigure it. */
 	if (client->active) {
@@ -2008,6 +2138,7 @@
 {
 	struct interface_info *ip = packet -> interface;
 	struct client_state *client;
+	uint32_t v6only_wait;
 	struct client_lease *lease, *lp;
 	struct option **req;
 	int i;
@@ -2043,6 +2174,16 @@
 		 inet_ntoa(packet->raw->yiaddr),
 		 piaddr(packet->client_addr));
 
+	/* Check v6only first. */
+	v6only_wait = check_v6only(packet, client);
+	if (v6only_wait > 0) {
+		log_info("%s: v6 only preferred for %lu.", obuf,
+			 (long unsigned)v6only_wait);
+		cancel_timeout(send_discover, client);
+		start_v6only(client, v6only_wait);
+		return;
+	}
+
 	/* If this lease doesn't supply the minimum required DHCPv4 parameters,
 	 * ignore it.
 	 */
@@ -3258,12 +3399,12 @@
 			hw_idx = 0;
 			hw_len = client->interface->hw_address.hlen;
 		}
-		memcpy(&client_identifier.buffer->data + 5 - hw_len,
+		memcpy(client_identifier.buffer->data + 5 - hw_len,
 		 client->interface->hw_address.hbuf + hw_idx,
 		 hw_len);
 
 		/* Add the default duid */
-		memcpy(&client_identifier.buffer->data+(1+4),
+		memcpy(client_identifier.buffer->data + (1 + 4),
 		 default_duid.data, default_duid.len);
 
 		/* And save the option */
@@ -4434,8 +4575,14 @@
 	}
 	dfree (envp, MDL);
 	gettimeofday(&cur_tv, NULL);
-	return (WIFEXITED (wstatus) ?
-		WEXITSTATUS (wstatus) : -WTERMSIG (wstatus));
+
+ if (!WIFEXITED(wstatus)) {
+ int sigval = WTERMSIG(wstatus);
+ log_error ("script_go script: %s was terminated by signal %d", scriptName, sigval);
+ return (-sigval);
+ }
+
+ return (WEXITSTATUS(wstatus));
 }
 
 void client_envadd (struct client_state *client,
@@ -4622,6 +4769,7 @@
 			 case S_REBINDING:
 			 case S_STOPPED:
 			 case S_DECLINING:
+			 case S_V6ONLY:
 				break;
 			}
 			client -> state = S_INIT;
@@ -4700,6 +4848,7 @@
 	cancel_timeout (state_init, client);
 	cancel_timeout (send_request, client);
 	cancel_timeout (state_reboot, client);
+	cancel_timeout (finish_v6only, client);
 	client -> state = S_STOPPED;
 
 #if defined(DHCPv6) && defined(DHCP4o6)

_service:tar_scm:dhcp-4.4.2.tar.gz/client/dhclient.conf.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/dhclient.conf.5 Changed

@@ -1,6 +1,6 @@
 .\"	$Id: dhclient.conf.5,v 1.34 2012/01/24 22:23:39 sar Exp $
 .\"
-.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 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
@@ -16,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -165,11 +165,11 @@
 .PP
 \fBinitial-delay \fItime\fR\fB;\fR
 .PP
-.I initial-delay 
-parameter sets the maximum time client can wait after start before 
+.I initial-delay
+parameter sets the maximum time client can wait after start before
 commencing first transmission.
 According to RFC2131 Section 4.4.1, client should wait a random time between
-startup and the actual first transmission. Previous versions of ISC DHCP 
+startup and the actual first transmission. Previous versions of ISC DHCP
 client used to wait random time up to 5 seconds, but that was unwanted
 due to impact on startup time. As such, new versions have the default
 initial delay set to 0. To restore old behavior, please set initial-delay
@@ -350,7 +350,7 @@
 .PP
 If for some option the client should always use a locally-configured
 value or values rather than whatever is supplied by the server, these
-values can be defined in the 
+values can be defined in the
 .B supersede
 statement.
 .PP
@@ -664,7 +664,7 @@
 .PP
 \fBpseudo "\fIname\fR" "\fIreal-name\fB" { \fIdeclarations ... \fB }
 .PP
-Under some circumstances it can be useful to declare a pseudo-interface 
+Under some circumstances it can be useful to declare a pseudo-interface
 and have the DHCP client acquire a configuration for that interface.
 Each interface that the DHCP client is supporting normally has a DHCP
 client state machine running on it to acquire and maintain its lease.

_service:tar_scm:dhcp-4.4.2.tar.gz/client/dhclient.leases.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/dhclient.leases.5 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/client/scripts/linux -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/scripts/linux Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/client/tests/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/tests/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -187,8 +187,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -244,6 +242,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -255,6 +255,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -570,7 +571,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/client/tests/duid_unittest.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/client/tests/duid_unittest.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -229,8 +229,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.am.in $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
@@ -287,6 +285,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -298,6 +298,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -670,7 +671,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/common/alloc.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/alloc.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/bpf.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/bpf.c Changed

@@ -3,7 +3,7 @@
 BPF socket interface code, originally contributed by Archie Cobbs. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -520,7 +520,7 @@
 		 physical layer that supports this, but WTH), skip this
 		 packet. */
 		if (offset < 0) {
-			interface->rbuf_offset = 
+			interface->rbuf_offset =
 				BPF_WORDALIGN(interface->rbuf_offset +
 					 hdr.bh_caplen);
 			continue;
@@ -535,7 +535,7 @@
 
 		/* If the IP or UDP checksum was bad, skip the packet... */
 		if (offset < 0) {
-			interface->rbuf_offset = 
+			interface->rbuf_offset =
 				BPF_WORDALIGN(interface->rbuf_offset +
 					 hdr.bh_caplen);
 			continue;
@@ -614,7 +614,7 @@
 	 */
 	sa = NULL;
 	for (p=ifa; (p != NULL) && (sa == NULL); p = p->ifa_next) {
-		if ((p->ifa_addr->sa_family == AF_LINK) && 
+		if ((p->ifa_addr->sa_family == AF_LINK) &&
 		 !strcmp(p->ifa_name, name)) {
 		 	sa = (struct sockaddr_dl *)p->ifa_addr;
 		}

_service:tar_scm:dhcp-4.4.2.tar.gz/common/comapi.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/comapi.c Changed

@@ -3,7 +3,7 @@
 OMAPI object interfaces for the DHCP server. */
 
 /*
- * Copyright (c) 2004-2017 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -59,7 +59,7 @@
 					 dhcp_control_destroy,
 					 dhcp_control_signal_handler,
 					 dhcp_control_stuff_values,
-					 dhcp_control_lookup, 
+					 dhcp_control_lookup,
 					 dhcp_control_create,
 					 dhcp_control_remove, 0, 0, 0,
 					 sizeof (dhcp_control_object_t),
@@ -80,7 +80,7 @@
 					 dhcp_group_destroy,
 					 dhcp_group_signal_handler,
 					 dhcp_group_stuff_values,
-					 dhcp_group_lookup, 
+					 dhcp_group_lookup,
 					 dhcp_group_create,
 					 dhcp_group_remove, 0, 0, 0,
 					 sizeof (struct group_object), 0,
@@ -96,7 +96,7 @@
 					 dhcp_subnet_destroy,
 					 dhcp_subnet_signal_handler,
 					 dhcp_subnet_stuff_values,
-					 dhcp_subnet_lookup, 
+					 dhcp_subnet_lookup,
 					 dhcp_subnet_create,
 					 dhcp_subnet_remove, 0, 0, 0,
 					 sizeof (struct subnet), 0,
@@ -113,7 +113,7 @@
 		 dhcp_shared_network_destroy,
 		 dhcp_shared_network_signal_handler,
 		 dhcp_shared_network_stuff_values,
-		 dhcp_shared_network_lookup, 
+		 dhcp_shared_network_lookup,
 		 dhcp_shared_network_create,
 		 dhcp_shared_network_remove, 0, 0, 0,
 		 sizeof (struct shared_network), 0, RC_MISC);
@@ -136,7 +136,7 @@
 		return DHCP_R_INVALIDARG;
 	group = (struct group_object *)h;
 
-	/* XXX For now, we can only set these values on new group objects. 
+	/* XXX For now, we can only set these values on new group objects.
 	 XXX Soon, we need to be able to update group objects. */
 	if (!omapi_ds_strcmp (name, "name")) {
 		if (group -> name)
@@ -193,7 +193,7 @@
 		if (status == ISC_R_SUCCESS || status == DHCP_R_UNCHANGED)
 			return status;
 	}
-			 
+
 	return ISC_R_NOTFOUND;
 }
 
@@ -461,7 +461,7 @@
 		if (status == ISC_R_SUCCESS || status == DHCP_R_UNCHANGED)
 			return status;
 	}
-			 
+
 	return ISC_R_NOTFOUND;
 }
 
@@ -904,4 +904,3 @@
 {
 	return ISC_R_NOTIMPLEMENTED;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/common/conflex.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/conflex.c Changed

@@ -3,7 +3,7 @@
 Lexical scanner for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -55,7 +55,7 @@
 	}
 
 	/*
-	 * We don't need to initialize things to zero here, since 
+	 * We don't need to initialize things to zero here, since
 	 * dmalloc() returns memory that is set to zero.
 	 */
 	tmp->tlname = name;
@@ -112,7 +112,7 @@
 	if ((*cfile)->saved_state != NULL) {
 		dfree((*cfile)->saved_state, MDL);
 	}
-		
+
 	dfree(*cfile, MDL);
 	*cfile = NULL;
 	return ISC_R_SUCCESS;
@@ -201,7 +201,7 @@
 
 	if (!cfile->ugflag) {
 		if (c == EOL) {
-			if (cfile->cur_line == cfile->line1) {	
+			if (cfile->cur_line == cfile->line1) {
 				cfile->cur_line = cfile->line2;
 				cfile->prev_line = cfile->line1;
 			} else {
@@ -220,7 +220,7 @@
 		}
 	} else
 		cfile->ugflag = 0;
-	return c;		
+	return c;
 }
 
 /*
@@ -239,11 +239,11 @@
 /*
 * GENERAL NOTE ABOUT TOKENS
 *
- * We normally only want non-whitespace tokens. There are some 
+ * We normally only want non-whitespace tokens. There are some
 * circumstances where we *do* want to see whitespace (for example
 * when parsing IPv6 addresses).
 *
- * Generally we use the next_token() function to read tokens. This 
+ * Generally we use the next_token() function to read tokens. This
 * in turn calls get_next_token, which does *not* return tokens for
 * whitespace. Rather, it skips these.
 *
@@ -269,7 +269,7 @@
 		p = cfile -> lpos;
 
 		c = get_char (cfile);
-		if (!((c == '\n') && cfile->eol_token) && 
+		if (!((c == '\n') && cfile->eol_token) &&
 		 isascii(c) && isspace(c)) {
 		 	ttok = read_whitespace(c, cfile);
 			break;
@@ -316,12 +316,12 @@
 * The get_next_token() function consumes the next token and
 * returns it to the caller.
 *
- * Since the code is almost the same for "normal" and "raw" 
+ * Since the code is almost the same for "normal" and "raw"
 * input, we pass a flag to alter the way it works.
 */
 
-static enum dhcp_token 
-get_next_token(const char **rval, unsigned *rlen, 
+static enum dhcp_token
+get_next_token(const char **rval, unsigned *rlen,
 	 struct parse *cfile, isc_boolean_t raw) {
 	int rv;
 
@@ -343,7 +343,7 @@
 			cfile->token_line = cfile->cur_line;
 		}
 	}
-	
+
 	if (rval)
 		*rval = cfile -> tval;
 	if (rlen)
@@ -358,10 +358,10 @@
 /*
 * Get the next token from cfile and return it.
 *
- * If rval is non-NULL, set the pointer it contains to 
+ * If rval is non-NULL, set the pointer it contains to
 * the contents of the token.
 *
- * If rlen is non-NULL, set the integer it contains to 
+ * If rlen is non-NULL, set the integer it contains to
 * the length of the token.
 */
 
@@ -386,8 +386,8 @@
 * The do_peek_token() function checks the next token without
 * consuming it, and returns it to the caller.
 *
- * Since the code is almost the same for "normal" and "raw" 
- * input, we pass a flag to alter the way it works. (See the 
+ * Since the code is almost the same for "normal" and "raw"
+ * input, we pass a flag to alter the way it works. (See the
 * warning in the GENERAL NOTES ABOUT TOKENS above though.)
 */
 
@@ -427,15 +427,15 @@
 
 
 /*
- * Get the next token from cfile and return it, leaving it for a 
+ * Get the next token from cfile and return it, leaving it for a
 * subsequent call to next_token().
 *
 * Note that it WILL consume whitespace tokens.
 *
- * If rval is non-NULL, set the pointer it contains to 
+ * If rval is non-NULL, set the pointer it contains to
 * the contents of the token.
 *
- * If rlen is non-NULL, set the integer it contains to 
+ * If rlen is non-NULL, set the integer it contains to
 * the length of the token.
 */
 
@@ -492,7 +492,7 @@
 		c = get_char(cfile);
 		if (c == EOF)
 			return END_OF_FILE;
-	} while (!((c == '\n') && cfile->eol_token) && 
+	} while (!((c == '\n') && cfile->eol_token) &&
 		 isascii(c) && isspace(c));
 
 	/*
@@ -954,9 +954,11 @@
 			if (!atom 6)
 				return DEFINE;
 		}
+		if (!strcasecmp (atom + 1, "isconnect"))
+			return DISCONNECT;
 		break;
 	 case 'e':
-		if (isascii (atom 1) && 
+		if (isascii (atom 1) &&
 		 tolower((unsigned char)atom1) == 'x') {
 			if (!strcasecmp (atom + 2, "tract-int"))
 				return EXTRACT_INT;
@@ -1055,15 +1057,15 @@
 		}
 		break;
 	 case 'i':
-	 	if (!strcasecmp(atom+1, "a-na")) 
+	 	if (!strcasecmp(atom+1, "a-na"))
 			return IA_NA;
-	 	if (!strcasecmp(atom+1, "a-ta")) 
+	 	if (!strcasecmp(atom+1, "a-ta"))
 			return IA_TA;
-	 	if (!strcasecmp(atom+1, "a-pd")) 
+	 	if (!strcasecmp(atom+1, "a-pd"))
 			return IA_PD;
-	 	if (!strcasecmp(atom+1, "aaddr")) 
+	 	if (!strcasecmp(atom+1, "aaddr"))
 			return IAADDR;
-	 	if (!strcasecmp(atom+1, "aprefix")) 
+	 	if (!strcasecmp(atom+1, "aprefix"))
 			return IAPREFIX;
 		if (!strcasecmp (atom + 1, "nclude"))
 			return INCLUDE;
@@ -1352,11 +1354,11 @@
 	 case 's':
 		if (!strcasecmp(atom + 1, "cript"))
 			return SCRIPT;
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'e') {
 			if (!strcasecmp(atom + 2, "arch"))
 				return SEARCH;
-			if (isascii(atom2) && 
+			if (isascii(atom2) &&
 			 tolower((unsigned char)atom2) == 'c') {
 				if (!strncasecmp(atom + 3, "ond", 3)) {
 if (!strcasecmp(atom + 6, "ary"))
@@ -1386,7 +1388,7 @@
 return TOKEN_SERVER;
 					if (atom6 == '-') {
 						if (!strcasecmp(atom + 7,
-								"duid")) 
+								"duid"))
 							return SERVER_DUID;
 if (!strcasecmp(atom + 7,
 								"name"))
@@ -1406,7 +1408,7 @@
 return TOKEN_SET;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'h') {
 if (!strcasecmp(atom + 2, "ared-network"))
 return SHARED_NETWORK;
@@ -1414,7 +1416,7 @@
 return SHUTDOWN;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'i') {
 if (!strcasecmp(atom + 2, "addr"))
 return SIADDR;
@@ -1424,9 +1426,9 @@
 return SIZE;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'p') {
-			if (isascii(atom2) && 
+			if (isascii(atom2) &&
 			 tolower((unsigned char)atom2) == 'a') {
 if (!strcasecmp(atom + 3, "ce"))
 return SPACE;
@@ -1438,9 +1440,9 @@
 return SPLIT;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 't') {
-			if (isascii(atom2) && 
+			if (isascii(atom2) &&
 			 tolower((unsigned char)atom2) == 'a') {
 				if(!strncasecmp(atom + 3, "rt", 2)) {
 if (!strcasecmp(atom + 5, "s"))
@@ -1473,7 +1475,7 @@
 return SUBSTRING;
 break;
 }
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'u') {
 if (!strcasecmp(atom + 2, "ffix"))
 return SUFFIX;
@@ -1567,4 +1569,3 @@
 	}
 	return dfv;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/common/ctrace.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/ctrace.c Changed

@@ -3,7 +3,7 @@
 Subroutines that support dhcp tracing... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 2001-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -44,7 +44,7 @@
 		tipkt.index = htonl (ip -> index);
 
 		trace_write_packet (ttype, sizeof tipkt, (char *)&tipkt, MDL);
-	}	
+	}
 }
 
 void trace_interface_input (trace_type_t *ttype, unsigned len, char *buf)
@@ -61,7 +61,7 @@
 		return;
 	}
 	tipkt = (trace_interface_packet_t *)buf;
-	
+
 	ip = (struct interface_info *)0;
 	status = interface_allocate (&ip, MDL);
 	if (status != ISC_R_SUCCESS) {
@@ -85,7 +85,7 @@
 	ip->address_count = ip->address_max = 1;
 	ip->addresses = dmalloc(sizeof(*ip->addresses), MDL);
 	if (!ip->addresses) {
-		dfree(ip->ifp, MDL); 
+		dfree(ip->ifp, MDL);
 		ip->ifp = NULL;
 		interface_dereference (&ip, MDL);
 		status = ISC_R_NOMEMORY;
@@ -183,7 +183,7 @@
 	tip = (trace_inpacket_t *)buf;
 	index = ntohl (tip -> index);
 	tip -> from.len = ntohl (tip -> from.len);
-	
+
 	if (index > interface_count ||
 	 index < 0 ||
 	 !interface_vector index) {
@@ -259,7 +259,7 @@
 	}
 	tip = (trace_outpacket_t *)buf;
 	index = ntohl (tip -> index);
-	
+
 	if (index > interface_count ||
 	 index < 0 ||
 	 !interface_vector index) {

_service:tar_scm:dhcp-4.4.2.tar.gz/common/dhcp-eval.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/dhcp-eval.5 Changed

@@ -1,6 +1,6 @@
 .\"	$Id: dhcp-eval.5,v 1.33 2012/05/17 15:50:14 sar Exp $
 .\"
-.\" Copyright (c) 2009-2012,2014-2015 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2009-2022 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
@@ -17,8 +17,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -92,7 +92,7 @@
 .B elsif
 and
 .B else
-clauses are skipped. Otherwise, each subsequent 
+clauses are skipped. Otherwise, each subsequent
 .B elsif
 clause's expression is checked, until an elsif clause is encountered
 whose test evaluates to true. If such a clause is found, the
@@ -101,7 +101,7 @@
 .B elsif
 and
 .B else
-clauses are skipped. If all the 
+clauses are skipped. If all the
 .B if
 and
 .B elsif
@@ -150,7 +150,7 @@
 statement and the
 .B case
 statements can both be data expressions or numeric expressions. Within
-a switch statement they all must be the same type. The server 
+a switch statement they all must be the same type. The server
 evaluates the expression from the switch statement and then it evaluates
 the expressions from the case statements until it finds a match.
 .PP

_service:tar_scm:dhcp-4.4.2.tar.gz/common/dhcp-options.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/dhcp-options.5 Changed

@@ -1,6 +1,6 @@
 .\"	$Id: dhcp-options.5,v 1.50 2011/05/20 13:48:32 tomasz Exp $
 .\"
-.\" Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -16,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -848,7 +848,7 @@
 .B option \fBpxe-system-type\fR \fIuint16\fR \fB, \fIuint16\fR ... \fB;\fR
 .RS 0.25i
 .PP
-A list of one ore more 16-bit integers which allows a client to specify its 
+A list of one ore more 16-bit integers which allows a client to specify its
 pre-boot architecture type(s).
 .PP
 This option is included based on RFC 4578.
@@ -1243,6 +1243,14 @@
 This option is included based on RFC 5223.
 .RE
 .PP
+.B option \fBv6-only-preferred\fR \fIuint32\fR\fB;\fR
+.RS 0.25i
+.PP
+The number of seconds the client should disable DHCPv4 for.
+.PP
+This option and its use by the client are specified in RFC 8925.
+.RE
+.PP
 .B option \fBvendor-class-identifier\fR \fIstring\fR\fB;\fR
 .RS 0.25i
 .PP

_service:tar_scm:dhcp-4.4.2.tar.gz/common/dhcp4o6.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/dhcp4o6.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/discover.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/discover.c Changed

@@ -3,7 +3,7 @@
 Find and identify the network interfaces. */
 
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -45,8 +45,8 @@
 
 int interfaces_invalidated;
 int quiet_interface_discovery;
-u_int16_t local_port;
-u_int16_t remote_port;
+u_int16_t local_port = 0;
+u_int16_t remote_port = 0;
 u_int16_t relay_port = 0;
 int dhcpv4_over_dhcpv6 = 0;
 int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *);
@@ -102,7 +102,7 @@
 					 dhcp_interface_destroy,
 					 dhcp_interface_signal_handler,
 					 dhcp_interface_stuff_values,
-					 dhcp_interface_lookup, 
+					 dhcp_interface_lookup,
 					 dhcp_interface_create,
 					 dhcp_interface_remove,
 					 0, 0, 0,
@@ -139,11 +139,11 @@
 }
 
 
-/* 
+/*
 * Scanning for Interfaces
 * -----------------------
 *
- * To find interfaces, we create an iterator that abstracts out most 
+ * To find interfaces, we create an iterator that abstracts out most
 * of the platform specifics. Use is fairly straightforward:
 *
 * - begin_iface_scan() starts the process.
@@ -213,7 +213,7 @@
 #endif
 
 #if defined(SIOCGLIFCONF) && defined(SIOCGLIFFLAGS)
-/* 
+/*
 * Solaris support
 * ---------------
 *
@@ -223,7 +223,7 @@
 * Solaris' extended interface is documented in the if_tcp man page.
 */
 
-/* 
+/*
 * Structure holding state about the scan.
 */
 struct iface_conf_list {
@@ -233,7 +233,7 @@
 	int next;		/* next interface to retrieve when iterating */
 };
 
-/* 
+/*
 * Structure used to return information about a specific interface.
 */
 struct iface_info {
@@ -242,12 +242,12 @@
 	isc_uint64_t flags;		/* interface flags, e.g. IFF_LOOPBACK */
 };
 
-/* 
+/*
 * Start a scan of interfaces.
 *
 * The iface_conf_list structure maintains state for this process.
 */
-int 
+int
 begin_iface_scan(struct iface_conf_list *ifaces) {
 #ifdef ISC_PLATFORM_HAVELIFNUM
 	struct lifnum lifnum;
@@ -308,7 +308,7 @@
 /*
 * Retrieve the next interface.
 *
- * Returns information in the info structure. 
+ * Returns information in the info structure.
 * Sets err to 1 if there is an error, otherwise 0.
 */
 int
@@ -359,11 +359,11 @@
 		foundif = ISC_TRUE;
 	} while ((foundif == ISC_FALSE) ||
 		 (strncmp(info->name, "dummy", 5) == 0));
-	
+
 	memset(&tmp, 0, sizeof(tmp));
 	strncpy(tmp.lifr_name, info->name, sizeof(tmp.lifr_name) - 1);
 	if (ioctl(ifaces->sock, SIOCGLIFFLAGS, &tmp) < 0) {
-		log_error("Error getting interface flags for '%s'; %m", 
+		log_error("Error getting interface flags for '%s'; %m",
 			 p->lifr_name);
 		*err = 1;
 		return 0;
@@ -387,11 +387,11 @@
 
 #else
 
-/* 
+/*
 * BSD/Linux support
 * -----------
 *
- * FreeBSD, NetBSD, OpenBSD, OS X/macOS and Linux all have the getifaddrs() 
+ * FreeBSD, NetBSD, OpenBSD, OS X/macOS and Linux all have the getifaddrs()
 * function.
 *
 * The getifaddrs() man page describes the use.
@@ -399,7 +399,7 @@
 
 #include <ifaddrs.h>
 
-/* 
+/*
 * Structure holding state about the scan.
 */
 struct iface_conf_list {
@@ -407,7 +407,7 @@
 	struct ifaddrs *next;	/* current position in the list */
 };
 
-/* 
+/*
 * Structure used to return information about a specific interface.
 */
 struct iface_info {
@@ -416,12 +416,12 @@
 	isc_uint64_t flags;		/* interface flags, e.g. IFF_LOOPBACK */
 };
 
-/* 
+/*
 * Start a scan of interfaces.
 *
 * The iface_conf_list structure maintains state for this process.
 */
-int 
+int
 begin_iface_scan(struct iface_conf_list *ifaces) {
 	if (getifaddrs(&ifaces->head) != 0) {
 		log_error("Error getting interfaces; %m");
@@ -434,7 +434,7 @@
 /*
 * Retrieve the next interface.
 *
- * Returns information in the info structure. 
+ * Returns information in the info structure.
 * Sets err to 1 if there is an error, otherwise 0.
 */
 int
@@ -446,7 +446,7 @@
 		return 0;
 	}
 	if (strlen(ifaces->next->ifa_name) >= sizeof(info->name)) {
-		log_error("Interface name '%s' too long", 
+		log_error("Interface name '%s' too long",
 			 ifaces->next->ifa_name);
 		*err = 1;
 		return 0;
@@ -485,11 +485,11 @@
 	ifaces->head = NULL;
 	ifaces->next = NULL;
 }
-#endif 
+#endif
 
 /* XXX: perhaps create drealloc() rather than do it manually */
 void
-add_ipv4_addr_to_interface(struct interface_info *iface, 
+add_ipv4_addr_to_interface(struct interface_info *iface,
 			 const struct in_addr *addr) {
 	/*
 	 * We don't expect a lot of addresses per IPv4 interface, so
@@ -513,8 +513,8 @@
 			log_fatal("Out of memory saving IPv4 address "
 			 "on interface.");
 		}
-		memcpy(tmp, 
-		 iface->addresses, 
+		memcpy(tmp,
+		 iface->addresses,
 		 iface->address_max * sizeof(struct in_addr));
 		dfree(iface->addresses, MDL);
 		iface->addresses = tmp;
@@ -526,7 +526,7 @@
 #ifdef DHCPv6
 /* XXX: perhaps create drealloc() rather than do it manually */
 void
-add_ipv6_addr_to_interface(struct interface_info *iface, 
+add_ipv6_addr_to_interface(struct interface_info *iface,
 			 const struct in6_addr *addr) {
 	/*
 	 * Each IPv6 interface will have at least two IPv6 addresses,
@@ -551,8 +551,8 @@
 			log_fatal("Out of memory saving IPv6 address "
 				 "on interface.");
 		}
-		memcpy(tmp, 
-		 iface->v6addresses, 
+		memcpy(tmp,
+		 iface->v6addresses,
 		 iface->v6address_max * sizeof(struct in6_addr));
 		dfree(iface->v6addresses, MDL);
 		iface->v6addresses = tmp;
@@ -567,7 +567,7 @@
 register that interface with the network I/O software, figure out what
 subnet it's on, and add it to the list of interfaces. */
 
-void 
+void
 discover_interfaces(int state) {
 	struct iface_conf_list ifaces;
 	struct iface_info info;
@@ -637,7 +637,7 @@
 		 (!(info.flags & IFF_UP) &&
 		 state != DISCOVER_UNCONFIGURED))
 			continue;
-		
+
 		/* If there isn't already an interface by this name,
 		 allocate one. */
 		if (tmp == NULL) {
@@ -658,7 +658,7 @@
 			(*dhcp_interface_discovery_hook)(tmp);
 		}
 
-		if ((info.addr.ss_family == AF_INET) && 
+		if ((info.addr.ss_family == AF_INET) &&
 		 (local_family == AF_INET)) {
 			struct sockaddr_in *a = (struct sockaddr_in*)&info.addr;
 			struct iaddr addr;
@@ -685,14 +685,14 @@
 			}
 		}
 #ifdef DHCPv6
-		else if ((info.addr.ss_family == AF_INET6) && 
+		else if ((info.addr.ss_family == AF_INET6) &&
 			 (local_family == AF_INET6)) {
-			struct sockaddr_in6 *a = 
+			struct sockaddr_in6 *a =
 					(struct sockaddr_in6*)&info.addr;
 			struct iaddr addr;
 
 			/* We don't want the loopback interface. */
-			if (IN6_IS_ADDR_LOOPBACK(&a->sin6_addr) && 
+			if (IN6_IS_ADDR_LOOPBACK(&a->sin6_addr) &&
 			 ((tmp->flags & INTERFACE_AUTOMATIC) &&
 			 ((state == DISCOVER_SERVER) ||
 			 (state == DISCOVER_SERVER46))))
@@ -809,14 +809,14 @@
 			log_error("%s", "");
 			if (local_family == AF_INET) {
 				log_error("No subnet declaration for %s (%s).",
-					 tmp->name, 
+					 tmp->name,
 					 (tmp->addresses == NULL) ?
 					 "no IPv4 addresses" :
 					 inet_ntoa(tmp->addresses0));
 #ifdef DHCPv6
 			} else {
 				if (tmp->v6addresses != NULL) {
-					inet_ntop(AF_INET6, 
+					inet_ntop(AF_INET6,
 						 &tmp->v6addresses0,
 						 abuf,
 						 sizeof(abuf));
@@ -876,7 +876,7 @@
 				} else if (tmp->v6address_count > 0) {
 					subnet->interface_address.len = 16;
 					memcpy(subnet->interface_address.iabuf,
-					 &tmp->v6addresses0.s6_addr, 
+					 &tmp->v6addresses0.s6_addr,
 					 16);
 				} else {
 					/* XXX: should be one */
@@ -954,7 +954,7 @@
 		if (tmp -> rfdesc == -1)
 			continue;
 		switch (local_family) {
-#ifdef DHCPv6 
+#ifdef DHCPv6
 		case AF_INET6:
 #ifdef RELAY_PORT
 #define UPSTREAM(ifp) \
@@ -981,7 +981,7 @@
 			}
 #endif
 			status = omapi_register_io_object((omapi_object_t *)tmp,
-							 if_readsocket, 
+							 if_readsocket,
 							 0, got_one_v6, 0, 0);
 #ifdef RELAY_PORT
 			if (UPSTREAM(tmp))
@@ -994,7 +994,7 @@
 		case AF_INET:
 		default:
 			status = omapi_register_io_object((omapi_object_t *)tmp,
-							 if_readsocket, 
+							 if_readsocket,
 							 0, got_one, 0, 0);
 			break;
 		}
@@ -1194,7 +1194,7 @@
 		/*
 		 * If a packet is not multicast, we assume it is unicast.
 		 */
-		if (IN6_IS_ADDR_MULTICAST(&to)) { 
+		if (IN6_IS_ADDR_MULTICAST(&to)) {
 			is_unicast = ISC_FALSE;
 		} else {
 			is_unicast = ISC_TRUE;
@@ -1211,8 +1211,8 @@
 		if (ip == NULL)
 			return ISC_R_NOTFOUND;
 
-		(*dhcpv6_packet_handler)(ip, buf, 
-					 result, from.sin6_port, 
+		(*dhcpv6_packet_handler)(ip, buf,
+					 result, from.sin6_port,
 					 &ifrom, is_unicast);
 	}
 
@@ -1252,7 +1252,7 @@
 		if (status == ISC_R_SUCCESS || status == DHCP_R_UNCHANGED)
 			return status;
 	}
-			 
+
 	return ISC_R_NOTFOUND;
 }
 
@@ -1453,7 +1453,7 @@
 {
 	struct interface_info *hp;
 	isc_result_t status;
-	
+
 	hp = (struct interface_info *)0;
 	status = interface_allocate (&hp, MDL);
 	if (status != ISC_R_SUCCESS)

_service:tar_scm:dhcp-4.4.2.tar.gz/common/dispatch.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/dispatch.c Changed

@@ -3,7 +3,7 @@
 Network input dispatcher... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -96,7 +96,7 @@
 * to the timer and use that. The complications arise in trying to ensure
 * that all of the corner cases are covered. The last one is potentially
 * more painful and requires more investigation.
- * 
+ *
 * The plan is continue with the older DHCP calls and timer list. The
 * calls will continue to manipulate the list but will also pass a
 * timer to the ISC timer code for the actual dispatch. Later, if desired,
@@ -266,7 +266,7 @@
 
 	sec = when->tv_sec - cur_tv.tv_sec;
 	usec = when->tv_usec - cur_tv.tv_usec;
-	
+
 	if ((when->tv_usec != 0) && (usec < 0)) {
 		sec--;
 		usec += USEC_MAX;
@@ -287,7 +287,7 @@
 		usec = USEC_MAX - 1;
 	}
 
-	/* 
+	/*
 	 * This is necessary for the tracing code but we put it
 	 * here in case we want to compare timing information
 	 * for some reason, like debugging.

_service:tar_scm:dhcp-4.4.2.tar.gz/common/dlpi.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/dlpi.c Changed

@@ -1,9 +1,9 @@
 /* dlpi.c
- 
+
 Data Link Provider Interface (DLPI) network interface code. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -160,8 +160,8 @@
 /* These functions are not used if we're only sourcing the get_hw_addr()
 * function (for USE_SOCKETS).
 */
-static int dlpiunitdatareq (int fd, unsigned char *addr, int addrlen, 
-			 unsigned long minpri, unsigned long maxpri, 
+static int dlpiunitdatareq (int fd, unsigned char *addr, int addrlen,
+			 unsigned long minpri, unsigned long maxpri,
 			 unsigned char *data, int datalen);
 static int dlpiunitdataind (int fd,
 			 unsigned char *dstaddr,
@@ -172,7 +172,7 @@
 			 unsigned char *data,
 			 int datalen);
 #endif /* !USE_DLPI_HWADDR: USE_DLPI_SEND || USE_DLPI_RECEIVE */
-static int expected (unsigned long prim, union DL_primitives *dlp, 
+static int expected (unsigned long prim, union DL_primitives *dlp,
 		 int msgflags);
 static int strgetmsg (int fd, struct strbuf *ctlp, struct strbuf *datap,
 		 int *flagsp, char *caller);
@@ -214,7 +214,7 @@
 	}
 
 	/*
-	 * Submit a DL_INFO_REQ request, to find the dl_mac_type and 
+	 * Submit a DL_INFO_REQ request, to find the dl_mac_type and
 * dl_provider_style
 	 */
 	if (dlpiinforeq(sock) < 0 || dlpiinfoack(sock, (char *)buf) < 0) {
@@ -225,7 +225,7 @@
 	 case DL_ETHER:
 		info -> hw_address.hbuf 0 = HTYPE_ETHER;
 		break;
-	 /* adding token ring 5/1999 - mayer@ping.at */ 
+	 /* adding token ring 5/1999 - mayer@ping.at */
 	 case DL_TPR:
 		info -> hw_address.hbuf 0 = HTYPE_IEEE802;
 		break;
@@ -243,10 +243,10 @@
 * assume -2 and ffffff.
 */
 info -> dlpi_sap_length = dlp -> info_ack.dl_sap_length;
- info -> dlpi_broadcast_addr.hlen = 
+ info -> dlpi_broadcast_addr.hlen =
 dlp -> info_ack.dl_brdcst_addr_length;
- memcpy (info -> dlpi_broadcast_addr.hbuf, 
- (char *)dlp + dlp -> info_ack.dl_brdcst_addr_offset, 
+ memcpy (info -> dlpi_broadcast_addr.hbuf,
+ (char *)dlp + dlp -> info_ack.dl_brdcst_addr_offset,
 dlp -> info_ack.dl_brdcst_addr_length);
 	}
 
@@ -256,7 +256,7 @@
 	 * does not exist.
 	 */
 	 unit = dlpiunit (info -> name);
-	
+
 	 if (dlpiattachreq (sock, unit) < 0
 		|| dlpiokack (sock, (char *)buf) < 0) {
 		log_fatal ("Can't attach DLPI device for %s: %m", info -> name);
@@ -575,9 +575,9 @@
 #else
 
 	/*
- * Setup the destination address (DLSAP) in dstaddr 
+ * Setup the destination address (DLSAP) in dstaddr
 *
- * If sap_length < 0 we must deliver the DLSAP as phys+sap. 
+ * If sap_length < 0 we must deliver the DLSAP as phys+sap.
 * If sap_length > 0 we must deliver the DLSAP as sap+phys.
 *
 * sap = Service Access Point == ETHERTYPE_IP
@@ -601,11 +601,11 @@
 
 if (hto && hto -> hlen == interface -> hw_address.hlen)
 memcpy ( phys, (char *) &hto -> hbuf 1, phys_len);
- else 
- memcpy ( phys, interface -> dlpi_broadcast_addr.hbuf, 
+ else
+ memcpy ( phys, interface -> dlpi_broadcast_addr.hbuf,
 interface -> dlpi_broadcast_addr.hlen);
 
- if (sap_len < 0) { 
+ if (sap_len < 0) {
 memcpy ( dstaddr, phys, phys_len);
 memcpy ( (char *) &dstaddr phys_len, sap, ABS (sap_len));
 }
@@ -640,10 +640,10 @@
 	int offset = 0;
 	int bufix = 0;
 	unsigned paylen;
-	
+
 #ifdef USE_DLPI_RAW
 	length = read (interface -> rfdesc, dbuf, sizeof (dbuf));
-#else	
+#else
 	length = dlpiunitdataind (interface -> rfdesc, (unsigned char *)NULL,
 				 (unsigned long *)NULL, srcaddr, &srcaddrlen,
 				 (unsigned long *)NULL, dbuf, sizeof (dbuf));
@@ -669,14 +669,14 @@
 if (hfrom && (srcaddrlen == ABS (sap_len) + phys_len )) {
 hfrom -> hbuf 0 = interface -> hw_address.hbuf 0;
 hfrom -> hlen = interface -> hw_address.hlen;
- 
+
 if (sap_len < 0) {
 memcpy ((char *) &hfrom -> hbuf 1, srcaddr, phys_len);
 }
 else {
 memcpy((char *)&hfrom->hbuf1, srcaddr + sap_len, phys_len);
 }
- } 
+ }
 else if (hfrom) {
 memset (hfrom, '\0', sizeof *hfrom);
 }
@@ -733,11 +733,11 @@
 * Based largely in part to the example code contained in the document
 * "How to Use the STREAMS Data Link Provider Interface (DLPI)", written
 * by Neal Nuckolls of SunSoft Internet Engineering.
- * 
+ *
 * This code has been developed and tested on sparc-based machines running
 * SunOS 5.5.1, with le and hme network interfaces. It should be pretty
 * generic, though.
- * 
+ *
 * The usual disclaimers apply. This code works for me. Don't blame me
 * if it makes your machine or network go down in flames. That taken
 * into consideration, use this code as you wish. If you make usefull
@@ -756,24 +756,24 @@
 {
 	char *cp;
 	int unit;
-	
+
 	if (!ifname) {
 		return 0;
 	}
-	
+
 	/* Advance to the end of the name */
 	cp = ifname;
 	while (*cp) cp++;
 	/* Back up to the start of the first digit */
 	while ((*(cp-1) >= '0' && *(cp-1) <= '9') || *(cp - 1) == ':') cp--;
-	
+
 	/* Convert the unit number */
 	unit = 0;
 	while (*cp >= '0' && *cp <= '9') {
 		unit *= 10;
 		unit += (*cp++ - '0');
 	}
-	
+
 	return unit;
 }
 
@@ -785,11 +785,11 @@
 	char devname 50;
 	char *dp;
 	const char *cp, *ep;
-	
+
 	if (!ifname) {
 		return -1;
 	}
-	
+
 	/* Open a DLPI device */
 	if (*ifname == '/') {
 		dp = devname;
@@ -810,13 +810,13 @@
 	while ((*(ep - 1) >= '0' && *(ep - 1) <= '9') || *(ep - 1) == ':')
 		ep--;
 #endif
-	
+
 	/* Copy everything up to the unit number */
 	while (cp < ep) {
 		*dp++ = *cp++;
 	}
 	*dp = '\0';
-	
+
 	return open (devname, O_RDWR, 0);
 }
 
@@ -830,15 +830,15 @@
 	dl_info_req_t info_req;
 	struct strbuf ctl;
 	int flags;
-	
+
 	info_req.dl_primitive = DL_INFO_REQ;
-	
+
 	ctl.maxlen = 0;
 	ctl.len = sizeof (info_req);
 	ctl.buf = (char *)&info_req;
-	
+
 	flags = RS_HIPRI;
-	
+
 	return putmsg (fd, &ctl, (struct strbuf *)NULL, flags);
 }
 
@@ -852,16 +852,16 @@
 	dl_phys_addr_req_t physaddr_req;
 	struct strbuf ctl;
 	int flags;
-	
+
 	physaddr_req.dl_primitive = DL_PHYS_ADDR_REQ;
 	physaddr_req.dl_addr_type = addrtype;
-	
+
 	ctl.maxlen = 0;
 	ctl.len = sizeof (physaddr_req);
 	ctl.buf = (char *)&physaddr_req;
-	
+
 	flags = RS_HIPRI;
-	
+
 	return putmsg (fd, &ctl, (struct strbuf *)NULL, flags);
 }
 
@@ -875,16 +875,16 @@
 	dl_attach_req_t	attach_req;
 	struct strbuf ctl;
 	int flags;
-	
+
 	attach_req.dl_primitive = DL_ATTACH_REQ;
 	attach_req.dl_ppa = ppa;
-	
+
 	ctl.maxlen = 0;
 	ctl.len = sizeof (attach_req);
 	ctl.buf = (char *)&attach_req;
-	
+
 	flags = 0;
-	
+
 	return putmsg (fd, &ctl, (struct strbuf*)NULL, flags);
 }
 
@@ -902,20 +902,20 @@
 	dl_bind_req_t bind_req;
 	struct strbuf ctl;
 	int flags;
-	
+
 	bind_req.dl_primitive = DL_BIND_REQ;
 	bind_req.dl_sap = sap;
 	bind_req.dl_max_conind = max_conind;
 	bind_req.dl_service_mode = service_mode;
 	bind_req.dl_conn_mgmt = conn_mgmt;
 	bind_req.dl_xidtest_flg = xidtest;
-	
+
 	ctl.maxlen = 0;
 	ctl.len = sizeof (bind_req);
 	ctl.buf = (char *)&bind_req;
-	
+
 	flags = 0;
-	
+
 	return putmsg (fd, &ctl, (struct strbuf*)NULL, flags);
 }
 
@@ -931,15 +931,15 @@
 	dl_unbind_req_t	unbind_req;
 	struct strbuf ctl;
 	int flags;
-	
+
 	unbind_req.dl_primitive = DL_UNBIND_REQ;
-	
+
 	ctl.maxlen = 0;
 	ctl.len = sizeof (unbind_req);
 	ctl.buf = (char *)&unbind_req;
-	
+
 	flags = 0;
-	
+
 	return putmsg (fd, &ctl, (struct strbuf*)NULL, flags);
 }
 
@@ -955,15 +955,15 @@
 	dl_detach_req_t	detach_req;
 	struct strbuf ctl;
 	int flags;
-	
+
 	detach_req.dl_primitive = DL_DETACH_REQ;
-	
+
 	ctl.maxlen = 0;
 	ctl.len = sizeof (detach_req);
 	ctl.buf = (char *)&detach_req;
-	
+
 	flags = 0;
-	
+
 	return putmsg (fd, &ctl, (struct strbuf*)NULL, flags);
 }
 #endif /* UNUSED_DLPI_INTERFACE */
@@ -979,7 +979,7 @@
 	union DL_primitives *dlp;
 	struct strbuf ctl;
 	int flags;
-	
+
 	ctl.maxlen = DLPI_MAXDLBUF;
 	ctl.len = 0;
 	ctl.buf = bufp;
@@ -988,13 +988,13 @@
 		 (struct strbuf*)NULL, &flags, "dlpibindack") < 0) {
 		return -1;
 	}
-	
+
 	dlp = (union DL_primitives *)ctl.buf;
-	
+
 	if (expected (DL_BIND_ACK, dlp, flags) == -1) {
 		return -1;
 	}
-	
+
 	if (ctl.len < sizeof (dl_bind_ack_t)) {
 		/* Returned structure is too short */
 		return -1;
@@ -1013,27 +1013,27 @@
 	union DL_primitives *dlp;
 	struct strbuf ctl;
 	int flags;
-	
+
 	ctl.maxlen = DLPI_MAXDLBUF;
 	ctl.len = 0;
 	ctl.buf = bufp;
-	
+
 	if (strgetmsg (fd, &ctl,
 		 (struct strbuf*)NULL, &flags, "dlpiokack") < 0) {
 		return -1;
 	}
-	
+
 	dlp = (union DL_primitives *)ctl.buf;
-	
+
 	if (expected (DL_OK_ACK, dlp, flags) == -1) {
 		return -1;
 	}
-	
+
 	if (ctl.len < sizeof (dl_ok_ack_t)) {
 		/* Returned structure is too short */
 		return -1;
 	}
-	
+
 	return 0;
 }
 
@@ -1047,27 +1047,27 @@
 	union DL_primitives *dlp;
 	struct strbuf ctl;
 	int flags;
-	
+
 	ctl.maxlen = DLPI_MAXDLBUF;
 	ctl.len = 0;
 	ctl.buf = bufp;
-	
+
 	if (strgetmsg (fd, &ctl, (struct strbuf *)NULL, &flags,
 		 "dlpiinfoack") < 0) {
 		return -1;
 	}
-	
+
 	dlp = (union DL_primitives *) ctl.buf;
-	
+
 	if (expected (DL_INFO_ACK, dlp, flags) == -1) {
 		return -1;
 	}
-	
+
 	if (ctl.len < sizeof (dl_info_ack_t)) {
 		/* Returned structure is too short */
 		return -1;
 	}
-	
+
 	return 0;
 }
 
@@ -1081,18 +1081,18 @@
 	union DL_primitives *dlp;
 	struct strbuf ctl;
 	int flags;
-	
+
 	ctl.maxlen = DLPI_MAXDLBUF;
 	ctl.len = 0;
 	ctl.buf = bufp;
-	
+
 	if (strgetmsg (fd, &ctl, (struct strbuf *)NULL, &flags,
 		 "dlpiphysaddrack") < 0) {
 		return -1;
 	}
 
 	dlp = (union DL_primitives *)ctl.buf;
-	
+
 	if (expected (DL_PHYS_ADDR_ACK, dlp, flags) == -1) {
 		return -1;
 	}
@@ -1101,7 +1101,7 @@
 		/* Returned structure is too short */
 		return -1;
 	}
-	
+
 	return 0;
 }
 
@@ -1118,7 +1118,7 @@
 	long buf DLPI_MAXDLBUF;
 	union DL_primitives *dlp;
 	struct strbuf ctl, data;
-	
+
 	/* Set up the control information... */
 	dlp = (union DL_primitives *)buf;
 	dlp -> unitdata_req.dl_primitive = DL_UNITDATA_REQ;
@@ -1130,7 +1130,7 @@
 	/* Append the destination address */
 	memcpy ((char *)buf + dlp -> unitdata_req.dl_dest_addr_offset,
 		addr, addrlen);
-	
+
 	ctl.maxlen = 0;
 	ctl.len = dlp -> unitdata_req.dl_dest_addr_offset + addrlen;
 	ctl.buf = (char *)buf;
@@ -1233,7 +1233,7 @@
 		/* Incorrect/unexpected return message */
 		return -1;
 	}
-	
+
 	return 0;
 }
 
@@ -1252,7 +1252,7 @@
 	time_t now;
 	time_t starttime;
 	int to_msec;
-	
+
 	pfd.fd = fd;
 	pfd.events = POLLPRI;	/* We're only interested in knowing
 				 * when we can receive the next high
@@ -1264,7 +1264,7 @@
 	while (now <= starttime + DLPI_MAXWAIT) {
 		to_msec = ((starttime + DLPI_MAXWAIT) - now) * 1000;
 		count = poll (&pfd, 1, to_msec);
-		
+
 		if (count == 0) {
 			/* log_fatal ("strgetmsg: timeout"); */
 			return -1;
@@ -1342,7 +1342,7 @@
 }
 #endif /* USE_DLPI_SEND */
 
-void 
+void
 get_hw_addr(const char *name, struct hardware *hw) {
 	int sock, unit;
 	long bufDLPI_MAXDLBUF;
@@ -1350,7 +1350,7 @@
 
 dlp = (union DL_primitives *)buf;
 
-	/* 
+	/*
 	 * Open a DLPI device.
 	 */
 	sock = dlpiopen(name);
@@ -1359,7 +1359,7 @@
 	}
 
 	/*
-	 * Submit a DL_INFO_REQ request, to find the dl_mac_type and 
+	 * Submit a DL_INFO_REQ request, to find the dl_mac_type and
 * dl_provider_style
 	 */
 	if (dlpiinforeq(sock) < 0) {
@@ -1411,12 +1411,12 @@
 			 name);
 	}
 	if (dlp->physaddr_ack.dl_addr_length < sizeof(hw->hbuf)) {
-		memcpy(hw->hbuf+1, 
+		memcpy(hw->hbuf+1,
 		 (char *)buf + dlp->physaddr_ack.dl_addr_offset,
 		 dlp->physaddr_ack.dl_addr_length);
 		hw->hlen = dlp->physaddr_ack.dl_addr_length + 1;
 	} else {
-		memcpy(hw->hbuf+1, 
+		memcpy(hw->hbuf+1,
 		 (char *)buf + dlp->physaddr_ack.dl_addr_offset,
 		 sizeof(hw->hbuf)-1);
 		hw->hlen = sizeof(hw->hbuf);

_service:tar_scm:dhcp-4.4.2.tar.gz/common/dns.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/dns.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/ethernet.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/ethernet.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/execute.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/execute.c Changed

@@ -3,7 +3,7 @@
 Support for executable statements. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1998-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -167,7 +167,7 @@
 				 (&rc, packet,
 				 lease, client_state, in_options,
 				 out_options, scope, r->data.ie.expr));
-			
+
 #if defined (DEBUG_EXPRESSIONS)
 			log_debug ("exec: if %s", (status
 					 ? (rc ? "true" : "false")
@@ -219,7 +219,7 @@
 }
 
 log_debug("execute_statement argv0 = %s", argv0);
- 
+
 for (i = 1, expr = r->data.execute.arglist; expr;
 expr = expr->data.arg.next, i++) {
 memset (&ds, 0, sizeof(ds));
@@ -509,7 +509,7 @@
 				 (&ds, packet,
 				 lease, client_state, in_options,
 				 out_options, scope, r->data.log.expr, MDL));
-			
+
 #if defined (DEBUG_EXPRESSIONS)
 			log_debug ("exec: log");
 #endif
@@ -936,7 +936,7 @@
 				token_indent_data_string
 					(file, col, indent + 8, "", "",
 					 &r -> data.option -> data);
-					 
+
 			fprintf (file, ";"); /* XXX */
 			break;
 
@@ -952,7 +952,7 @@
 			(void) token_print_indent (file, col, indent + 4,
 						 " ", "", ";");
 			break;
-			
+
 		 case unset_statement:
 			indent_spaces (file, indent);
 			fprintf (file, "unset ");
@@ -1021,7 +1021,7 @@
 "is not defined).", MDL);
 #endif /* ENABLE_EXECUTE */
 break;
-			
+
 		 case vendor_opt_statement:
 			indent_spaces (file, indent);
 			fprintf (file, "parse-vendor-option;");

_service:tar_scm:dhcp-4.4.2.tar.gz/common/fddi.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/fddi.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/icmp.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/icmp.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/inet.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/inet.c Changed

@@ -4,7 +4,7 @@
 way... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -20,8 +20,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -101,7 +101,7 @@
 		} else
 			rv.iabuf i + j = habuf i;
 	}
-		
+
 	return rv;
 }
 
@@ -174,7 +174,7 @@
 	return memcmp (addr1.iabuf, addr2.iabuf, addr1.len) == 0;
 }
 
-/* addr_match 
+/* addr_match
 *
 * compares an IP address against a network/mask combination
 * by ANDing the IP with the mask and seeing whether the result
@@ -189,7 +189,7 @@
 
 	if (addr->len != match->addr.len)
 		return 0;
-	
+
 	for (i = 0 ; i < addr->len ; i++) {
 		if ((addr->iabufi & match->mask.iabufi) !=
 							match->addr.iabufi)
@@ -198,7 +198,7 @@
 	return 1;
 }
 
-/* 
+/*
 * Compares the addresses a1 and a2.
 *
 * If a1 < a2, returns -1.
@@ -234,7 +234,7 @@
 *
 * WARNING: if a1 and a2 differ in length, returns 0.
 */
-int 
+int
 addr_or(struct iaddr *result, const struct iaddr *a1, const struct iaddr *a2) {
 	int i;
 	int all_zero;
@@ -263,7 +263,7 @@
 *
 * WARNING: if a1 and a2 differ in length, returns 0.
 */
-int 
+int
 addr_and(struct iaddr *result, const struct iaddr *a1, const struct iaddr *a2) {
 	int i;
 	int all_zero;
@@ -323,7 +323,7 @@
 	zero_bits = (addr->len * 8) - bits;
 	zero_bytes = zero_bits / 8;
 
-	/* 
+	/*
 	 * Check to make sure the low-order bytes are zero.
 	 */
 	for (i=1; i<=zero_bytes; i++) {
@@ -332,11 +332,11 @@
 		}
 	}
 
-	/* 
-	 * Look to see if any bits not in right-hand bytes are 
-	 * non-zero, by making a byte that has these bits set to zero 
-	 * comparing to the original byte. If these two values are 
-	 * equal, then the right-hand bits are zero, and we are 
+	/*
+	 * Look to see if any bits not in right-hand bytes are
+	 * non-zero, by making a byte that has these bits set to zero
+	 * comparing to the original byte. If these two values are
+	 * equal, then the right-hand bits are zero, and we are
 	 * happy.
 	 */
 	shift_bits = zero_bits % 8;
@@ -350,14 +350,14 @@
 *
 * Converts a range of IP addresses to a set of CIDR networks.
 *
- * Examples: 
+ * Examples:
 * 192.168.0.0 - 192.168.0.255 = 192.168.0.0/24
 * 10.0.0.0 - 10.0.1.127 = 10.0.0.0/24, 10.0.1.0/25
 * 255.255.255.32 - 255.255.255.255 = 255.255.255.32/27, 255.255.255.64/26,
 * 				 255.255.255.128/25
 */
-isc_result_t 
-range2cidr(struct iaddrcidrnetlist **result, 
+isc_result_t
+range2cidr(struct iaddrcidrnetlist **result,
 	 const struct iaddr *lo, const struct iaddr *hi) {
 	struct iaddr addr;
 	struct iaddr mask;
@@ -395,30 +395,30 @@
 	 * Start at the low end, and keep trying larger networks
 	 * until we get one that is too big (explained below).
 	 *
-	 * We keep a "mask", which is the ones-complement of a 
+	 * We keep a "mask", which is the ones-complement of a
 	 * normal netmask. So, a /23 has a netmask of 255.255.254.0,
 	 * and a mask of 0.0.1.255.
 	 *
-	 * We know when a network is too big when we bitwise-AND the 
-	 * mask with the starting address and we get a non-zero 
+	 * We know when a network is too big when we bitwise-AND the
+	 * mask with the starting address and we get a non-zero
 	 * result, like this:
 	 *
 	 * addr: 192.168.1.0, mask: 0.0.1.255
 	 * bitwise-AND: 0.0.1.0
-	 * 
+	 *
 	 * A network is also too big if the bitwise-OR of the mask
 	 * with the starting address is larger than the end address,
 	 * like this:
 	 *
 	 * start: 192.168.1.0, mask: 0.0.1.255, end: 192.168.0.255
-	 * bitwise-OR: 192.168.1.255 
+	 * bitwise-OR: 192.168.1.255
 	 *
 	 * -------------------
-	 * Once we have found a network that is too big, we add the 
+	 * Once we have found a network that is too big, we add the
 	 * appropriate CIDR network to our list of found networks.
 	 *
 	 * We then use the next IP address as our low address, and
-	 * begin the process of searching for a network that is 
+	 * begin the process of searching for a network that is
 	 * too big again, starting with an empty mask.
 	 */
 	addr = *lo;
@@ -435,12 +435,12 @@
 			mask.iabufofs |= val;
 		}
 
-		/* 
+		/*
 		 * See if we're too big, and save this network if so.
 		 */
 		addr_or(&end_addr, &addr, &mask);
 		if ((ofs < 0) ||
-		 (addr_cmp(&end_addr, hi) > 0) || 
+		 (addr_cmp(&end_addr, hi) > 0) ||
 		 addr_and(&dummy, &addr, &mask)) {
 		 	/*
 			 * Add a new prefix to our list.
@@ -459,8 +459,8 @@
 			net->next = *result;
 			*result = net;
 
-		 	/* 
-			 * Figure out our new starting address, 
+		 	/*
+			 * Figure out our new starting address,
 			 * by adding (1 << bit) to our previous
 			 * starting address.
 			 */
@@ -534,7 +534,7 @@
 	}
 	if (addr.len == 4) {
 		return inet_ntop(AF_INET, addr.iabuf, pbuf, sizeof(pbuf));
-	} 
+	}
 	if (addr.len == 16) {
 		return inet_ntop(AF_INET6, addr.iabuf, pbuf, sizeof(pbuf));
 	}
@@ -610,7 +610,7 @@
 
 	errno = 0;
 	local_port = strtol(port, &endptr, 10);
-	
+
 	if ((*endptr != '\0') || (errno == ERANGE) || (errno == EINVAL))
 		log_fatal ("Invalid port number specification: %s", port);
 
@@ -636,7 +636,7 @@
 
 	errno = 0;
 	local_port = strtol(port, &endptr, 10);
-	
+
 	if ((*endptr != '\0') || (errno == ERANGE) || (errno == EINVAL))
 		log_fatal ("Invalid port pair specification: %s", port);

_service:tar_scm:dhcp-4.4.2.tar.gz/common/lpf.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/lpf.c Changed

@@ -4,7 +4,7 @@
 Support Services in Vancouver, B.C. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -20,8 +20,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 */
@@ -307,7 +307,7 @@
 /* Patch the server port into the LPF program...
 	 XXX changes to filter program may require changes
 	 XXX to the insn number(s) used below!
-	 XXX Token ring filter is null - when/if we have a filter 
+	 XXX Token ring filter is null - when/if we have a filter
 	 XXX that's not, we'll need this code.
 	 XXX dhcp_bpf_filter ?.k = ntohs (local_port); */
 
@@ -539,7 +539,7 @@
 	memset(&tmp, 0, sizeof(tmp));
 	strcpy(tmp.ifr_name, name);
 	if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
-		log_fatal("Error getting hardware address for \"%s\": %m", 
+		log_fatal("Error getting hardware address for \"%s\": %m",
 			 name);
 	}

_service:tar_scm:dhcp-4.4.2.tar.gz/common/memory.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/memory.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/nit.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/nit.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/ns_name.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/ns_name.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/options.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/options.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/packet.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/packet.c Changed

@@ -3,7 +3,7 @@
 Packet assembly code, originally contributed by Archie Cobbs. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -61,7 +61,7 @@
 		/* Add carry. */
 		if (sum > 0xFFFF)
 			sum -= 0xFFFF;
-	}	
+	}
 
 	/* If there's a single byte left over, checksum it, too. Network
 	 byte order is big-endian, so the remaining byte is the high byte. */
@@ -74,7 +74,7 @@
 		if (sum > 0xFFFF)
 			sum -= 0xFFFF;
 	}
-	
+
 	return sum;
 }
 
@@ -91,7 +91,7 @@
 #ifdef DEBUG_CHECKSUM_VERBOSE
 	log_debug ("sum = %x", sum);
 #endif
-	
+
 #ifdef DEBUG_CHECKSUM
 	log_debug ("wrapsum returns %x", htons (sum));
 #endif
@@ -156,10 +156,10 @@
 	ip.ip_sum = 0;
 	ip.ip_src.s_addr = from;
 	ip.ip_dst.s_addr = to;
-	
+
 	/* Checksum the IP header... */
 	ip.ip_sum = wrapsum (checksum ((unsigned char *)&ip, sizeof ip, 0));
-	
+
 	/* Copy the ip header into the buffer... */
 	memcpy (&buf *bufix, &ip, sizeof ip);
 	*bufix += sizeof ip;
@@ -181,7 +181,7 @@
 
 	udp.uh_sum =
 		wrapsum (checksum ((unsigned char *)&udp, sizeof udp,
-				 checksum (data, len, 
+				 checksum (data, len,
 					 checksum ((unsigned char *)
 						 &ip.ip_src,
 						 2 * sizeof ip.ip_src,

_service:tar_scm:dhcp-4.4.2.tar.gz/common/parse.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/parse.c Changed

@@ -3,7 +3,7 @@
 Common parser code for dhcpd and dhclient. */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -93,7 +93,7 @@
 	statement foo bar { }
 	statement foo bar { statement { } }
 	statement}
- 
+
 	...et cetera. */
 void skip_to_rbrace (cfile, brace_count)
 	struct parse *cfile;
@@ -203,7 +203,7 @@
 	char *t;
 	pair c = (pair)0;
 	int ltid = 0;
-	
+
 	/* Read a dotted hostname... */
 	do {
 		/* Read a token, which should be an identifier. */
@@ -256,7 +256,7 @@
 
 /* ip-addr-or-hostname :== ip-address | hostname
 ip-address :== NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
- 
+
 Parse an ip address or a hostname. If uniform is zero, put in
 an expr_substring node to limit hostnames that evaluate to more
 than one IP address.
@@ -327,8 +327,8 @@
 	}
 
 	return 1;
-}	
-	
+}
+
 /*
 * ip-address :== NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
 */
@@ -342,7 +342,7 @@
 				 &addr -> len, DOT, 10, 8))
 		return 1;
 	return 0;
-}	
+}
 
 /*
 * Return true if every character in the string is hexadecimal.
@@ -363,7 +363,7 @@
 *
 * See section 2.2 of RFC 1884 for details.
 *
- * We are lazy for this. We pull numbers, names, colons, and dots 
+ * We are lazy for this. We pull numbers, names, colons, and dots
 * together and then throw the resulting string at the inet_pton()
 * function.
 */
@@ -378,7 +378,7 @@
 	int v6_len;
 
 	/*
-	 * First token is non-raw. This way we eat any whitespace before 
+	 * First token is non-raw. This way we eat any whitespace before
 	 * our IPv6 address begins, like one would expect.
 	 */
 	token = peek_token(&val, NULL, cfile);
@@ -425,11 +425,11 @@
 }
 
 /*
- * Same as parse_ip6_addr() above, but returns the value in the 
+ * Same as parse_ip6_addr() above, but returns the value in the
 * expression rather than in an address structure.
 */
 int
-parse_ip6_addr_expr(struct expression **expr, 
+parse_ip6_addr_expr(struct expression **expr,
 		 struct parse *cfile) {
 	struct iaddr addr;
 
@@ -539,7 +539,7 @@
 			match->mask.iabuffflen =
 			 "\x00\x80\xc0\xe0\xf0\xf8\xfc\xfe"prefixlen % 8;
 
-			memset(match->mask.iabuf+fflen+1, 0x00, 
+			memset(match->mask.iabuf+fflen+1, 0x00,
 			 match->mask.len - fflen - 1);
 
 			/* AND-out insignificant bits from supplied netmask. */
@@ -569,7 +569,7 @@
 	parse_warn(cfile,
 		 "expecting ip-address or ip-address/prefixlen");
 
-	return 0; /* let caller pick up pieces */ 
+	return 0; /* let caller pick up pieces */
 }
 
 /*
@@ -643,7 +643,7 @@
 			 (sizeof(hardware->hbuf)) - hlen - 1);
 		dfree(t, MDL);
 	}
-	
+
 out:
 	token = next_token(&val, NULL, cfile);
 	if (token != SEMI) {
@@ -922,9 +922,9 @@
 }
 
 /*
- * date :== NUMBER NUMBER SLASH NUMBER SLASH NUMBER 
+ * date :== NUMBER NUMBER SLASH NUMBER SLASH NUMBER
 *		NUMBER COLON NUMBER COLON NUMBER |
- * NUMBER NUMBER SLASH NUMBER SLASH NUMBER 
+ * NUMBER NUMBER SLASH NUMBER SLASH NUMBER
 *		NUMBER COLON NUMBER COLON NUMBER NUMBER |
 * EPOCH NUMBER |
 *	 NEVER
@@ -939,7 +939,7 @@
 * just parse the date
 * any trailing semi must be consumed by the caller of this routine
 */
-TIME 
+TIME
 parse_date_core(cfile)
 	struct parse *cfile;
 {
@@ -1021,7 +1021,7 @@
 		parse_warn(cfile, "numeric month expected.");
 		return((TIME)0);
 	}
-	skip_token(&val, NULL, cfile); /* consume month */	
+	skip_token(&val, NULL, cfile); /* consume month */
 	mon = atoi(val) - 1;
 
 	/* Slash separating month from day... */
@@ -1149,7 +1149,7 @@
 * :== date semi
 */
 
-TIME 
+TIME
 parse_date(cfile)
 struct parse *cfile;
 {
@@ -1551,7 +1551,7 @@
 	char *s;
 	int has_encapsulation = 0;
 	struct universe *encapsulated;
-	
+
 	/* Parse the option code. */
 	token = next_token (&val, (unsigned *)0, cfile);
 	if (token != NUMBER) {
@@ -1845,7 +1845,7 @@
 		/* INSIST(tokbuf0 == 'E'); */
 		/* INSIST(encapsulated != NULL); */
 		if (!option_code_hash_lookup(&encapsulated->enc_opt,
-					 option->universe->code_hash, 
+					 option->universe->code_hash,
 					 &option->code, 0, MDL)) {
 			log_fatal("error finding encapsulated option (%s:%d)",
 				 MDL);
@@ -1884,7 +1884,7 @@
 	int cc = 0;
 	int terminated = 0;
 	int valid_base64;
-	
+
 	/* It's possible for a + or a / to cause a base64 quantity to be
 	 tokenized into more than one token, so we have to parse them all
 	 in before decoding. */
@@ -1925,7 +1925,7 @@
 		data->data = NULL;
 		goto out;
 	}
-		
+
 	j = k = 0;
 	for (t = bufs; t; t = t->next) {
 	 for (i = 0; t->stringi; i++) {
@@ -1959,7 +1959,7 @@
 				data->buffer->dataj++ = (acc >> 4);
 				acc = acc & 0x0f;
 				break;
-				
+
 			 case 2:
 				data->buffer->dataj++ = (acc >> 2);
 				acc = acc & 0x03;
@@ -2057,7 +2057,7 @@
 		dfree (sl, MDL);
 		sl = next;
 	}
-	
+
 	memcpy (rvp, ibuf, ilen);
 	return 1;
 }
@@ -2275,7 +2275,7 @@
 	 case ON:
 		skip_token(&val, (unsigned *)0, cfile);
 		return parse_on_statement (result, cfile, lose);
-			
+
 	 case SWITCH:
 		skip_token(&val, (unsigned *)0, cfile);
 		return parse_switch_statement (result, cfile, lose);
@@ -2297,7 +2297,7 @@
 		if (case_context == context_any) {
 			parse_warn (cfile, "switch default statement in %s",
 				 "inappropriate scope.");
-		
+
 			*lose = 1;
 			return 0;
 		} else {
@@ -2306,7 +2306,7 @@
 			(*result) -> op = default_statement;
 			return 1;
 		}
-			
+
 	 case DEFINE:
 	 case TOKEN_SET:
 		skip_token(&val, (unsigned *)0, cfile);
@@ -2701,7 +2701,7 @@
 		}
 		dns_zone_dereference (&zone, MDL);
 		return 1;
-		
+
 		/* Also not really a statement, but same idea as above. */
 	 case KEY:
 		skip_token(&val, (unsigned *)0, cfile);
@@ -2803,7 +2803,7 @@
 			 log_fatal ("can't allocate primary option cache.");
 		 oc = zone -> primary;
 		 goto consemup;
-		 
+
 		 case SECONDARY:
 		 if (zone -> secondary) {
 			 parse_warn (cfile, "more than one secondary.");
@@ -2932,7 +2932,7 @@
 		 if (!parse_semi(cfile))
 			 return (0);
 		 break;
-		 
+
 		 default:
 		 done = 1;
 		 break;
@@ -3121,15 +3121,15 @@
 		 case EXPIRY:
 			(*result) -> data.on.evtypes |= ON_EXPIRY;
 			break;
-		
+
 		 case COMMIT:
 			(*result) -> data.on.evtypes |= ON_COMMIT;
 			break;
-			
+
 		 case RELEASE:
 			(*result) -> data.on.evtypes |= ON_RELEASE;
 			break;
-			
+
 		 case TRANSMISSION:
 			(*result) -> data.on.evtypes |= ON_TRANSMISSION;
 			break;
@@ -3143,7 +3143,7 @@
 		}
 		token = next_token (&val, (unsigned *)0, cfile);
 	} while (token == OR);
-		
+
 	/* Semicolon means no statements. */
 	if (token == SEMI)
 		return 1;
@@ -3419,7 +3419,7 @@
 		}
 	} else
 		(*result) -> data.ie.fc = (struct executable_statement *)0;
-	
+
 	return 1;
 }
 
@@ -3433,7 +3433,7 @@
 *			 boolean-expression OR boolean-expression
 *			 EXISTS OPTION-NAME
 */
- 			 
+
 int parse_boolean_expression (expr, cfile, lose)
 	struct expression **expr;
 	struct parse *cfile;
@@ -3485,7 +3485,7 @@
 * data_expression :== SUBSTRING LPAREN data-expression COMMA
 *					numeric-expression COMMA
 *					numeric-expression RPAREN |
- *		 CONCAT LPAREN data-expression COMMA 
+ *		 CONCAT LPAREN data-expression COMMA
 *					data-expression RPAREN
 *		 SUFFIX LPAREN data_expression COMMA
 *		 		 numeric-expression RPAREN |
@@ -4053,7 +4053,7 @@
 		if (token != RPAREN)
 			goto norparen;
 		break;
-		
+
 	 case STRING:
 		skip_token(&val, &len, cfile);
 		if (!make_const_data (expr, (const unsigned char *)val,
@@ -4062,7 +4062,7 @@
 		break;
 
 	 case EXTRACT_INT:
-		skip_token(&val, (unsigned *)0, cfile);	
+		skip_token(&val, (unsigned *)0, cfile);
 		token = next_token (&val, (unsigned *)0, cfile);
 		if (token != LPAREN) {
 			parse_warn (cfile, "left parenthesis expected.");
@@ -4130,9 +4130,9 @@
 			return 0;
 		}
 		break;
-	
+
 	 case ENCODE_INT:
-		skip_token(&val, (unsigned *)0, cfile);	
+		skip_token(&val, (unsigned *)0, cfile);
 		token = next_token (&val, (unsigned *)0, cfile);
 		if (token != LPAREN) {
 			parse_warn (cfile, "left parenthesis expected.");
@@ -4197,7 +4197,7 @@
 			return 0;
 		}
 		break;
-	
+
 	 case NUMBER:
 		/* If we're in a numeric context, this should just be a
 		 number, by itself. */
@@ -4232,7 +4232,7 @@
 		(*expr) -> op = expr_const_int;
 		(*expr) -> data.const_int = known;
 		break;
-		
+
 	 case NS_NOERROR:
 		known = ISC_R_SUCCESS;
 		goto ns_const;
@@ -4756,19 +4756,19 @@
 	tmp = (struct expression *)0;
 	if (!expression_allocate (&tmp, MDL))
 		log_fatal ("No memory for equal precedence combination.");
-	
+
 	/* Store the LHS and RHS. */
 	tmp -> data.equal 0 = lhs;
 	tmp -> data.equal 1 = rhs;
 	tmp -> op = binop;
-	
+
 	lhs = tmp;
 	tmp = (struct expression *)0;
 	rhs = (struct expression *)0;
 
 	binop = next_op;
 	goto new_rhs;
-}	
+}
 
 
 int parse_option_data (expr, cfile, lookups, option)
@@ -4800,7 +4800,7 @@
 			fmt = option->format;
 
 		/* 'a' means always uniform */
-		if ((fmt0 != 'Z') && (tolower((unsigned char)fmt1) == 'a')) 
+		if ((fmt0 != 'Z') && (tolower((unsigned char)fmt1) == 'a'))
 			uniform = 1;
 
 		do {
@@ -4894,7 +4894,7 @@
 	if ((token == SEMI) && (option->format0 != 'Z')) {
 		/* Eat the semicolon... */
 		/*
-		 * XXXSK: I'm not sure why we should ever get here, but we 
+		 * XXXSK: I'm not sure why we should ever get here, but we
 		 * 	 do during our startup. This confuses things if
 		 * 	 we are parsing a zero-length option, so don't
 		 * 	 eat the semicolon token in that case.
@@ -5059,7 +5059,7 @@
 		}
 		break;
 
-	 case 'k': /* key name */ 
+	 case 'k': /* key name */
 		token = peek_token (&val, &len, cfile);
 		if (token == STRING) {
 			token = next_token (&val, &len, cfile);
@@ -5132,7 +5132,7 @@
 			return 0;
 		}
 		break;
-		
+
 	 case 'T':	/* Lease interval. */
 		token = next_token (&val, (unsigned *)0, cfile);
 		if (token != INFINITE)
@@ -5217,11 +5217,11 @@
 		}
 		buf0 = '\0';
 		if (!make_const_data(&t, /* expression */
-				 buf, /* buffer */ 
-				 0, /* length */ 
-				 0, /* terminated */ 
-				 1, /* allocate */ 
-				 MDL)) 
+				 buf, /* buffer */
+				 0, /* length */
+				 0, /* terminated */
+				 1, /* allocate */
+				 MDL))
 			return 0;
 		break;
 
@@ -5305,7 +5305,7 @@
 					 sizeof hunkbuf - hunkix);
 				hunkix += len;
 				break;
-					
+
 			 case 't': /* Text string... */
 				token = peek_token (&val,
 						 &len, cfile);
@@ -5512,7 +5512,7 @@
 	if (!buffer_allocate (&bp, hunkix + nul_term, MDL))
 		log_fatal ("no memory to store option declaration.");
 	memcpy (bp -> data, hunkbuf, hunkix + nul_term);
-	
+
 	if (!option_cache_allocate (oc, MDL))
 		log_fatal ("out of memory allocating option cache.");
 
@@ -5556,13 +5556,14 @@
 				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,

_service:tar_scm:dhcp-4.4.2.tar.gz/common/print.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/print.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/raw.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/raw.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/resolv.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/resolv.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/common/socket.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/socket.c Changed

@@ -3,7 +3,7 @@
 BSD socket interface code... */
 
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -30,7 +30,7 @@
 * This sockopt allows a socket to be bound to a particular interface,
 * thus enabling the use of DHCPD on a multihomed host.
 * If SO_BINDTODEVICE is defined in your system header files, the use of
- * this sockopt will be automatically enabled. 
+ * this sockopt will be automatically enabled.
 * I have implemented it under Linux; other systems should be doable also.
 */
 
@@ -150,15 +150,15 @@
 	once = 1;
 #endif
 
-	/* 
+	/*
 	 * Set up the address we're going to bind to, depending on the
-	 * address family. 
-	 */ 
+	 * address family.
+	 */
 	memset(&name, 0, sizeof(name));
 	switch (family) {
 #ifdef DHCPv6
 	case AF_INET6:
-		addr6 = (struct sockaddr_in6 *)&name; 
+		addr6 = (struct sockaddr_in6 *)&name;
 		addr6->sin6_family = AF_INET6;
 		addr6->sin6_port = local_port;
 #if defined(RELAY_PORT)
@@ -194,7 +194,7 @@
 
 	case AF_INET:
 	default:
-		addr = (struct sockaddr_in *)&name; 
+		addr = (struct sockaddr_in *)&name;
 		addr->sin_family = AF_INET;
 		addr->sin_port = relay_port ? relay_port : local_port;
 		memcpy(&addr->sin_addr,
@@ -296,7 +296,7 @@
 	 */
 	if (family == AF_INET) {
 		int on = 1;
-		if (setsockopt(sock, IPPROTO_IP, IP_RECVPKTINFO, 
+		if (setsockopt(sock, IPPROTO_IP, IP_RECVPKTINFO,
 		 &on, sizeof(on)) != 0) {
 			log_fatal("Can't set IP_RECVPTKINFO on dhcp socket for"
 				 " %s: %m", info->name);
@@ -306,7 +306,7 @@
 
 #ifdef DHCPv6
 	/*
-	 * If we turn on IPV6_PKTINFO, we will be able to receive 
+	 * If we turn on IPV6_PKTINFO, we will be able to receive
 	 * additional information, such as the destination IP address.
 	 * We need this to spot unicast packets.
 	 */
@@ -314,14 +314,14 @@
 		int on = 1;
 #ifdef IPV6_RECVPKTINFO
 		/* RFC3542 */
-		if (setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, 
+		if (setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO,
 		 &on, sizeof(on)) != 0) {
 			log_fatal("setsockopt: IPV6_RECVPKTINFO for %s: %m",
 				 info->name);
 		}
 #else
 		/* RFC2292 */
-		if (setsockopt(sock, IPPROTO_IPV6, IPV6_PKTINFO, 
+		if (setsockopt(sock, IPPROTO_IPV6, IPV6_PKTINFO,
 		 &on, sizeof(on)) != 0) {
 			log_fatal("setsockopt: IPV6_PKTINFO for %s: %m",
 				 info->name);
@@ -411,7 +411,7 @@
 				 MDL);
 		}
 	}
-		
+
 	info->rfdesc = global_v4_socket;
 	global_v4_socket_references++;
 #else
@@ -462,7 +462,7 @@
 #endif /* USE_SOCKET_RECEIVE */
 
 
-#ifdef DHCPv6 
+#ifdef DHCPv6
 /*
 * This function joins the interface to DHCPv6 multicast groups so we will
 * receive multicast messages.
@@ -474,11 +474,11 @@
 
 	if (inet_pton(AF_INET6, All_DHCP_Relay_Agents_and_Servers,
 		 &mreq.ipv6mr_multiaddr) <= 0) {
-		log_fatal("inet_pton: unable to convert '%s'", 
+		log_fatal("inet_pton: unable to convert '%s'",
 			 All_DHCP_Relay_Agents_and_Servers);
 	}
 	mreq.ipv6mr_interface = if_nametoindex(info->name);
-	if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, 
+	if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP,
 		 &mreq, sizeof(mreq)) < 0) {
 		log_fatal("setsockopt: IPV6_JOIN_GROUP for %s: %m",
 			 info->name);
@@ -494,11 +494,11 @@
 	if ((info->flags & INTERFACE_STREAMS) == 0) {
 		if (inet_pton(AF_INET6, All_DHCP_Servers,
 			 &mreq.ipv6mr_multiaddr) <= 0) {
-			log_fatal("inet_pton: unable to convert '%s'", 
+			log_fatal("inet_pton: unable to convert '%s'",
 				 All_DHCP_Servers);
 		}
 		mreq.ipv6mr_interface = if_nametoindex(info->name);
-		if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, 
+		if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP,
 			 &mreq, sizeof(mreq)) < 0) {
 			log_fatal("setsockopt: IPV6_JOIN_GROUP for %s: %m",
 				 info->name);
@@ -545,7 +545,7 @@
 			log_info("Bound to *:%d", (int) ntohs(local_port));
 		}
 	}
-		
+
 	info->rfdesc = global_v6_socket;
 	info->wfdesc = global_v6_socket;
 	global_v6_socket_references++;
@@ -582,7 +582,7 @@
 	if (!quiet_interface_discovery) {
 		if (info->shared_network != NULL) {
 			log_info("Listening on Socket/%d/%s/%s",
-				 global_v6_socket, info->name, 
+				 global_v6_socket, info->name,
 				 info->shared_network->name);
 			log_info("Sending on Socket/%d/%s/%s",
 				 global_v6_socket, info->name,
@@ -610,7 +610,7 @@
 	if (global_v6_socket >= 0) {
 		log_fatal("Impossible condition at %s:%d", MDL);
 	}
-		
+
 	no_global_v6_socket = 1;
 
 	/* get the (?) link-local address */
@@ -638,7 +638,7 @@
 	if (!quiet_interface_discovery) {
 		if (info->shared_network != NULL) {
 			log_info("Listening on Socket/%d/%s/%s",
-				 global_v6_socket, info->name, 
+				 global_v6_socket, info->name,
 				 info->shared_network->name);
 			log_info("Sending on Socket/%d/%s/%s",
 				 global_v6_socket, info->name,
@@ -650,7 +650,7 @@
 	}
 }
 
-void 
+void
 if_deregister6(struct interface_info *info) {
 	/* client case */
 	if (no_global_v6_socket) {
@@ -734,7 +734,7 @@
 			pktinfo.ipi_ifindex = interface->ifp->ifr_index;
 			if (setsockopt(interface->wfdesc, IPPROTO_IP,
 				 IP_PKTINFO, (char *)&pktinfo,
-				 sizeof(pktinfo)) < 0) 
+				 sizeof(pktinfo)) < 0)
 				log_fatal("setsockopt: IP_PKTINFO for %s: %m",
 					 (char*)(interface->ifp));
 		}
@@ -761,7 +761,7 @@
 
 #ifdef DHCPv6
 /*
- * Solaris 9 is missing the CMSG_LEN and CMSG_SPACE macros, so we will 
+ * Solaris 9 is missing the CMSG_LEN and CMSG_SPACE macros, so we will
 * synthesize them (based on the BIND 9 technique).
 */
 
@@ -831,16 +831,16 @@
 #endif /* DHCPv6, IP_PKTINFO ... */
 
 #ifdef DHCPv6
-/* 
- * For both send_packet6() and receive_packet6() we need to use the 
+/*
+ * For both send_packet6() and receive_packet6() we need to use the
 * sendmsg()/recvmsg() functions rather than the simpler send()/recv()
 * functions.
 *
 * In the case of send_packet6(), we need to do this in order to insure
- * that the reply packet leaves on the same interface that it arrived 
- * on. 
+ * that the reply packet leaves on the same interface that it arrived
+ * on.
 *
- * In the case of receive_packet6(), we need to do this in order to 
+ * In the case of receive_packet6(), we need to do this in order to
 * get the IP address the packet was sent to. This is used to identify
 * whether a packet is multicast or unicast.
 *
@@ -898,8 +898,8 @@
 		dst.sin6_scope_id = ifindex;
 
 	/*
-	 * Set the data buffer we're sending. (Using this wacky 
-	 * "scatter-gather" stuff... we only have a single chunk 
+	 * Set the data buffer we're sending. (Using this wacky
+	 * "scatter-gather" stuff... we only have a single chunk
 	 * of data to send, so we declare a single vector entry.)
 	 */
 	v.iov_base = (char *)raw;
@@ -909,11 +909,11 @@
 
 	/*
 	 * Setting the interface is a bit more involved.
-	 * 
-	 * We have to create a "control message", and set that to 
+	 *
+	 * We have to create a "control message", and set that to
 	 * define the IPv6 packet information. We could set the
 	 * source address if we wanted, but we can safely let the
-	 * kernel decide what that should be. 
+	 * kernel decide what that should be.
 	 */
 	m.msg_control = control_buf;
 	m.msg_controllen = control_buf_len;
@@ -993,7 +993,7 @@
 	m.msg_namelen = sizeof(*from);
 
 	/*
-	 * Set the data buffer we're receiving. (Using this wacky 
+	 * Set the data buffer we're receiving. (Using this wacky
 	 * "scatter-gather" stuff... but we that doesn't really make
 	 * sense for us, so we use a single vector entry.)
 	 */
@@ -1005,8 +1005,8 @@
 	/*
 	 * Getting the interface is a bit more involved.
 	 *
-	 * We set up some space for a "control message". We have 
-	 * previously asked the kernel to give us packet 
+	 * We set up some space for a "control message". We have
+	 * previously asked the kernel to give us packet
 	 * information (when we initialized the interface), so we
 	 * should get the interface index from that.
 	 */
@@ -1018,19 +1018,19 @@
 	if (result >= 0) {
 		/*
 		 * If we did read successfully, then we need to loop
-		 * through the control messages we received and 
+		 * through the control messages we received and
 		 * find the one with our inteface index.
 		 */
 		cmsg = CMSG_FIRSTHDR(&m);
 		while (cmsg != NULL) {
-			if ((cmsg->cmsg_level == IPPROTO_IP) && 
+			if ((cmsg->cmsg_level == IPPROTO_IP) &&
 			 (cmsg->cmsg_type == IP_PKTINFO)) {
 				pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg);
 				ifindex = pktinfo->ipi_ifindex;
 				/*
-				 * We pass the ifindex back to the caller 
+				 * We pass the ifindex back to the caller
 				 * using the unused hfrom parameter avoiding
-				 * interface changes between sockets and 
+				 * interface changes between sockets and
 				 * the discover code.
 				 */
 				memcpy(hfrom->hbuf, &ifindex, sizeof(ifindex));
@@ -1062,9 +1062,9 @@
 #endif /* USE_SOCKET_RECEIVE */
 
 #ifdef DHCPv6
-ssize_t 
-receive_packet6(struct interface_info *interface, 
-		unsigned char *buf, size_t len, 
+ssize_t
+receive_packet6(struct interface_info *interface,
+		unsigned char *buf, size_t len,
 		struct sockaddr_in6 *from, struct in6_addr *to_addr,
 		unsigned int *if_idx)
 {
@@ -1100,7 +1100,7 @@
 	m.msg_namelen = sizeof(*from);
 
 	/*
-	 * Set the data buffer we're receiving. (Using this wacky 
+	 * Set the data buffer we're receiving. (Using this wacky
 	 * "scatter-gather" stuff... but we that doesn't really make
 	 * sense for us, so we use a single vector entry.)
 	 */
@@ -1112,8 +1112,8 @@
 	/*
 	 * Getting the interface is a bit more involved.
 	 *
-	 * We set up some space for a "control message". We have 
-	 * previously asked the kernel to give us packet 
+	 * We set up some space for a "control message". We have
+	 * previously asked the kernel to give us packet
 	 * information (when we initialized the interface), so we
 	 * should get the destination address from that.
 	 */
@@ -1125,12 +1125,12 @@
 	if (result >= 0) {
 		/*
 		 * If we did read successfully, then we need to loop
-		 * through the control messages we received and 
+		 * through the control messages we received and
 		 * find the one with our destination address.
 		 */
 		cmsg = CMSG_FIRSTHDR(&m);
 		while (cmsg != NULL) {
-			if ((cmsg->cmsg_level == IPPROTO_IPV6) && 
+			if ((cmsg->cmsg_level == IPPROTO_IPV6) &&
 			 (cmsg->cmsg_type == IPV6_PKTINFO)) {
 				pktinfo = (struct in6_pktinfo *)CMSG_DATA(cmsg);
 				*to_addr = pktinfo->ipi6_addr;
@@ -1230,7 +1230,7 @@
 		 (fbi -> shared_network ? "/" : ""),
 		 (fbi -> shared_network ?
 		 fbi -> shared_network -> name : ""));
-	
+
 		status = omapi_register_io_object ((omapi_object_t *)fbi,
 						 if_readsocket, 0,
 						 fallback_discard, 0, 0);

_service:tar_scm:dhcp-4.4.2.tar.gz/common/tables.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/tables.c Changed

@@ -3,7 +3,7 @@
 Tables of information... */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -86,7 +86,7 @@
 named enumeration. Named enumerations are tracked in parse.c.
 d - Domain name (e.g., FOO or FOO.BAR) no quotes,
 on-wire format is RFC 1035.
- D - Domain list (e.g., "example.com eng.example.com") quoted, 
+ D - Domain list (e.g., "example.com eng.example.com") quoted,
 on-wire format is RFC 1035.
 c - When following a 'D' atom, enables compression pointers.
 Z - Zero-length option
@@ -209,6 +209,9 @@
 	{ "pcode", "t",				&dhcp_universe, 100, 1 },
 	{ "tcode", "t",				&dhcp_universe, 101, 1 },
 #endif
+#if defined(RFC8925_OPTIONS)
+	{ "v6-only-preferred", "L",		&dhcp_universe, 108, 1 },
+#endif
 	{ "netinfo-server-address", "Ia",	&dhcp_universe, 112, 1 },
 	{ "netinfo-server-tag", "t",		&dhcp_universe, 113, 1 },
 	{ "default-url", "t",			&dhcp_universe, 114, 1 },

_service:tar_scm:dhcp-4.4.2.tar.gz/common/tests/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/tests/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -234,8 +234,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -291,6 +289,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -302,6 +302,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -642,7 +643,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/common/tests/option_unittest.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/tests/option_unittest.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018-2022 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
@@ -129,6 +129,89 @@
     }
 }
 
+ATF_TC(parse_X);
+
+ATF_TC_HEAD(parse_X, tc)
+{
+    atf_tc_set_md_var(tc, "descr",
+		      "Verify parse_X services 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_line0 = cfile->prev_line0 = 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 output10;
+    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 = {
+        0x01, 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 = {
+        0x01, 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
@@ -137,6 +220,7 @@
 {
     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());
 }

_service:tar_scm:dhcp-4.4.2.tar.gz/common/tr.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/tr.c Changed

@@ -4,7 +4,7 @@
 Contributed in May of 1999 by Andrew Chittenden */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -20,8 +20,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 */
@@ -152,7 +152,7 @@
 && llc->protid1 == 0
 && llc->protid2 == 0) {
 /* say there is source routing information present */
- trh->saddr0 |= TR_RII;	
+ trh->saddr0 |= TR_RII;
 }
 
 	if (trh->saddr0 & TR_RII)
@@ -199,7 +199,7 @@
 	/* single route broadcasts as per rfc 1042 */
 	if (memcmp(trh->daddr, tr_broadcast,TR_ALEN) == 0) {
 		trh->saddr0 |= TR_RII;
-		trh->rcf = ((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK; 
+		trh->rcf = ((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK;
 trh->rcf |= (TR_RCF_FRAME2K | TR_RCF_LIMITED_BROADCAST);
 		trh->rcf = htons(trh->rcf);
 	} else {
@@ -214,7 +214,7 @@
 if ((rover->rcf & TR_RCF_LEN_MASK) >> 8) {
 u_int16_t rcf = rover->rcf;
 				memcpy(trh->rseg,rover->rseg,sizeof(trh->rseg));
-				rcf ^= TR_RCF_DIR_BIT;	
+				rcf ^= TR_RCF_DIR_BIT;
 				rcf &= ~TR_RCF_BROADCAST_MASK;
 trh->rcf = htons(rcf);
 				trh->saddr0 |= TR_RII;
@@ -224,7 +224,7 @@
 /* we don't have any routing information so send a
 * limited broadcast */
 trh->saddr0 |= TR_RII;
- trh->rcf = ((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK; 
+ trh->rcf = ((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK;
 trh->rcf |= (TR_RCF_FRAME2K | TR_RCF_LIMITED_BROADCAST);
 trh->rcf = htons(trh->rcf);
 		}

_service:tar_scm:dhcp-4.4.2.tar.gz/common/tree.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/tree.c Changed

@@ -3,7 +3,7 @@
 Routines for manipulating parse trees... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -42,14 +42,14 @@
 #define DS_SPRINTF_SIZE 128
 
 /*
- * If we are using a data_string structure to hold a NUL-terminated 
- * ASCII string, this function can be used to append a printf-formatted 
+ * If we are using a data_string structure to hold a NUL-terminated
+ * ASCII string, this function can be used to append a printf-formatted
 * string to the end of it. The data_string structure will be resized to
 * be big enough to hold the new string.
 *
 * If the append works, then 1 is returned.
 *
- * If it is not possible to allocate a buffer big enough to hold the 
+ * If it is not possible to allocate a buffer big enough to hold the
 * new value, then the old data_string is unchanged, and 0 is returned.
 */
 int
@@ -81,7 +81,7 @@
 	cur_strlen = strlen((char *)ds->data);
 	max = ds->len - cur_strlen;
 
-	/* 
+	/*
 	 * Use vsnprintf(), which won't write past our space, but will
 	 * tell us how much space it wants.
 	 */
@@ -94,7 +94,7 @@
 	 * If our buffer is not big enough, we need a new buffer.
 	 */
 	if (vsnprintf_ret >= max) {
-		/* 
+		/*
 		 * Figure out a size big enough.
 		 */
 		new_len = ds->len * 2;
@@ -102,13 +102,13 @@
 			new_len *= 2;
 		}
 
-		/* 
+		/*
 		 * Create a new buffer and fill it.
 		 */
 		tmp_buffer = NULL;
 		if (!buffer_allocate(&tmp_buffer, new_len, MDL)) {
-			/* 
-			 * If we can't create a big enough buffer, 
+			/*
+			 * If we can't create a big enough buffer,
 			 * we should remove any truncated output that we had.
 			 */
 			*((char *)ds->data+cur_strlen) = '\0';
@@ -240,7 +240,7 @@
 				&nt -> data.const_data.buffer -> data 0;
 			memcpy (nt -> data.const_data.buffer -> data,
 				data, len + terminated);
-		} else 
+		} else
 			nt -> data.const_data.data = data;
 		nt -> data.const_data.terminated = terminated;
 	} else
@@ -282,13 +282,13 @@
 		expression_reference (expr, left, MDL);
 		return 1;
 	}
-			
+
 	/* Otherwise, allocate a new node to concatenate the two. */
 	if (!expression_allocate (expr, MDL)) {
 		log_error ("No memory for concatenation expression node.");
 		return 0;
 	}
-		
+
 	(*expr) -> op = expr_concat;
 	expression_reference (&(*expr) -> data.concat 0, left, MDL);
 	expression_reference (&(*expr) -> data.concat 1, right, MDL);
@@ -304,7 +304,7 @@
 		log_error ("No memory for encapsulation expression node.");
 		return 0;
 	}
-		
+
 	(*expr) -> op = expr_encapsulate;
 	data_string_copy (&(*expr) -> data.encapsulate, name, MDL);
 	return 1;
@@ -380,7 +380,7 @@
 {
 	if (!(executable_statement_allocate (result, MDL)))
 		return 0;
-	
+
 	(*result) -> op = let_statement;
 	(*result) -> data.let.name = dmalloc (strlen (name) + 1, MDL);
 	if (!(*result) -> data.let.name) {
@@ -390,7 +390,7 @@
 	strcpy ((*result) -> data.let.name, name);
 	return 1;
 }
-		
+
 static int do_host_lookup (result, dns)
 	struct data_string *result;
 	struct dns_host_entry *dns;
@@ -457,7 +457,7 @@
 	/* Count the number of addresses we got... */
 	for (count = 0; h -> h_addr_list count; count++)
 		;
-	
+
 	/* Dereference the old data, if any. */
 	data_string_forget (&dns -> data, MDL);
 
@@ -1571,8 +1571,8 @@
 					 result -> data, 20));
 #endif
 		return s0;
-			
-		
+
+
 	 case expr_encode_int16:
 		s0 = evaluate_numeric_expression (&len, packet, lease,
 						 client_state,
@@ -1994,7 +1994,7 @@
 				memchr (packet -> raw -> sname, 0,
 					sizeof packet -> raw -> sname);
 			if (!fn)
-				fn = ((char *)packet -> raw -> sname + 
+				fn = ((char *)packet -> raw -> sname +
 				 sizeof packet -> raw -> sname);
 			result -> len = fn - &packet -> raw -> sname 0;
 			if (buffer_allocate (&result -> buffer,
@@ -2080,7 +2080,7 @@
 
 		/* no number or an obviously invalid number */
 		if ((s0 == 0) ||
-		 ((len > 0) && 
+		 ((len > 0) &&
 		 ((packet == NULL) ||
 		 (packet->dhcpv6_container_packet == NULL)))) {
 #if defined (DEBUG_EXPRESSIONS)
@@ -2093,7 +2093,7 @@
 		i = len;
 		relay_packet = packet;
 		relay_options = in_options;
-		while ((i != 0) && 
+		while ((i != 0) &&
 		 (relay_packet->dhcpv6_container_packet != NULL)) {
 			relay_packet = relay_packet->dhcpv6_container_packet;
 			relay_options = relay_packet->options;
@@ -2224,7 +2224,7 @@
 
 	log_error ("Bogus opcode in evaluate_data_expression: %d", expr -> op);
 	return 0;
-}	
+}
 
 int evaluate_numeric_expression (result, packet, lease, client_state,
 				 in_options, cfg_options, scope, expr)
@@ -2377,7 +2377,7 @@
 			 (long unsigned)cur_time, *result);
 #endif
 		return (1);
- 
+
 	 case expr_variable_reference:
 		if (scope && *scope) {
 		 binding = find_binding (*scope, expr -> data.variable);
@@ -2793,7 +2793,7 @@
 	/* So that we can be called with option_lookup as an argument. */
 	if (!expr)
 		return 0;
-	
+
 	if (!evaluate_boolean_expression (&result, packet, lease, client_state,
 					 in_options, cfg_options,
 					 scope, expr))
@@ -2806,7 +2806,7 @@
 		*ignorep = 0;
 	return result;
 }
-		
+
 
 /* Dereference an expression node, and if the reference count goes to zero,
 dereference any data it refers to, and then free it. */
@@ -3318,7 +3318,7 @@
 	 case expr_none:
 		col = token_print_indent (file, col, indent, "", "", "null");
 		break;
-		
+
 	 case expr_check:
 		col = token_print_indent (file, col, indent, "", "", "check");
 		col = token_print_indent_concat (file, col, indent,
@@ -3483,7 +3483,7 @@
 		if (expr -> data.option -> universe != &dhcp_universe) {
 			col = token_print_indent (file, col, indent,
 						 " ", "",
-						 (expr -> data.option -> 
+						 (expr -> data.option ->
 						 universe -> name));
 			col = token_print_indent (file, col, indent, "", "",
 						 ".");
@@ -3495,7 +3495,7 @@
 		}
 		break;
 
-	 case expr_hardware:	
+	 case expr_hardware:
 		col = token_print_indent (file, col, indent, "", "",
 					 "hardware");
 		break;
@@ -3941,7 +3941,7 @@
 		else
 			*rv = lrhs;
 		return 1;
-			
+
 	 case expr_v6relay:
 		clhs = data_subexpression_length (&llhs,
 						 expr -> data.v6relay.relay);
@@ -4148,11 +4148,11 @@
 /*!
 * \brief Adds two Dc-formatted lists into a single Dc-formatted list
 *
- * Given two data_strings containing compressed lists, it constructs a 
+ * Given two data_strings containing compressed lists, it constructs a
 * third data_string containing a single compressed list:
 *
 * 1. Decompressing the first list into a buffer
- * 2. Decompressing the second list onto the end of the buffer 
+ * 2. Decompressing the second list onto the end of the buffer
 * 3. Compressing the buffer into the result
 *
 * If either list is empty, the result will be the equal to the compressed
@@ -4161,17 +4161,17 @@
 *
 * It relies on two functions to decompress and compress:
 *
- * - MRns_name_uncompress_list() - produces a null-terminated string of 
+ * - MRns_name_uncompress_list() - produces a null-terminated string of
 * comma-separated domain-names from a buffer containing "Dc" formatted
 * data
 *
 * - MRns_name_compress_list() - produces a buffer containing "Dc" formatted
 * data from a null-terminated string containing comma-separated domain-names
- * 
+ *
 * \param result data_string which will contain the combined list
 * in Dc format
- * \param list1 data_string containing first Dc formatted list 
- * \param list2 data_string containing second Dc formatted list 
+ * \param list1 data_string containing first Dc formatted list
+ * \param list2 data_string containing second Dc formatted list
 * \return 0 if there is an error, the length of the new list when successful
 */
 int concat_dclists (struct data_string* result,

_service:tar_scm:dhcp-4.4.2.tar.gz/common/upf.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/common/upf.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/configure -> _service:tar_scm:dhcp-4.4.3.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for DHCP 4.4.2.
+# Generated by GNU Autoconf 2.69 for DHCP 4.4.3.
 #
 # Report bugs to <dhcp-users@isc.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='DHCP'
 PACKAGE_TARNAME='dhcp'
-PACKAGE_VERSION='4.4.2'
-PACKAGE_STRING='DHCP 4.4.2'
+PACKAGE_VERSION='4.4.3'
+PACKAGE_STRING='DHCP 4.4.3'
 PACKAGE_BUGREPORT='dhcp-users@isc.org'
 PACKAGE_URL=''
 
@@ -694,6 +694,9 @@
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
+CSCOPE
+ETAGS
+CTAGS
 am__untar
 am__tar
 AMTAR
@@ -736,6 +739,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -848,6 +852,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1100,6 +1105,15 @@
 | -silent | --silent | --silen | --sile | --sil)
 silent=yes ;;
 
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 ac_prev=sbindir ;;
 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1237,7 +1251,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
 eval ac_val=\$$ac_var
 # Remove trailing slashes.
@@ -1350,7 +1364,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures DHCP 4.4.2 to adapt to many kinds of systems.
+\`configure' configures DHCP 4.4.3 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1390,6 +1404,7 @@
 --sysconfdir=DIR read-only single-machine data PREFIX/etc
 --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com
 --localstatedir=DIR modifiable single-machine data PREFIX/var
+ --runstatedir=DIR modifiable per-process data LOCALSTATEDIR/run
 --libdir=DIR object code libraries EPREFIX/lib
 --includedir=DIR C header files PREFIX/include
 --oldincludedir=DIR C header files for non-gcc /usr/include
@@ -1420,7 +1435,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of DHCP 4.4.2:";;
+ short | recursive ) echo "Configuration of DHCP 4.4.3:";;
 esac
 cat <<\_ACEOF
 
@@ -1591,7 +1606,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-DHCP configure 4.4.2
+DHCP configure 4.4.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2384,7 +2399,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by DHCP $as_me 4.4.2, which was
+It was created by DHCP $as_me 4.4.3, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
@@ -2941,12 +2956,7 @@
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\	*)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- *)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
- esac
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -3251,7 +3261,7 @@
 
 # Define the identity of the package.
 PACKAGE='dhcp'
- VERSION='4.4.2'
+ VERSION='4.4.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3301,6 +3311,20 @@
 
 
 
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+ CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+ ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+ CSCOPE=cscope
+fi
+
+
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -6762,7 +6786,7 @@
 	LIBS="-lrt $LIBS"
 fi
 
-# check for /dev/random (declares HAVE_DEV_RANDOM)
+# check for /dev/random (declares ISC_PATH_RANDOMDEV)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for random device" >&5
 $as_echo_n "checking for random device... " >&6; }
 
@@ -6813,7 +6837,9 @@
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
 
-$as_echo "#define HAVE_DEV_RANDOM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ISC_PATH_RANDOMDEV "$use_randomdev"
+_ACEOF
 
 else
 as_fn_error $? "cannot find $use_randomdev" "$LINENO" 5
@@ -8093,7 +8119,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by DHCP $as_me 4.4.2, which was
+This file was extended by DHCP $as_me 4.4.3, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -8159,7 +8185,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-DHCP config.status 4.4.2
+DHCP config.status 4.4.3
 configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
@@ -8949,7 +8975,9 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
 '--disable-dependency-tracking' option to at least be able to build
 the package (albeit without support for automatic dependency tracking).
 See \`config.log' for more details" "$LINENO" 5; }

_service:tar_scm:dhcp-4.4.2.tar.gz/configure.ac -> _service:tar_scm:dhcp-4.4.3.tar.gz/configure.ac Changed

@@ -1,4 +1,4 @@
-AC_INIT(DHCP,4.4.2,dhcp-users@isc.org)
+AC_INIT(DHCP,4.4.3,dhcp-users@isc.org)
 
 
 # we specify "foreign" to avoid having to have the GNU mandated files,
@@ -170,7 +170,7 @@
 	if test "$enable_dhcpv6" = "no"; then
 		AC_MSG_ERROR(dhcpv4o6 requires dhcpv6)
 	fi
-	AC_DEFINE(DHCP4o6, 1, 
+	AC_DEFINE(DHCP4o6, 1,
 		  Define to 1 to include DHCPv4 over DHCPv6 support.)
 else
     # so we can report below
@@ -629,7 +629,7 @@
 	LIBS="-lrt $LIBS"
 fi
 
-# check for /dev/random (declares HAVE_DEV_RANDOM)
+# check for /dev/random (declares ISC_PATH_RANDOMDEV)
 AC_MSG_CHECKING(for random device)
 AC_ARG_WITH(randomdev,
 	AS_HELP_STRING(--with-randomdev=PATH,Path for random device
@@ -653,8 +653,8 @@
 	else
 		AC_MSG_RESULT($use_randomdev)
 		AC_CHECK_FILE($use_randomdev,
-		    AC_DEFINE(HAVE_DEV_RANDOM, 1, 
-			Define to 1 if you have the /dev/random or other configured file.),
+		    AC_DEFINE_UNQUOTED(ISC_PATH_RANDOMDEV, "$use_randomdev",
+			Define if you have the /dev/random or other configured file.),
 		    AC_MSG_ERROR(cannot find $use_randomdev))
 	fi
 	BINDCONFIG="$BINDCONFIG --with-randomdev=$use_randomdev"
@@ -806,7 +806,7 @@
 	BINDLIBIRSDIR="$BINDDIR/lib"
 	BINDLIBDNSDIR="$BINDDIR/lib"
 	BINDLIBISCCFGDIR="$BINDDIR/lib"
-	BINDLIBISCDIR="$BINDDIR/lib"	
+	BINDLIBISCDIR="$BINDDIR/lib"
 	DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
 	;;
 esac

_service:tar_scm:dhcp-4.4.2.tar.gz/configure.ac+lt -> _service:tar_scm:dhcp-4.4.3.tar.gz/configure.ac+lt Changed

@@ -1,4 +1,4 @@
-AC_INIT(DHCP,4.4.2,dhcp-users@isc.org)
+AC_INIT(DHCP,4.4.3,dhcp-users@isc.org)
 
 # for libtool
 AC_CONFIG_MACRO_DIR(m4)
@@ -171,7 +171,7 @@
 	if test "$enable_dhcpv6" = "no"; then
 		AC_MSG_ERROR(dhcpv4o6 requires dhcpv6)
 	fi
-	AC_DEFINE(DHCP4o6, 1, 
+	AC_DEFINE(DHCP4o6, 1,
 		  Define to 1 to include DHCPv4 over DHCPv6 support.)
 else
     # so we can report below
@@ -630,7 +630,7 @@
 	LIBS="-lrt $LIBS"
 fi
 
-# check for /dev/random (declares HAVE_DEV_RANDOM)
+# check for /dev/random (declares ISC_PATH_RANDOMDEV)
 AC_MSG_CHECKING(for random device)
 AC_ARG_WITH(randomdev,
 	AS_HELP_STRING(--with-randomdev=PATH,Path for random device
@@ -654,8 +654,8 @@
 	else
 		AC_MSG_RESULT($use_randomdev)
 		AC_CHECK_FILE($use_randomdev,
-		    AC_DEFINE(HAVE_DEV_RANDOM, 1, 
-			Define to 1 if you have the /dev/random or other configured file.),
+		    AC_DEFINE_UNQUOTED(ISC_PATH_RANDOMDEV, "$use_randomdev",
+			Define if you have the /dev/random or other configured file.),
 		    AC_MSG_ERROR(cannot find $use_randomdev))
 	fi
 	BINDCONFIG="$BINDCONFIG --with-randomdev=$use_randomdev"
@@ -807,7 +807,7 @@
 	BINDLIBIRSDIR="$BINDDIR/lib"
 	BINDLIBDNSDIR="$BINDDIR/lib"
 	BINDLIBISCCFGDIR="$BINDDIR/lib"
-	BINDLIBISCDIR="$BINDDIR/lib"	
+	BINDLIBISCDIR="$BINDDIR/lib"
 	DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
 	;;
 esac

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/Makefile.am -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/Makefile.am Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/Makefile.am.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/Makefile.am.in Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -90,7 +90,7 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = omshell$(EXEEXT)
-noinst_PROGRAMS = cltest$(EXEEXT)
+noinst_PROGRAMS = cltest$(EXEEXT) cltest2$(EXEEXT)
 subdir = dhcpctl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -148,6 +148,12 @@
 	../omapip/libomapi.a $(BINDLIBIRSDIR)/libirs.a \
 	$(BINDLIBDNSDIR)/libdns.a $(BINDLIBISCCFGDIR)/libisccfg.a \
 	$(BINDLIBISCDIR)/libisc.a
+am_cltest2_OBJECTS = cltest2.$(OBJEXT)
+cltest2_OBJECTS = $(am_cltest2_OBJECTS)
+cltest2_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \
+	../omapip/libomapi.a $(BINDLIBIRSDIR)/libirs.a \
+	$(BINDLIBDNSDIR)/libdns.a $(BINDLIBISCCFGDIR)/libisccfg.a \
+	$(BINDLIBISCDIR)/libisc.a
 am_omshell_OBJECTS = omshell.$(OBJEXT)
 omshell_OBJECTS = $(am_omshell_OBJECTS)
 omshell_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \
@@ -170,8 +176,8 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/callback.Po ./$(DEPDIR)/cltest.Po \
-	./$(DEPDIR)/dhcpctl.Po ./$(DEPDIR)/omshell.Po \
-	./$(DEPDIR)/remote.Po
+	./$(DEPDIR)/cltest2.Po ./$(DEPDIR)/dhcpctl.Po \
+	./$(DEPDIR)/omshell.Po ./$(DEPDIR)/remote.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -185,9 +191,10 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libdhcpctl_a_SOURCES) $(cltest_SOURCES) $(omshell_SOURCES)
-DIST_SOURCES = $(libdhcpctl_a_SOURCES) $(cltest_SOURCES) \
+SOURCES = $(libdhcpctl_a_SOURCES) $(cltest_SOURCES) $(cltest2_SOURCES) \
 	$(omshell_SOURCES)
+DIST_SOURCES = $(libdhcpctl_a_SOURCES) $(cltest_SOURCES) \
+	$(cltest2_SOURCES) $(omshell_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -214,8 +221,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.am.in $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -246,6 +251,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -257,6 +264,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -360,6 +368,13 @@
 	       $(BINDLIBISCCFGDIR)/libisccfg.a \
 	       $(BINDLIBISCDIR)/libisc.a
 
+cltest2_SOURCES = cltest2.c
+cltest2_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+	       $(BINDLIBIRSDIR)/libirs.a \
+	       $(BINDLIBDNSDIR)/libdns.a \
+	       $(BINDLIBISCCFGDIR)/libisccfg.a \
+	       $(BINDLIBISCDIR)/libisc.a
+
 all: all-am
 
 .SUFFIXES:
@@ -481,6 +496,10 @@
 	@rm -f cltest$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(cltest_OBJECTS) $(cltest_LDADD) $(LIBS)
 
+cltest2$(EXEEXT): $(cltest2_OBJECTS) $(cltest2_DEPENDENCIES) $(EXTRA_cltest2_DEPENDENCIES) 
+	@rm -f cltest2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(cltest2_OBJECTS) $(cltest2_LDADD) $(LIBS)
+
 omshell$(EXEEXT): $(omshell_OBJECTS) $(omshell_DEPENDENCIES) $(EXTRA_omshell_DEPENDENCIES) 
 	@rm -f omshell$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(omshell_OBJECTS) $(omshell_LDADD) $(LIBS)
@@ -493,6 +512,7 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callback.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cltest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cltest2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dhcpctl.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omshell.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote.Po@am__quote@ # am--include-marker
@@ -654,7 +674,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -733,6 +752,7 @@
 distclean: distclean-am
 		-rm -f ./$(DEPDIR)/callback.Po
 	-rm -f ./$(DEPDIR)/cltest.Po
+	-rm -f ./$(DEPDIR)/cltest2.Po
 	-rm -f ./$(DEPDIR)/dhcpctl.Po
 	-rm -f ./$(DEPDIR)/omshell.Po
 	-rm -f ./$(DEPDIR)/remote.Po
@@ -783,6 +803,7 @@
 maintainer-clean: maintainer-clean-am
 		-rm -f ./$(DEPDIR)/callback.Po
 	-rm -f ./$(DEPDIR)/cltest.Po
+	-rm -f ./$(DEPDIR)/cltest2.Po
 	-rm -f ./$(DEPDIR)/dhcpctl.Po
 	-rm -f ./$(DEPDIR)/omshell.Po
 	-rm -f ./$(DEPDIR)/remote.Po

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/callback.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/callback.c Changed

@@ -3,7 +3,7 @@
 The dhcpctl callback object. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -66,7 +66,7 @@
 	omapi_object_reference (&callback -> object, h, MDL);
 	callback -> data = data;
 	callback -> callback = func;
-	
+
 	return ISC_R_SUCCESS;
 }
 
@@ -93,7 +93,7 @@
 {
 	if (h -> type != dhcpctl_callback_type)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
 			(h -> inner, id, name, value);
@@ -159,4 +159,3 @@
 								p -> inner);
 	return ISC_R_SUCCESS;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/cltest.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/cltest.c Changed

_service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/cltest2.c Added

@@ -0,0 +1,310 @@
+/* cltest2.c
+
+ Example program that uses the dhcpctl library. */
+
+/*
+ * Copyright (C) 2020-2022 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/
+ *
+ * This software was contributed to Internet Systems Consortium
+ * by Brian Murrell.
+ */
+
+#include "config.h"
+
+#include <time.h>
+#include <sys/time.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include "omapip/result.h"
+#include "dhcpctl.h"
+#include "dhcpd.h"
+
+int main (int, char **);
+
+static void usage (char *s) {
+	fprintf (stderr,
+		 "Usage: %s -s <server ip> -p <port>", s);
+	exit (1);
+}
+
+static void fail_on_error(isc_result_t status, const char* message) {
+	if (status != ISC_R_SUCCESS) {
+		fprintf (stderr, "%s: %s\n",
+			 message, isc_result_totext (status));
+		exit (1);
+	}
+}
+
+isc_result_t wait_with_retry(dhcpctl_handle handle, struct timeval* timeout, int retries);
+
+void print_object(char *msg, dhcpctl_handle handle);
+
+/* Simple test program that exercises dhcpctl calls as follows:
+ *
+ * 1. Connect to the given server
+ * 2. Create a local host object with hostname "cltest2.host"
+ * 3. Attempt to open the remote host object
+ * 4. If the host does not exist, add a client id and create it
+ * 5. Disconnect
+ * 6. Reconnect
+ * 7. Refresh the host object
+ * 8. Disconnect
+ * 9. Time connect
+ * 10. Time connect retry
+ *
+ * Note that this program tests dhcpctl_timed_wait_for_completion() by calling
+ * it with extremely small timeouts.
+*/
+
+int main (argc, argv)
+	int argc;
+	char **argv;
+{
+	isc_result_t status;
+	dhcpctl_handle connection;
+	dhcpctl_handle host;
+ char* ip_address = "127.0.0.1";
+ int port = 7911;
+ char* hostname = "cltest2.host";
+ struct timeval timeout;
+	int i;
+
+	for (i = 1; i < argc; i++) {
+		if (!strcmp (argvi, "-s")) {
+ ip_address = argvi;
+		} else if (!strcmp (argv i, "-p")) {
+ port=atoi(argvi);
+		} else if (argvi0 == '-') {
+			usage(argv0);
+		}
+	}
+
+ /* Initialize dhcpctl */
+	status = dhcpctl_initialize ();
+	fail_on_error(status ,"can't initialize dhcpctl");
+
+ /* Connect */
+	connection = 0;
+	status = dhcpctl_connect (&connection, ip_address, port, 0);
+	fail_on_error(status ,"connect failed");
+
+ /* Create the host object */
+	host = 0;
+	status = dhcpctl_new_object (&host, connection, "host");
+	fail_on_error(status ,"new oject failed");
+
+	status = dhcpctl_set_string_value (host, hostname, "name");
+	fail_on_error(status ,"cant set host name");
+
+ /* Attempt to open the object */
+	status = dhcpctl_open_object (host, connection, 0);
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 20;
+ status = wait_with_retry(host, &timeout, 2);
+ switch (status) {
+ case ISC_R_NOTFOUND:
+ /* Host doesn't exist add it. We set an id so the create will be valid. */
+	 status = dhcpctl_set_string_value (host, "abcdefg", "dhcp-client-identifier");
+	 fail_on_error(status ,"can't set client id");
+
+		 status = dhcpctl_open_object (host, connection,
+					 DHCPCTL_CREATE | DHCPCTL_EXCL);
+		 fail_on_error(status, "open(create) failed");
+
+ status = wait_with_retry(host, &timeout, 2);
+		 fail_on_error(status, "wait after open(create)");
+
+ print_object("Host created", host);
+ break;
+
+ case ISC_R_SUCCESS:
+ print_object("Host exists", host);
+ break;
+
+ default:
+	 fail_on_error(status, "initial open failed, waiting for completion");
+ break;
+ }
+
+	/* Now we'll test disconnect */
+	status = dhcpctl_disconnect(&connection, 0);
+	fail_on_error(status, "can't disconnect");
+
+ /* Reconnect */
+	status = dhcpctl_connect (&connection, ip_address, port, 0);
+	fail_on_error(status ,"can't reconnect");
+
+ /* Refresh the object */
+ status = dhcpctl_object_refresh (connection, host);
+ fail_on_error(status , "can't refresh");
+
+ status = wait_with_retry(host, &timeout, 2);
+ fail_on_error(status , "wait after refresh failed");
+
+ print_object("After reconnect/refresh", host);
+
+	/* Now we'll disconnect */
+	status = dhcpctl_disconnect(&connection, 0);
+	fail_on_error(status, "can't disconnect");
+
+ /* Try a timed connect */
+ timeout.tv_sec = 0;
+ timeout.tv_usec = 1;
+	status = dhcpctl_timed_connect (&connection, ip_address, port, 0, &timeout);
+
+ /* Try again if we time out */
+ if (status == ISC_R_TIMEDOUT) {
+ printf ("Retry timed connect\n");
+ timeout.tv_sec = 10;
+	 status = dhcpctl_timed_connect (&connection, ip_address, port, 0,
+ &timeout);
+ }
+
+ fail_on_error(status ,"can't reconnect");
+
+ /* Lastly we'll disconnect to clean up */
+	status = dhcpctl_disconnect(&connection, 0);
+ fail_on_error(status ,"can't disconnect");
+
+	exit (0);
+}
+
+/* Function to call and optionally retry dhcp_timed_wait_for_completion() */
+isc_result_t wait_with_retry(dhcpctl_handle handle, struct timeval* timeout, int retries) {
+	isc_result_t status;
+	isc_result_t waitstatus;
+ struct timeval use_timeout;
+
+ if (timeout) {
+ use_timeout.tv_sec = timeout->tv_sec;
+ use_timeout.tv_usec = timeout->tv_usec;
+ } else {
+ retries = 0;
+ }
+
+ int tries = 0;
+ do {
+ if (tries++) {
+ printf ("wait retry #%d\n", tries);
+ /* Set the timeout value to 30 secs */
+ use_timeout.tv_sec = 30;
+ use_timeout.tv_usec = 0;
+ }
+
+ // Call timed wait.
+	 status = dhcpctl_timed_wait_for_completion (handle, &waitstatus,
+ (timeout ? &use_timeout: 0));
+ if (status == ISC_R_SUCCESS) {
+ return(waitstatus);
+ }
+
+ if (status != ISC_R_TIMEDOUT) {
+ fprintf (stderr, "timed wait failed: %s\n", isc_result_totext (status));
+ exit (1);
+ }
+ } while (--retries > 0);
+
+ return (ISC_R_TIMEDOUT);
+}
+
+/* Function to print out the values contained in an object. Largely
+ * stolen from omshell.c */
+void print_object(char* msg, dhcpctl_handle handle) {
+ dhcpctl_remote_object_t *r = (dhcpctl_remote_object_t *)handle;
+ omapi_generic_object_t *object = (omapi_generic_object_t *)(r->inner);
+ char hex_buf4096;
+ int i;
+
+ printf ("%s:\n",msg);
+ for (i = 0; i < object->nvalues; i++) {
+ omapi_value_t *v = object->valuesi;
+
+ if (!object->valuesi)
+ continue;
+
+ printf ("\t%.*s = ", (int)v->name->len, v->name->value);
+
+ if (!v->value) {
+ printf ("<null>\n");
+ continue;
+ }
+
+ switch (v->value->type) {
+ case omapi_datatype_int:
+ printf ("%d\n", v->value->u.integer);
+ break;
+
+ case omapi_datatype_string:
+ printf ("\"%.*s\"\n", (int)v->value->u.buffer.len,
+ v->value->u.buffer.value);
+ break;
+
+ case omapi_datatype_data:
+ print_hex_or_string(v->value->u.buffer.len,
+						 v->value->u.buffer.value,
+ sizeof(hex_buf), hex_buf);
+ printf("%s\n", hex_buf);
+ break;
+
+ case omapi_datatype_object:
+ printf ("<obj>\n");
+ break;
+ }
+ }
+}
+
+/* Dummy functions to appease linker */
+isc_result_t find_class (struct class **c, const char *n, const char *f, int l)
+{
+	return 0;
+}
+int parse_allow_deny (struct option_cache **oc, struct parse *cfile, int flag)
+{
+	return 0;
+}
+void dhcp (struct packet *packet) { }
+void bootp (struct packet *packet) { }
+
+#ifdef DHCPv6
+void dhcpv6(struct packet *packet) { }
+
+#ifdef DHCP4o6
+isc_result_t dhcpv4o6_handler(omapi_object_t *h)
+{
+	return ISC_R_NOTIMPLEMENTED;
+}
+#endif /* DHCP4o6 */
+#endif /* DHCPv6 */
+
+int check_collection (struct packet *p, struct lease *l, struct collection *c)
+{
+	return 0;
+}
+void classify (struct packet *packet, struct class *class) { }
+
+isc_result_t dhcp_set_control_state (control_object_state_t oldstate,
+				 control_object_state_t newstate)
+{
+	return ISC_R_SUCCESS;
+}
+

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/dhcpctl.3 -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/dhcpctl.3 Changed

@@ -3,9 +3,8 @@
 .\" Project: DHCP
 .\" File: dhcpctl.3
 .\" RCSId: $Id: dhcpctl.3,v 1.9 2011/04/25 23:43:16 sar Exp $
-.\" 
-.\" Copyright (c) 2011,2014 by Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+.\"
+.\" Copyright (c) 2004-2022 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2000-2003 by Internet Software Consortium
 .\" Copyright (c) 2000 Nominum, Inc.
 .\"
@@ -22,13 +21,13 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
-.\" 
+.\"
 .\" Description:	dhcpctl man page.
-.\" 
+.\"
 .\"
 .Dd Nov 15, 2000
 .Dt DHCPCTL 3
@@ -61,6 +60,25 @@
 .\"
 .\"
 .Ft dhcpctl_status
+.Fo dhcpctl_timed_connect
+.Fa "dhcpctl_handle *cxn"
+.Fa "const char *host"
+.Fa "int port"
+.Fa "dhcpctl_handle auth"
+.Fa "dhcpctl_status *status"
+.Fc
+.\"
+.\"
+.\"
+.Ft dhcpctl_status
+.Fo dhcpctl_disconnect
+.Fa "dhcpctl_handle *cxn"
+.Fa "int force"
+.Fc
+.\"
+.\"
+.\"
+.Ft dhcpctl_status
 .Fo dhcpctl_wait_for_completion
 .Fa "dhcpctl_handle object"
 .Fa "dhcpctl_status *status"
@@ -69,6 +87,15 @@
 .\"
 .\"
 .Ft dhcpctl_status
+.Fo dhcpctl_timed_wait_for_completion
+.Fa "dhcpctl_handle object"
+.Fa "dhcpctl_status *status"
+.Fa "struct timeval *timeout"
+.Fc
+.\"
+.\"
+.\"
+.Ft dhcpctl_status
 .Fo dhcpctl_get_value
 .Fa "dhcpctl_data_string *value"
 .Fa "dhcpctl_handle object"
@@ -207,8 +234,8 @@
 The return values reflects the result of operations to local data
 structures. If an operation fails on the server for any reason, then the error
 result will be returned through the
-second parameter of the 
-.Fn dhcpctl_wait_for_completion 
+second parameter of the
+.Fn dhcpctl_wait_for_completion
 call.
 .\"
 .\"
@@ -235,19 +262,66 @@
 .\"
 .\"
 .Pp
+.Fn dhcpctl_timed_connect
+opens a connection to the DHCP server at the given host and port. If an
+authenticator has been created for the connection, then it is given as the 4th
+argument. On a successful return the address pointed at by the first
+argument will have a new connection object assigned to it.
+How long the function waits for complete the connection is dictated by the value
+of the parameter, \fBtimeout\fR. If the value is null, it will wait indefinitely
+Otherwise it will wait for the amount of time specified by \fBtimeout\fR
+(tv_sec:tv_usec). Values of zero for both fields are valid but not recommended.
+An example is shown below:
+.Pp
+For example:
+.Bd -literal -offset indent
+struct timeval timeout;
+timeout.tv_sec = 5; /* wait for 5 seconds */
+timeout.tv_usec = 0;
+
+s = dhcpctl_connect(&cxn, "127.0.0.1", 7911, NULL, &timeout);
+.Ed
+.Pp
+connects to the DHCP server on the localhost via port 7911 (the standard
+OMAPI port). No authentication is used for the connection. It allows
+5 seconds for the connect to complete.
+.\"
+.\"
+.\"
+.Pp
+.Fn dhcpctl_disconnect
+closes the open connection specified by the first parameter, \fBcxn\fR. Note
+that this call will free the connection object and \fBcxn\fR will be set to
+ nul. If the second parameter,\fBforce\fR, is nonzero, the connection will be
+closed immediately. Otherwise the receiving end will be shut down but any
+unsent data will be sent before actually closing the socket. Note that
+disconnecting only destroys the connection object, any other objects previously
+created will still exist.
+.Pp
+For example:
+.Bd -literal -offset indent
+s = dhcpctl_disconnect(&cxn, 1);
+.Ed
+.Pp
+will close the connection immediately. This funcion should be considered
+\fBEXPERIMENTAL\fR.
+.\"
+.\"
+.\"
+.Pp
 .Fn dhcpctl_wait_for_completion
 flushes a pending message to the server and waits for the response. The result
 of the request as processed on the server is returned via the second
 parameter.
 .Bd -literal -offset indent
 s = dhcpctl_wait_for_completion(cxn, &wv);
-if (s != ISC_R_SUCCESS) 
+if (s != ISC_R_SUCCESS)
 	local_failure(s);
 else if (wv != ISC_R_SUCCESS)
 	server_failure(wc);
 .Ed
 .Pp
-The call to 
+The call to
 .Fn dhcpctl_wait_for_completion
 won't return until the remote message processing completes or the connection
 to the server is lost.
@@ -255,6 +329,43 @@
 .\"
 .\"
 .Pp
+
+.Fn dhcpctl_timed_wait_for_completion
+flushes a pending message to the server and waits for the response. How long
+the function waits for a response is dictated by the value of the third
+parameter, \fBtimeout\fR. If the value is null, it will wait indefinitely or
+until the connection is lost. Otherwise it will wait for the amount of time
+specified by \fBtimeout\fR (tv_sec:tv_usec). Values of zero for both fields
+are valid but not recommended. The result of the request as processed on the
+server is returned via the second parameter. An example is shown below:
+.Bd -literal -offset indent
+
+struct timeval timeout;
+timeout.tv_sec = 5; /* wait for 5 seconds */
+timeout.tv_usec = 0;
+
+s = dhcpctl_wait_for_completion(cxn, &wv, &timeout);
+if (s != ISC_R_SUCCESS) {
+	local_failure(s);
+} else if (wv != ISC_R_SUCCESS) {
+	server_failure(wc);
+}
+.Ed
+.Pp
+If the function times out, the status returned will be ISC_R_TIMEDOUT. Please
+note that even though the function is no longer waiting for a response, the
+server does not abandon the request and may still respond by writing the
+response to the socket. A subsequent call to either this function or
+\fBdhcpctl_wait_for_completion()\fR will see that data and read it. Depending
+on the application logic flow this may or may not be desired. Currently though
+only mechanism for "flushing" this data is to close the connection by calling
+\fBdisconnet()\fR, and then reconnecting via \fBconnect()\fR. Please note
+this function should be considered \fBEXPERIMENTAL\fR.
+
+.\"
+.\"
+.\"
+.Pp
 .Fn dhcpctl_get_value
 extracts a value of an attribute from the handle. The value can be of any
 length and is treated as a sequence of bytes. The handle must have been
@@ -290,7 +401,7 @@
 .Fn dhcpctl_set_boolean_value ,
 and
 .Fn dhcpctl_set_int_value
-functions all set a value on the object handle. 
+functions all set a value on the object handle.
 .\"
 .\"
 .\"
@@ -319,7 +430,7 @@
 .\"
 .\"
 .Pp
-The 
+The
 .Fn dhcpctl_set_callback
 function sets up a user-defined function to be called when an event completes
 on the given object handle. This is needed for asynchronous handling of
@@ -327,23 +438,23 @@
 .Fn dhcpctl_wait_for_completion .
 When the function is called the first parameter is the object the event
 arrived for, the second is the status of the message that was processed, the
-third is the same value as the second parameter given to 
+third is the same value as the second parameter given to
 .Fn dhcpctl_set_callback .
 .\"
 .\"
 .\"
 .Pp
-The 
+The
 .Fn dhcpctl_new_authenticator
 creates a new authenticator object to be used for signing the messages
-that cross over the network. The 
+that cross over the network. The
 .Dq name ,
 .Dq algorithm ,
-and 
+and
 .Dq secret
 values must all match what the server uses and are defined in its
 configuration file. The created object is returned through the first parameter
-and must be used as the 4th parameter to 
+and must be used as the 4th parameter to
 .Fn dhcpctl_connect .
 Note that the 'secret' value must not be base64 encoded, which is different
 from how the value appears in the dhcpd.conf file.
@@ -352,11 +463,11 @@
 .\"
 .Pp
 .Fn dhcpctl_new_object
-creates a local handle for an object on the server. The 
+creates a local handle for an object on the server. The
 .Dq object_type
-parameter is the ascii name of the type of object being accessed. e.g. 
+parameter is the ascii name of the type of object being accessed. e.g.
 .Qq lease .
-This function only sets up local data structures, it does not queue any 
+This function only sets up local data structures, it does not queue any
 messages
 to be sent to the remote side,
 .Fn dhcpctl_open_object
@@ -385,22 +496,22 @@
 .\"
 .\"
 .Pp
-The 
+The
 .Fn omapi_data_string_new
 function allocates a new
 .Ft dhcpctl_data_string
-object. The data string will be large enough to hold 
+object. The data string will be large enough to hold
 .Dq length
 bytes of data. The
-.Dq file 
+.Dq file
 and
 .Dq lineno
 arguments are the source file location the call is made from, typically by
-using the 
+using the
 .Dv __FILE__
 and
 .Dv __LINE__
-macros or the 
+macros or the
 .Dv MDL
 macro defined in
 .
@@ -414,11 +525,11 @@
 The memory for the object won't be freed until the last reference is
 released.
 .Sh EXAMPLES
-.Pp 
+.Pp
 The following program will connect to the DHCP server running on the local
 host and will get the details of the existing lease for IP address
 10.0.0.101. It will then print out the time the lease is due to expire. Note
-that most error checking has been omitted for brevity. 
+that most error checking has been omitted for brevity.
 .Bd -literal -offset indent
 #include <sys/time.h>
 #include <stdio.h>
@@ -446,7 +557,7 @@
 
 dhcpctl_connect (&connection, "127.0.0.1",
 			 7911, 0);
-	
+
 dhcpctl_new_object (&lease, connection,
 			 "lease");
 
@@ -492,4 +603,3 @@
 is maintained by ISC. To learn more about Internet Systems Consortium,
 see
 .B https://www.isc.org
-

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/dhcpctl.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/dhcpctl.c Changed

@@ -3,7 +3,7 @@
 Subroutines providing general support for objects. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -29,6 +29,9 @@
 #include "dhcpd.h"
 #include <omapip/omapip_p.h>
 #include "dhcpctl.h"
+#include <sys/time.h>
+
+/* #define DEBUG_DHCPCTL 1 */
 
 omapi_object_type_t *dhcpctl_callback_type;
 omapi_object_type_t *dhcpctl_remote_type;
@@ -86,7 +89,7 @@
 synchronous
 returns nonzero status code if it didn't connect, zero otherwise
 stores connection handle through connection, which can be used
- for subsequent access to the specified server. 
+ for subsequent access to the specified server.
 server_name is the name of the server, and port is the TCP
 port on which it is listening.
 authinfo is the handle to an object containing authentication
@@ -97,6 +100,9 @@
 				dhcpctl_handle authinfo)
 {
 	isc_result_t status;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_connect(%s:%d)", server_name, port);
+#endif
 
 	status = omapi_generic_new (connection, MDL);
 	if (status != ISC_R_SUCCESS) {
@@ -105,19 +111,88 @@
 
 	status = omapi_protocol_connect (*connection, server_name,
 					 (unsigned)port, authinfo);
-	if (status == ISC_R_SUCCESS)
+	if (status == ISC_R_SUCCESS) {
+#ifdef DEBUG_DHCPCTL
+		log_debug("dhcpctl_connect success");
+#endif
 		return status;
+	}
+
 	if (status != DHCP_R_INCOMPLETE) {
 		omapi_object_dereference (connection, MDL);
+#ifdef DEBUG_DHCPCTL
+		log_debug("dhcpctl_connect failed:%s",
+			 isc_result_totext (status));
+#endif
 		return status;
 	}
 
 	status = omapi_wait_for_completion (*connection, 0);
 	if (status != ISC_R_SUCCESS) {
 		omapi_object_dereference (connection, MDL);
+#ifdef DEBUG_DHCPCTL
+		log_debug("dhcpctl_connect, wait failed:%s",
+			 isc_result_totext (status));
+#endif
 		return status;
 	}
 
+#ifdef DEBUG_DHCPCTL
+		log_debug("dhcpctl_connect success");
+#endif
+	return status;
+}
+
+/* dhcpctl_timed_connect
+
+ synchronous
+ returns nonzero status code if it didn't connect, zero otherwise
+ stores connection handle through connection, which can be used
+ for subsequent access to the specified server.
+ server_name is the name of the server, and port is the TCP
+ port on which it is listening.
+ authinfo is the handle to an object containing authentication
+ information.
+ How long the function waits for the connection to complete is
+ dictated by the value of the parameter, t. If the value is nul,
+ it will wait indefinitely. Otherwise it will wait for the amount
+ of time specified by t (tv_sec:tv_usec). Values of zero for both
+ fields are valid but not recommended. */
+dhcpctl_status dhcpctl_timed_connect (dhcpctl_handle *connection,
+				 const char *server_name, int port,
+				 dhcpctl_handle authinfo,
+				 struct timeval *t)
+{
+	isc_result_t status;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_timed_connect(%s:%d)", server_name, port);
+#endif
+	status = omapi_generic_new (connection, MDL);
+	if (status != ISC_R_SUCCESS) {
+		return status;
+	}
+
+	status = omapi_protocol_connect (*connection, server_name,
+					 (unsigned)port, authinfo);
+
+	if (status == ISC_R_SUCCESS) {
+		return status;
+	}
+
+	if (status == DHCP_R_INCOMPLETE) {
+		isc_result_t wait_status = ISC_R_SUCCESS;
+
+		/* Wait for it to complete */
+		status = dhcpctl_timed_wait_for_completion(*connection,
+							 &wait_status, t);
+		if (status == ISC_R_SUCCESS) {
+			status = wait_status;
+		}
+	}
+
+	if (status != ISC_R_SUCCESS) {
+		omapi_object_dereference (connection, MDL);
+	}
 	return status;
 }
 
@@ -137,20 +212,81 @@
 dhcpctl_status dhcpctl_wait_for_completion (dhcpctl_handle h,
 					 dhcpctl_status *s)
 {
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_wait_for_completion");
+#endif
 	isc_result_t status;
 	status = omapi_wait_for_completion (h, 0);
-	if (status != ISC_R_SUCCESS)
+	if (status != ISC_R_SUCCESS) {
 		return status;
+	}
 	if (h -> type == dhcpctl_remote_type)
 		*s = ((dhcpctl_remote_object_t *)h) -> waitstatus;
+
+	return ISC_R_SUCCESS;
+}
+
+/* dhcpctl_timed_wait_for_completion
+
+ synchronous
+ returns zero if the callback completes, a nonzero status if
+ there was some problem relating to the wait operation. The
+ status of the queued request will be stored through s, and
+ will also be either zero for success or nonzero for some kind
+ of failure. How long the function waits for a response is
+ dictated by the value of the parameter, t. If the value is nul,
+ it will wait indefinitely or until the connection is lost.
+ Otherwise it will wait for the amount of time specified by t
+ (tv_sec:tv_usec). Values of zero for both fields are valid
+ but not recommended. The result of the request as processed on the
+ server is returned via the parameter, s. This performs the same
+ function as dhcpctl_set_callback and the subsequent callback,
+ for programs that want to do inline execution instead of using
+ callbacks. */
+
+dhcpctl_status dhcpctl_timed_wait_for_completion (dhcpctl_handle h,
+						 dhcpctl_status *s,
+						 struct timeval *t)
+{
+	isc_result_t status;
+	struct timeval adjusted_t;
+
+#ifdef DEBUG_DHCPCTL
+ if (t) {
+		log_debug ("dhcpctl_timed_wait_for_completion"
+			 "(%u.%u secs.usecs)",
+ (unsigned int)(t->tv_sec),
+ (unsigned int)(t->tv_usec));
+ } else {
+ log_debug ("dhcpctl_timed_wait_for_completion(no timeout)");
+ }
+#endif
+
+	if (t) {
+		struct timeval now;
+		gettimeofday (&now, (struct timezone *)0);
+		adjusted_t.tv_sec = now.tv_sec + t->tv_sec;
+		adjusted_t.tv_usec = now.tv_usec + t->tv_usec;
+	}
+
+	status = omapi_wait_for_completion (h, (t ? &adjusted_t : 0));
+	if (status != ISC_R_SUCCESS) {
+		return status;
+	}
+
+	if (h->type == dhcpctl_remote_type) {
+		*s = ((dhcpctl_remote_object_t *)h)->waitstatus;
+	}
+
 	return ISC_R_SUCCESS;
 }
 
+
 /* dhcpctl_get_value
 
 synchronous
 returns zero if the call succeeded, a nonzero status code if
- it didn't. 
+ it didn't.
 result is the address of an empty data string (initialized
 with bzero or cleared with data_string_forget). On
 successful completion, the addressed data string will contain
@@ -168,6 +304,9 @@
 	omapi_value_t *tv = (omapi_value_t *)0;
 	unsigned len;
 	int ip;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_get_value(%s)", value_name);
+#endif
 
 	status = omapi_get_value_str (h, (omapi_object_t *)0, value_name, &tv);
 	if (status != ISC_R_SUCCESS)
@@ -232,7 +371,11 @@
 	isc_result_t status;
 	dhcpctl_data_string data = (dhcpctl_data_string)0;
 	int rv;
-	
+
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_get_boolean(%s)", value_name);
+#endif
+
 	status = dhcpctl_get_value (&data, h, value_name);
 	if (status != ISC_R_SUCCESS)
 		return status;
@@ -258,6 +401,9 @@
 	isc_result_t status;
 	omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
 	omapi_data_string_t *name = (omapi_data_string_t *)0;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_set_value(%s)", value_name);
+#endif
 
 	status = omapi_data_string_new (&name, strlen (value_name), MDL);
 	if (status != ISC_R_SUCCESS)
@@ -291,6 +437,9 @@
 	isc_result_t status;
 	omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
 	omapi_data_string_t *name = (omapi_data_string_t *)0;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_set_string_value(%s)", value_name);
+#endif
 
 	status = omapi_data_string_new (&name, strlen (value_name), MDL);
 	if (status != ISC_R_SUCCESS)
@@ -324,6 +473,9 @@
 	omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
 	omapi_data_string_t *name = (omapi_data_string_t *)0;
 	unsigned ll;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_set_data_value(%s)", value_name);
+#endif
 
 	ll = strlen (value_name);
 	status = omapi_data_string_new (&name, ll, MDL);
@@ -355,6 +507,9 @@
 	isc_result_t status;
 	omapi_data_string_t *name = (omapi_data_string_t *)0;
 	unsigned ll;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_set_null_value(%s)", value_name);
+#endif
 
 	ll = strlen (value_name);
 	status = omapi_data_string_new (&name, ll, MDL);
@@ -379,6 +534,9 @@
 	isc_result_t status;
 	omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
 	omapi_data_string_t *name = (omapi_data_string_t *)0;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_set_boolean_value(%s)", value_name);
+#endif
 
 	status = omapi_data_string_new (&name, strlen (value_name), MDL);
 	if (status != ISC_R_SUCCESS)
@@ -408,6 +566,9 @@
 	isc_result_t status;
 	omapi_typed_data_t *tv = (omapi_typed_data_t *)0;
 	omapi_data_string_t *name = (omapi_data_string_t *)0;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_set_int_value(%s)", value_name);
+#endif
 
 	status = omapi_data_string_new (&name, strlen (value_name), MDL);
 	if (status != ISC_R_SUCCESS)
@@ -438,6 +599,9 @@
 	isc_result_t status;
 	omapi_object_t *message = (omapi_object_t *)0;
 	dhcpctl_remote_object_t *ro;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_object_update");
+#endif
 
 	if (h -> type != dhcpctl_remote_type)
 		return DHCP_R_INVALIDARG;
@@ -487,6 +651,9 @@
 	isc_result_t status;
 	omapi_object_t *message = (omapi_object_t *)0;
 	dhcpctl_remote_object_t *ro;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_object_refresh");
+#endif
 
 	if (h -> type != dhcpctl_remote_type)
 		return DHCP_R_INVALIDARG;
@@ -540,6 +707,9 @@
 	isc_result_t status;
 	omapi_object_t *message = (omapi_object_t *)0;
 	dhcpctl_remote_object_t *ro;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_object_remove");
+#endif
 
 	if (h -> type != dhcpctl_remote_type)
 		return DHCP_R_INVALIDARG;
@@ -582,5 +752,40 @@
 isc_result_t dhcpctl_data_string_dereference (dhcpctl_data_string *vp,
 					 const char *file, int line)
 {
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_data_string_dereference");
+#endif
 	return omapi_data_string_dereference (vp, file, line);
 }
+
+dhcpctl_status dhcpctl_disconnect (dhcpctl_handle *connection,
+				 int force)
+{
+	isc_result_t status;
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_disconnect()");
+#endif
+	if (!connection || !((*connection)->outer) ||
+	 !((*connection)->outer->type) ||
+	 ((*connection)->outer->type != omapi_type_protocol) ||
+	 !((*connection)->outer->outer)) {
+		log_debug("dhcpctl_disconnect detected invalid arg");
+ return DHCP_R_INVALIDARG;
+	}
+
+	status = omapi_disconnect ((*connection)->outer->outer, force);
+	if (status == ISC_R_SUCCESS) {
+#ifdef DEBUG_DHCPCTL
+		log_debug("dhcpctl_disconnect success");
+#endif
+		omapi_object_dereference (connection, MDL);
+		return status;
+	}
+
+#ifdef DEBUG_DHCPCTL
+	log_debug("dhcpctl_disconnect failed:%s",
+		 isc_result_totext (status));
+#endif
+	return status;
+}
+

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/dhcpctl.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/dhcpctl.h Changed

@@ -3,7 +3,7 @@
 Subroutines providing general support for objects. */
 
 /*
- * Copyright (c) 2004,2009,2014 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * Permission to use, copy, modify, and distribute this software for any
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -62,7 +62,16 @@
 dhcpctl_status dhcpctl_initialize (void);
 dhcpctl_status dhcpctl_connect (dhcpctl_handle *,
 				const char *, int, dhcpctl_handle);
+
+dhcpctl_status dhcpctl_timed_connect (dhcpctl_handle *, const char *,
+				 int, dhcpctl_handle, struct timeval *);
+
 dhcpctl_status dhcpctl_wait_for_completion (dhcpctl_handle, dhcpctl_status *);
+
+dhcpctl_status dhcpctl_timed_wait_for_completion (dhcpctl_handle h,
+ dhcpctl_status *s,
+ struct timeval *t);
+
 dhcpctl_status dhcpctl_get_value (dhcpctl_data_string *,
 				 dhcpctl_handle, const char *);
 dhcpctl_status dhcpctl_get_boolean (int *, dhcpctl_handle, const char *);
@@ -87,7 +96,7 @@
 					 omapi_typed_data_t *);
 isc_result_t dhcpctl_callback_get_value (omapi_object_t *, omapi_object_t *,
 					 omapi_data_string_t *,
-					 omapi_value_t **); 
+					 omapi_value_t **);
 isc_result_t dhcpctl_callback_destroy (omapi_object_t *, const char *, int);
 isc_result_t dhcpctl_callback_signal_handler (omapi_object_t *,
 					 const char *, va_list);
@@ -107,7 +116,7 @@
 					omapi_typed_data_t *);
 isc_result_t dhcpctl_remote_get_value (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
-				 omapi_value_t **); 
+				 omapi_value_t **);
 isc_result_t dhcpctl_remote_destroy (omapi_object_t *, const char *, int);
 isc_result_t dhcpctl_remote_signal_handler (omapi_object_t *,
 					 const char *, va_list);
@@ -116,4 +125,7 @@
 					 omapi_object_t *);
 isc_result_t dhcpctl_data_string_dereference (dhcpctl_data_string *,
 					 const char *, int);
+
+dhcpctl_status dhcpctl_disconnect (dhcpctl_handle *, int);
+
 #endif /* _DHCPCTL_H_ */

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/omshell.1 -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/omshell.1 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/omshell.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/omshell.c Changed

@@ -3,7 +3,7 @@
 Examine and modify omapi objects. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 2001-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -81,7 +81,7 @@
 	}
 }
 
-int 
+int
 main(int argc, char **argv) {
 	isc_result_t status, waitstatus;
 	dhcpctl_handle connection;
@@ -132,7 +132,7 @@
 		dhcpctl_remote_object_t *r = (dhcpctl_remote_object_t *)oh;
 		omapi_generic_object_t *g =
 			(omapi_generic_object_t *)(r -> inner);
-		
+
 		printf ("obj: ");
 
 		if (r -> rtype -> type != omapi_datatype_string) {
@@ -142,16 +142,16 @@
 				(int)(r -> rtype -> u . buffer . len),
 				r -> rtype -> u . buffer . value);
 		}
-		
+
 		for (i = 0; i < g -> nvalues; i++) {
 		 omapi_value_t *v = g -> values i;
-			
+
 		 if (!g -> values i)
 			 continue;
 
 		 printf ("%.*s = ", (int)v -> name -> len,
 			 v -> name -> value);
-			
+
 		 if (!v -> value) {
 			printf ("<null>\n");
 			continue;
@@ -161,20 +161,20 @@
 			 printf ("%d\n",
 				 v -> value -> u . integer);
 			 break;
-			 
+
 			 case omapi_datatype_string:
 			 printf ("\"%.*s\"\n",
 				 (int) v -> value -> u.buffer.len,
 				 v -> value -> u.buffer.value);
 			 break;
-				
+
 			 case omapi_datatype_data:
 			 print_hex_or_string(v->value->u.buffer.len,
 						v->value->u.buffer.value,
 						sizeof(hex_buf), hex_buf);
 			 printf("%s\n", hex_buf);
 			 break;
-			 
+
 			 case omapi_datatype_object:
 			 printf ("<obj>\n");
 			 break;
@@ -189,18 +189,18 @@
 
 	 status = new_parse (&cfile, -1, buf, strlen(buf), "<STDIN>", 1);
 	 check(status, "new_parse()");
-	 
+
 	 token = next_token (&val, (unsigned *)0, cfile);
 	 switch (token) {
 		 default:
 		 parse_warn (cfile, "unknown token: %s", val);
 		 skip_to_semi (cfile);
 		 break;
-		 
+
 		 case END_OF_FILE:
 		 case ENDOFLINE: /* EOL: */
 		 break;
-		 
+
 		 case TOKEN_HELP:
 	 case QUESTIONMARK: /* '?': */
 		 printf ("Commands:\n");
@@ -208,6 +208,7 @@
 		 printf (" server <server address>\n");
 		 printf (" key <key name> <key value>\n");
 		 printf (" connect\n");
+		 printf (" disconnect\n");
 		 printf (" new <object-type>\n");
 		 printf (" set <name> = <value>\n");
 		 printf (" create\n");
@@ -218,7 +219,7 @@
 		 printf (" remove\n");
 		 skip_to_semi (cfile);
 		 break;
-		 
+
 		 case PORT:
 		 token = next_token (&val, (unsigned *)0, cfile);
 		 if (is_identifier (token)) {
@@ -427,19 +428,41 @@
 		 connected = 1;
 		 break;
 
+		 case DISCONNECT:
+		 token = next_token (&val, (unsigned *)0, cfile);
+		 if (token != END_OF_FILE && token != EOL) {
+			 printf ("usage: disconnect\n");
+			 skip_to_semi (cfile);
+			 break;
+		 }
+
+		 if (!connected || !connection) {
+			fprintf (stderr, "not connected\n");
+			break;
+		 }
+
+		 status = dhcpctl_disconnect (&connection, 0);
+		 if (status != ISC_R_SUCCESS) {
+			 fprintf (stderr, "dhcpctl_disconnect: %s\n",
+				 isc_result_totext (status));
+			 break;
+		 }
+		 connected = 0;
+		 break;
+
 		 case TOKEN_NEW:
 		 token = next_token (&val, (unsigned *)0, cfile);
 		 if ((!is_identifier (token) && token != STRING)) {
 			 printf ("usage: new <object-type>\n");
 			 break;
 		 }
-		 
+
 		 if (oh) {
 			 printf ("an object is already open.\n");
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!connected) {
 			 printf ("not connected.\n");
 			 skip_to_semi (cfile);
@@ -452,7 +475,7 @@
 				 isc_result_totext (status));
 			 break;
 		 }
-		 
+
 		 token = next_token (&val, (unsigned *)0, cfile);
 		 if (token != END_OF_FILE && token != EOL) {
 			 printf ("usage: new <object-type>\n");
@@ -481,7 +504,7 @@
 			 break;
 		 }
 		 omapi_object_dereference (&oh, MDL);
-		 
+
 		 break;
 
 		 case TOKEN_SET:
@@ -493,13 +516,13 @@
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (oh == NULL) {
 			 printf ("no open object.\n");
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!connected) {
 			 printf ("not connected.\n");
 			 skip_to_semi (cfile);
@@ -512,7 +535,7 @@
 		 s10 = 0;
 		 strncat (s1, val, sizeof(s1)-strlen(s1)-1);
 #endif
-		 
+
 		 token = next_token (&val, (unsigned *)0, cfile);
 		 if (token != EQUAL)
 			 goto set_usage;
@@ -523,7 +546,7 @@
 			 dhcpctl_set_string_value (oh, val, s1);
 			 token = next_token (&val, (unsigned *)0, cfile);
 			 break;
-			 
+
 			 case NUMBER:
 			 strcpy (buf, val);
 			 token = peek_token (&val, (unsigned *)0, cfile);
@@ -561,7 +584,7 @@
 			 token = next_token (&val, (unsigned *)0, cfile);
 			 badnum:
 			 break;
-			 
+
 			 case NUMBER_OR_NAME:
 			 strcpy (buf, val);
 			 cshl:
@@ -587,11 +610,11 @@
 			 printf ("invalid value.\n");
 			 skip_to_semi (cfile);
 		 }
-		 
+
 		 if (token != END_OF_FILE && token != EOL)
 			 goto set_usage;
 		 break;
-		 
+
 		 case UNSET:
 		 token = next_token (&val, (unsigned *)0, cfile);
 
@@ -601,13 +624,13 @@
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!oh) {
 			 printf ("no open object.\n");
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!connected) {
 			 printf ("not connected.\n");
 			 skip_to_semi (cfile);
@@ -620,7 +643,7 @@
 		 s10 = 0;
 		 strncat (s1, val, sizeof(s1)-strlen(s1)-1);
 #endif
-		 
+
 		 token = next_token (&val, (unsigned *)0, cfile);
 		 if (token != END_OF_FILE && token != EOL)
 			 goto unset_usage;
@@ -628,7 +651,7 @@
 		 dhcpctl_set_null_value (oh, s1);
 		 break;
 
-			 
+
 		 case TOKEN_CREATE:
 		 case TOKEN_OPEN:
 		 i = token;
@@ -638,7 +661,7 @@
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!connected) {
 			 printf ("not connected.\n");
 			 skip_to_semi (cfile);
@@ -655,7 +678,7 @@
 			 i = DHCPCTL_CREATE | DHCPCTL_EXCL;
 		 else
 			 i = 0;
-		 
+
 		 status = dhcpctl_open_object (oh, connection, i);
 		 if (status == ISC_R_SUCCESS)
 			 status = dhcpctl_wait_for_completion
@@ -667,7 +690,7 @@
 				 isc_result_totext (status));
 			 break;
 		 }
-		 
+
 		 break;
 
 		 case UPDATE:
@@ -677,7 +700,7 @@
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!connected) {
 			 printf ("not connected.\n");
 			 skip_to_semi (cfile);
@@ -701,7 +724,7 @@
 				 isc_result_totext (status));
 			 break;
 		 }
-		 
+
 		 break;
 
 		 case REMOVE:
@@ -711,7 +734,7 @@
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!connected) {
 			 printf ("not connected.\n");
 			 break;
@@ -743,7 +766,7 @@
 			 skip_to_semi (cfile);
 			 break;
 		 }
-		 
+
 		 if (!connected) {
 			 printf ("not connected.\n");
 			 break;
@@ -765,7 +788,7 @@
 				 isc_result_totext (status));
 			 break;
 		 }
-		 
+
 		 break;
 	 }
 	 end_parse (&cfile);

_service:tar_scm:dhcp-4.4.2.tar.gz/dhcpctl/remote.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/dhcpctl/remote.c Changed

@@ -3,7 +3,7 @@
 The dhcpctl remote object. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -164,7 +164,7 @@
 flags include:
 DHCPCTL_CREATE - if the object doesn't exist, create it
 DHCPCTL_UPDATE - update the object on the server using the
- 		 attached parameters 
+ 		 attached parameters
 DHCPCTL_EXCL - error if the object exists and DHCPCTL_CREATE
 		 was also specified */
 
@@ -281,7 +281,7 @@
 {
 	if (h -> type != dhcpctl_remote_type)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
 			(h -> inner, id, name, value);
@@ -352,4 +352,3 @@
 								p -> inner);
 	return ISC_R_SUCCESS;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/Makefile -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/Makefile Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/References.html -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/References.html Changed

@@ -157,7 +157,7 @@
 
 <h3>Copyright Notice</h3>
 
-Copyright (c) 2006-2017 by Internet Systems
+Copyright (C) 2006-2022 Internet Systems
 	 Consortium, Inc. ("ISC")
 
 This Source Code Form is subject to the terms of the Mozilla Public
@@ -301,7 +301,7 @@
 	first provide a reference.
 </li>
 </ul>
-	
+
 
 That is the lofty goal, at any rate. It's well understood that,
 	especially because the ISC DHCP Software package has not always been
@@ -394,7 +394,7 @@
 	the need to implement many forms of Link Layer framing and above.
 	The software gets away with not having to implement IP routing
 	tables as well by simply utilizing the aforementioned 'fallback'
-	UDP socket when unicasting between two configured systems is 
+	UDP socket when unicasting between two configured systems is
 	needed.
 
 Modern unixes have opened up some facilities that diminish how
@@ -645,7 +645,7 @@
 	 DHCP clients on given networks, so that one of the two servers may
 	 fail and be survived by a server that can act responsibly.
 
-Unfortunately it has been quite some years (2003) since the last 
+Unfortunately it has been quite some years (2003) since the last
 	 time this document was edited, and the authors no longer show any
 	 interest in fielding comments or improving the document.
 
@@ -676,7 +676,7 @@
 	 communications-interrupted. This is supported using a new
 	 'rewind state' record on the dhcpd.leases entry for each
 	 lease.
-	 
+
 
 <a class='info' href='#RFC3074'>RFC3074 (Volz, B., Gonczi, S., Lemon, T., and R. Stevens, &ldquo;DHC Load Balancing Algorithm,&rdquo; February&nbsp;2001.)</a> describes the Load Balancing
 	 Algorithm (LBA) that ISC DHCP uses in concert with the Failover
@@ -734,7 +734,7 @@
 	 beneath options it also contains.
 </li>
 </ol>
-	
+
 
 Precisely how to correctly support the above conundrums has not
 	quite yet been settled, so support is incomplete.
@@ -1015,9 +1015,9 @@
 <td class="author-text">Internet Systems Consortium,
 				 Inc.</td></tr>
 <tr><td class="author-text">&nbsp;</td>
-<td class="author-text">950 Charter Street</td></tr>
+<td class="author-text">PO Box 360</td></tr>
 <tr><td class="author-text">&nbsp;</td>
-<td class="author-text">Redwood City, CA 94063</td></tr>
+<td class="author-text">Newmarket, NH 03857 USA</td></tr>
 <tr cellpadding="3"><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td class="author-text">&nbsp;</td>
 <td class="author-text">Tomasz Mrugalski</td></tr>
@@ -1025,9 +1025,9 @@
 <td class="author-text">Internet Systems Consortium,
 				 Inc.</td></tr>
 <tr><td class="author-text">&nbsp;</td>
-<td class="author-text">950 Charter Street</td></tr>
+<td class="author-text">PO Box 360</td></tr>
 <tr><td class="author-text">&nbsp;</td>
-<td class="author-text">Redwood City, CA 94063</td></tr>
+<td class="author-text">Newmarket, NH 03857 USA</td></tr>
 <tr><td class="author" align="right">Phone:&nbsp;</td>
 <td class="author-text">+1 650 423 1345</td></tr>
 <tr><td class="author" align="right">Email:&nbsp;</td>

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/References.txt -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/References.txt Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/References.xml -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/References.xml Changed

@@ -109,10 +109,11 @@
 
 <address>
 	<postal>
-	 <street>950 Charter Street</street>
-	 <city>Redwood City</city>
-	 <region>CA</region>
-	 <code>94063</code>
+	 <street>PO Box 360</street>
+	 <city>Newmarket</city>
+	 <region>NH</region>
+	 <code>03857</code>
+	 <country>USA</country>
 	</postal>
 </address>
 </author>
@@ -124,14 +125,12 @@
 
 <address>
 	<postal>
-	 <street>950 Charter Street</street>
-	 <city>Redwood City</city>
-	 <region>CA</region>
-	 <code>94063</code>
+	 <street>PO Box 360</street>
+	 <city>Newmarket</city>
+	 <region>NH</region>
+	 <code>03857</code>
+	 <country>USA</country>
 	</postal>
-
-	<phone>+1 650 423 1345</phone>
-	<email>Tomasz_Mrugalski@isc.org</email>
 </address>
 </author>
 
@@ -148,7 +147,7 @@
 </abstract>
 
 <note title="Copyright Notice">
-	<t>Copyright (c) 2006-2017 by Internet Systems
+	<t>Copyright (C) 2006-2022 Internet Systems
 	 Consortium, Inc. ("ISC")</t>
 
 	<t>This Source Code Form is subject to the terms of the Mozilla Public
@@ -314,7 +313,7 @@
 	the need to implement many forms of Link Layer framing and above.
 	The software gets away with not having to implement IP routing
 	tables as well by simply utilizing the aforementioned 'fallback'
-	UDP socket when unicasting between two configured systems is 
+	UDP socket when unicasting between two configured systems is
 	needed.</t>
 
 	<t>Modern unixes have opened up some facilities that diminish how
@@ -527,7 +526,7 @@
 	 DHCP clients on given networks, so that one of the two servers may
 	 fail and be survived by a server that can act responsibly.</t>
 
-	 <t>Unfortunately it has been quite some years (2003) since the last 
+	 <t>Unfortunately it has been quite some years (2003) since the last
 	 time this document was edited, and the authors no longer show any
 	 interest in fielding comments or improving the document.</t>

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/ja_JP.eucJP/dhclient-script.8 -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/ja_JP.eucJP/dhclient-script.8 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/ja_JP.eucJP/dhclient.8 -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/ja_JP.eucJP/dhclient.8 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/ja_JP.eucJP/dhclient.conf.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/ja_JP.eucJP/dhclient.conf.5 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/ja_JP.eucJP/dhclient.leases.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/ja_JP.eucJP/dhclient.leases.5 Changed

@@ -1,6 +1,6 @@
 .\"	$Id: dhclient.leases.5,v 1.4 2009/11/24 02:06:56 sar Exp $
 .\"
-.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1997-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -16,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -25,31 +25,31 @@
 .\"
 .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhclient.leases.5,v 1.6 2002/05/05 20:40:23 horikawa Exp $
 .TH dhclient.leases 5
-.SH Ì¾¾Î
-dhclient.leases - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹
-.SH ²òÀâ
-Internet Systems Consortium ¤Î DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢
-³ÍÆÀ¤·¤¿¥ê¡¼¥¹¤Î¤¦¤Á¤Þ¤ÀÍ¸ú¤Ç¤¢¤ë¤â¤Î¤ò´ÉÍý¤¹¤ë¤¿¤á¤Î¡¢
-±ÊÂ³Åª¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÊÝ»ý¤·¤Þ¤¹¡£
-¤³¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¡¢¼«Í³·Á¼°¤Î ASCII ¥Õ¥¡¥¤¥ë¤Ç¤¢¤ê¡¢
-¥ê¡¼¥¹ 1 ¤Ä¤Ë¤Ä¤Í¸ú¤ÊÀë¸À¤ò 1 ¤Ä´Þ¤ß¤Þ¤¹¡£
-¤¢¤ë¥ê¡¼¥¹¤ËÂÐ¤·¤ÆÊ£¿ô¤ÎÀë¸À¤¬ÅÐ¾ì¤¹¤ë¾ì¹ç¡¢
-¥Õ¥¡¥¤¥ëÃæ¤ÎºÇ¸å¤Î¤â¤Î¤¬»ÈÍÑ¤µ¤ì¤Þ¤¹¡£
-¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥í¥°¤È¤·¤Æ½ñ¤¹þ¤Þ¤ì¤Þ¤¹¤Î¤Ç¡¢
-¤³¤Î¤è¤¦¤Ê¾õÂÖ¤Ë¤Ê¤ë¤³¤È¤Ï°Û¾ï¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+.SH Ì¾ï¿½ï¿½
+dhclient.leases - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Î¥ê¡¼ï¿½ï¿½ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½Ù¡ï¿½ï¿½ï¿½
+.SH ï¿½ï¿½ï¿½ï¿½
+Internet Systems Consortium ï¿½ï¿½ DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Ï¡ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ê¡¼ï¿½ï¿½ï¿½Î¤ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½Íï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½ï¿½Î¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ë¤¿ï¿½ï¿½Î¡ï¿½
+ï¿½ï¿½Â³Åªï¿½Ê¥Ç¡ï¿½ï¿½ï¿½ï¿½Ù¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ý»ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¥Ç¡ï¿½ï¿½ï¿½ï¿½Ù¡ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½Í³ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ ASCII ï¿½Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ê¡¼ï¿½ï¿½ 1 ï¿½Ä¤Ë¤Ä¤ï¿½Íï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 1 ï¿½Ä´Þ¤ß¤Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ê¡¼ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½Ê£ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ð¾ì¤¹ï¿½ï¿½ï¿½ç¡¢
+ï¿½Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ÎºÇ¸ï¿½Î¤ï¿½Î¤ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¥Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½Ï¥ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½Æ½ñ¤¹ï¿½ï¿½Þ¤ï¿½Þ¤ï¿½ï¿½Î¤Ç¡ï¿½
+ï¿½ï¿½ï¿½Î¤è¤¦ï¿½Ê¾ï¿½ï¿½Ö¤Ë¤Ê¤ë¤³ï¿½È¤Ï°Û¾ï¿½Ç¤Ï¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .PP
-¥ê¡¼¥¹Àë¸À¤Î½ñ¼°¤Ï¡¢
+ï¿½ê¡¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Î½ñ¼°¤Ï¡ï¿½
 .B dhclient.conf(5)
-¤Ëµ½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-.SH ´ØÏ¢¥Õ¥¡¥¤¥ë
+ï¿½Ëµï¿½ï¿½Ò¤ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+.SH ï¿½ï¿½Ï¢ï¿½Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½
 .B DBDIR/dhclient.leases
-.SH ´ØÏ¢¹àÌÜ
+.SH ï¿½ï¿½Ï¢ï¿½ï¿½ï¿½ï¿½
 dhclient(8), dhcp-options(5), dhclient.conf(5),
 RFC2132, RFC2131
-.SH ºî¼Ô
+.SH ï¿½ï¿½ï¿½
 .B dhclient(8)
-¤Ï¡¢Vixie Labs ¤È¤Î·ÀÌó¤Î¤â¤È¤Ç¡¢Ted Lemon ¤¬µ½Ò¤·¤Þ¤·¤¿¡£
-ËÜ¥×¥í¥¸¥§¥¯¥È¤Î»ñ¶â¤Ï¡¢Internet Systems Consortium ¤¬Äó¶¡¤·¤Þ¤·¤¿¡£
-Internet Systems Consortium ¤Ë´Ø¤¹¤ë¾ðÊó¤Ï¡¢
+ï¿½Ï¡ï¿½Vixie Labs ï¿½È¤Î·ï¿½ï¿½ï¿½Î¤ï¿½È¤Ç¡ï¿½Ted Lemon ï¿½ï¿½ï¿½ï¿½ï¿½Ò¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½Ü¥×¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¤Î»ï¿½ï¿½Ï¡ï¿½Internet Systems Consortium ï¿½ï¿½ï¿½ó¶¡¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½
+Internet Systems Consortium ï¿½Ë´Ø¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½
 .B https://www.isc.org
-¤Ë¤¢¤ê¤Þ¤¹¡£
+ï¿½Ë¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/ja_JP.eucJP/dhcp-eval.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/ja_JP.eucJP/dhcp-eval.5 Changed

@@ -1,6 +1,6 @@
 .\"	$Id: dhcp-eval.5,v 1.5 2009/11/24 02:06:56 sar Exp $
 .\"
-.\" Copyright (c) 2004,2009,2016 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -16,280 +16,280 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
 .\" $FreeBSD: doc/ja_JP.eucJP/man/man5/dhcp-eval.5,v 1.2 2002/05/23 04:17:13 horikawa Exp $
 .TH dhcp-eval 5
-.SH Ì¾¾Î
-dhcp-eval - ISC DHCP ¤Ë¤ª¤±¤ë¾ò·ïÉÕ¤É¾²Á
-.SH ²òÀâ
-Internet Systems Consortium ¤Î DHCP ¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¤Ï¡¢¤É¤Á¤é¤â
-¼õ¿®¤¹¤ë¥Ñ¥±¥Ã¥È¤Ë°ÍÂ¸¤·¤¿¾ò·ïÉÕ¤Æ°ºî¤ò¹Ô¤¦Ç½ÎÏ¤ò»ý¤Á¤Þ¤¹¡£
-¾ò·ïÉÕ¤Æ°ºî¤ÎÊ¸Ë¡¤ò¤³¤³¤Ë¼¨¤·¤Þ¤¹¡£
-.SH »²¾È: ¾ò·ïÉÕ¤Æ°ºî
-¾ò·ïÉÕ¤Æ°ºî¤Ï¡¢if, else, elsif Ê¸¤ò»ÈÍÑ¤·¤Æ»ØÄê¤·¤Þ¤¹¡£
-¾ò·ïÊ¸¤Ï¡¢ÄÌ¾ïÊ¸ (option Ê¸) ¤¬ÅÐ¾ì²ÄÇ½¤Ê¾ì½ê¤Ï¤É¤³¤Ë¤Ç¤âÅÐ¾ì²ÄÇ½¤Ç¤¢¤ê¡¢
-¤Þ¤¿¤³¤Î¤è¤¦¤ÊÊ¸¤ò³ç¤ë¤³¤È¤â²ÄÇ½¤Ç¤¹¡£
-¥µ¡¼¥Ð¤Ë¤ª¤±¤ë¾ò·ïÊ¸¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ë¤³¤È¤¬Â¿¤¤¤Ç¤·¤ç¤¦:
+.SH Ì¾ï¿½ï¿½
+dhcp-eval - ISC DHCP ï¿½Ë¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½É¾ï¿½ï¿½
+.SH ï¿½ï¿½ï¿½ï¿½
+Internet Systems Consortium ï¿½ï¿½ DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤È¥ï¿½ï¿½ï¿½ï¿½Ð¤Ï¡ï¿½ï¿½É¤ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ñ¥ï¿½ï¿½Ã¥È¤Ë°ï¿½Â¸ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½Æ°ï¿½ï¿½ï¿½Ô¤ï¿½Ç½ï¿½Ï¤ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½Æ°ï¿½ï¿½ï¿½Ê¸Ë¡ï¿½ò¤³¤ï¿½ï¿½Ë¼ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+.SH ï¿½ï¿½ï¿½ï¿½: ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½Æ°ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½Æ°ï¿½ï¿½Ï¡ï¿½if, else, elsif Ê¸ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½Æ»ï¿½ï¿½ê¤·ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ê¸ï¿½Ï¡ï¿½ï¿½Ì¾ï¿½Ê¸ (option Ê¸) ï¿½ï¿½ï¿½Ð¾ï¿½ï¿½Ç½ï¿½Ê¾ï¿½ï¿½Ï¤É¤ï¿½ï¿½Ë¤Ç¤ï¿½ï¿½Ð¾ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½Î¤è¤¦ï¿½ï¿½Ê¸ï¿½ï¿½ï¿½ë¤³ï¿½È¤ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤Ë¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ê¸ï¿½Ï¼ï¿½ï¿½Î¤è¤¦ï¿½Ë¤Ê¤ë¤³ï¿½È¤ï¿½Â¿ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ç¤¦:
 .PP
 .nf
 if option dhcp-user-class = "accounting" {
 max-lease-time 17600;
 option domain-name "accounting.example.org";
- option domain-name-servers ns1.accounting.example.org, 
+ option domain-name-servers ns1.accounting.example.org,
 			 ns2.accounting.example.org;
 } elsif option dhcp-user-class = "sales" {
 max-lease-time 17600;
 option domain-name "sales.example.org";
- option domain-name-servers ns1.sales.example.org, 
+ option domain-name-servers ns1.sales.example.org,
 			 ns2.sales.example.org;
 } elsif option dhcp-user-class = "engineering" {
 max-lease-time 17600;
 option domain-name "engineering.example.org";
- option domain-name-servers ns1.engineering.example.org, 
+ option domain-name-servers ns1.engineering.example.org,
 			 ns2.engineering.example.org;
 } else {
 max-lease-time 600;
 option domain-name "misc.example.org";
- option domain-name-servers ns1.misc.example.org, 
+ option domain-name-servers ns1.misc.example.org,
 			 ns2.misc.example.org;
 }
 .fi
 .PP
-¥¯¥é¥¤¥¢¥ó¥ÈÂ¦¤Ç¤Ï¡¢¾ò·ïÉÕ¤É¾²Á¤ÎÎã¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦:
+ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½ï¿½Â¦ï¿½Ç¤Ï¡ï¿½ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ï¼ï¿½ï¿½Î¤è¤¦ï¿½Ë¤Ê¤ï¿½Ç¤ï¿½ï¿½ç¤¦:
 .PP
 .nf
-# example.org ¤Ï¥Õ¥¡¥¤¥ä¥¦¥©¡¼¥ë¤Ç DNS ¤ò¥Õ¥£¥ë¥¿¤¹¤ë¤Î¤Ç¡¢
-# example.org ¥Í¥Ã¥È¥ï¡¼¥¯¤Ë·Ò¤¬¤ë¤È¤¤Î¤ß¡¢¤½¤Î DNS ¥µ¡¼¥Ð¤ò»ÈÍÑ¤·¤Þ¤¹¡£
-# example.org ¤Ë·Ò¤¬¤ë¤Î¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¼«¸Ê¤Î DNS ¥µ¡¼¥Ð¤òÍ¥Àè»ÈÍÑ¤·¤Þ¤¹¡£
+# example.org ï¿½Ï¥Õ¥ï¿½ï¿½ï¿½ï¿½ä¥¦ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ DNS ï¿½ï¿½Õ¥ï¿½ï¿½ë¥¿ï¿½ï¿½ï¿½ï¿½Î¤Ç¡ï¿½
+# example.org ï¿½Í¥Ã¥È¥ï¡¼ï¿½ï¿½ï¿½Ë·Ò¤ï¿½ï¿½ï¿½È¤ï¿½ï¿½Î¤ß¡ï¿½ï¿½ï¿½ï¿½ï¿½ DNS ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+# example.org ï¿½Ë·Ò¤ï¿½ï¿½ï¿½Î¤Ç¤Ï¤Ê¤ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½Ê¤ï¿½ DNS ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½Í¥ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 if not option domain-name = "example.org" {
 prepend domain-name-servers 127.0.0.1;
 }
-.fi 
+.fi
 .PP
 .B if
-Ê¸¤È
+Ê¸ï¿½ï¿½
 .B elsif
-·ÑÂ³Ê¸¤Ï¡¢°ú¿ô¤È¤·¤Æ¥Ö¡¼¥ë¼°¤ò¼è¤ê¤Þ¤¹¡£
-¤Ä¤Þ¤ê¡¢¤³¤ì¤é¤ÎÊ¸¤Ï¡¢É¾²Á¤µ¤ì¤ë¤È¥Ö¡¼¥ëÃÍ¤Î·ë²Ì¤òÀ¸À®¤¹¤ë¼°¤ò¼è¤ê¤Þ¤¹¡£
-¼°¤ÎÉ¾²Á·ë²Ì¤¬¿¿¤Ë¤Ê¤ë¤È¡¢
+ï¿½ï¿½Â³Ê¸ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½Æ¥Ö¡ï¿½ï¿½ë¼°ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Ä¤Þ¤ê¡¢ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ê¸ï¿½Ï¡ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¥Ö¡ï¿½ï¿½ï¿½ï¿½Í¤Î·ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ë¼°ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½È¡ï¿½
 .B if
-Ê¸¤ÎÄ¾¸å¤Î¥Ö¥ì¡¼¥¹¤Ç³ç¤é¤ì¤¿Ê¸¤¬¼Â¹Ô¤µ¤ì¡¢¸åÂ³¤¹¤ë
+Ê¸ï¿½ï¿½Ä¾ï¿½ï¿½Î¥Ö¥ì¡¼ï¿½ï¿½ï¿½Ç³ï¿½ï¿½ì¤¿Ê¸ï¿½ï¿½ï¿½Â¹Ô¤ï¿½ï¿½ì¡¢ï¿½ï¿½Â³ï¿½ï¿½ï¿½ï¿½
 .B elsif
-¤È
+ï¿½ï¿½
 .B else
-¤ÎÀá¤Ï¥¹¥¥Ã¥×¤µ¤ì¤Þ¤¹¡£
-¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢É¾²Á·ë²Ì¤¬¿¿¤Ë¤Ê¤ë elsif Àá¤Ë½Ð²ñ¤¦¤Þ¤Ç¡¢¸åÂ³¤¹¤ë³Æ
+ï¿½ï¿½ï¿½ï¿½Ï¥ï¿½ï¿½ï¿½ï¿½Ã¥×¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ê¤ï¿½ï¿½ï¿½ç¡¢É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½ elsif ï¿½ï¿½Ë½Ð²ñ¤¦¤Þ¤Ç¡ï¿½ï¿½ï¿½Â³ï¿½ï¿½ï¿½ï¿½ï¿½
 .B elsif
-Àá¤Î¼°¤¬¥Á¥§¥Ã¥¯¤µ¤ì¤Þ¤¹¡£
-¤½¤Î¤è¤¦¤ÊÀá¤¬¸«ÉÕ¤«¤ë¤È¡¢Ä¾¸å¤Î¥Ö¥ì¡¼¥¹Ãæ¤ÎÊ¸¤¬¼Â¹Ô¤µ¤ì¡¢¸åÂ³¤¹¤ë
+ï¿½ï¿½Î¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¤è¤¦ï¿½ï¿½ï¿½á¤¬ï¿½ï¿½ï¿½Õ¤ï¿½ï¿½ï¿½È¡ï¿½Ä¾ï¿½ï¿½Î¥Ö¥ì¡¼ï¿½ï¿½ï¿½ï¿½ï¿½Ê¸ï¿½ï¿½ï¿½Â¹Ô¤ï¿½ï¿½ì¡¢ï¿½ï¿½Â³ï¿½ï¿½ï¿½ï¿½
 .B elsif
-¤È
+ï¿½ï¿½
 .B else
-¤ÎÀá¤Ï¥¹¥¥Ã¥×¤µ¤ì¤Þ¤¹¡£
-¤¹¤Ù¤Æ¤Î
+ï¿½ï¿½ï¿½ï¿½Ï¥ï¿½ï¿½ï¿½ï¿½Ã¥×¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ù¤Æ¤ï¿½
 .B if
-¤ª¤è¤Ó
+ï¿½ï¿½ï¿½ï¿½ï¿½
 .B elsif
-¤ÎÀá¤¬¥Á¥§¥Ã¥¯¤µ¤ì¤¿¤â¤Î¤Î¤É¤Î¼°¤â¿¿¤Ë¤Ê¤é¤Ê¤¤¾ì¹ç¤Ç¡¢
+ï¿½ï¿½ï¿½á¤¬ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ì¤¿ï¿½ï¿½Î¤Î¤É¤Î¼ï¿½ï¿½â¿¿ï¿½Ë¤Ê¤ï¿½Ê¤ï¿½ï¿½ï¿½ï¿½Ç¡ï¿½
 .B else
-Àá¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢
+ï¿½á¤¬Â¸ï¿½ß¤ï¿½ï¿½ï¿½ï¿½ç¡¢
 .B else
-¤ÎÄ¾¸å¤Î¥Ö¥ì¡¼¥¹Ãæ¤ÎÊ¸¤¬É¾²Á¤µ¤ì¤Þ¤¹¡£
-¾ò·ï¤Ë¤ª¤¤¤Æ¤Ï¡¢É¾²Á·ë²Ì¤¬¶õ¤Ë¤Ê¤ë¥Ö¡¼¥ë¼°¤Ïµ¶¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-.SH ¥Ö¡¼¥ë¼°
-°Ê²¼¤Ï¡¢DHCP ÇÛÉÛÊª¤Ç¸½ºß¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥Ö¡¼¥ë¼°¤Î°ìÍ÷¤Ç¤¹¡£
+ï¿½ï¿½Ä¾ï¿½ï¿½Î¥Ö¥ì¡¼ï¿½ï¿½ï¿½ï¿½ï¿½Ê¸ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ë¤ï¿½ï¿½ï¿½ï¿½Æ¤Ï¡ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½Ö¡ï¿½ï¿½ë¼°ï¿½Ïµï¿½ï¿½È¤ï¿½ï¿½Æ°ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+.SH ï¿½Ö¡ï¿½ï¿½ë¼°
+ï¿½Ê²ï¿½ï¿½Ï¡ï¿½DHCP ï¿½ï¿½ï¿½ï¿½Êªï¿½Ç¸ï¿½ï¿½ß¥ï¿½ï¿½Ý¡ï¿½ï¿½È¤ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½ï¿½Ö¡ï¿½ï¿½ë¼°ï¿½Î°ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
 .PP
 .I data-expression-1 \fB=\fI data-expression-2\fR
 .RS 0.25i
 .PP
-\fB=\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢2 ¸Ä¤Î¥Ç¡¼¥¿¼°¤òÈæ³Ó¤·¡¢Î¾¼Ô¤¬Æ±¤¸¾ì¹ç¤Ï¿¿¤òÊÖ¤·¡¢
-Æ±°ì¤Ç¤Ê¤¤¾ì¹ç¤Ïµ¶¤òÊÖ¤·¤Þ¤¹¡£
-º¸ÊÕ¤â¤·¤¯¤Ï±¦ÊÕ¤Î¤¤¤º¤ì¤«¤¬¶õ¤Î¾ì¹ç¡¢·ë²Ì¤Ï¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
+\fB=\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½2 ï¿½Ä¤Î¥Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ó¤ï¿½ï¿½ï¿½Î¾ï¿½Ô¤ï¿½Æ±ï¿½ï¿½ï¿½ï¿½ï¿½Ï¿ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½
+Æ±ï¿½ï¿½Ç¤Ê¤ï¿½ï¿½ï¿½ï¿½Ïµï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Õ¤â¤·ï¿½ï¿½ï¿½Ï±ï¿½ï¿½Õ¤Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½Ì¤Ï¶ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .I boolean-expression-1 \fBand\fI boolean-expression-2\fR
 .PP
 .RS 0.25i
-\fBand\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢º¸ÊÕ¤Î¥Ö¡¼¥ë¼°¤È±¦ÊÕ¤Î¥Ö¡¼¥ë¼°¤ÎÎ¾Êý¤ÎÉ¾²Á·ë²Ì¤¬
-¿¿¤Î¾ì¹ç¡¢¿¿¤ÈÉ¾²Á¤µ¤ì¤Þ¤¹¡£
-¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢µ¶¤ÈÉ¾²Á¤µ¤ì¤Þ¤¹¡£
-º¸ÊÕ¤â¤·¤¯¤Ï±¦ÊÕ¤Î¤¤¤º¤ì¤«¤¬¶õ¤Î¾ì¹ç¡¢·ë²Ì¤Ï¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
+\fBand\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½Õ¤Î¥Ö¡ï¿½ï¿½ë¼°ï¿½È±ï¿½ï¿½Õ¤Î¥Ö¡ï¿½ï¿½ë¼°ï¿½ï¿½Î¾ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½
+ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ê¤ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Õ¤â¤·ï¿½ï¿½ï¿½Ï±ï¿½ï¿½Õ¤Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½Ì¤Ï¶ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .I boolean-expression-1 \fBor\fI boolean-expression-2\fR
 .PP
 .RS 0.25i
-\fBor\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢º¸ÊÕ¤Î¥Ö¡¼¥ë¼°¤È±¦ÊÕ¤Î¥Ö¡¼¥ë¼°¤Î¤¤¤º¤ì¤«¤ÎÉ¾²Á·ë²Ì¤¬
-¿¿¤Î¾ì¹ç¡¢¿¿¤ÈÉ¾²Á¤µ¤ì¤Þ¤¹¡£
-¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢µ¶¤ÈÉ¾²Á¤µ¤ì¤Þ¤¹¡£
-º¸ÊÕ¤â¤·¤¯¤Ï±¦ÊÕ¤Î¤¤¤º¤ì¤«¤¬¶õ¤Î¾ì¹ç¡¢·ë²Ì¤Ï¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
+\fBor\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½Õ¤Î¥Ö¡ï¿½ï¿½ë¼°ï¿½È±ï¿½ï¿½Õ¤Î¥Ö¡ï¿½ï¿½ë¼°ï¿½Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½
+ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ê¤ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Õ¤â¤·ï¿½ï¿½ï¿½Ï±ï¿½ï¿½Õ¤Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½Ì¤Ï¶ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B not \fIboolean-expression
 .PP
 .RS 0.25i
-\fBnot\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢\fIboolean-expression\fR ¤ÎÉ¾²Á·ë²Ì¤¬µ¶¤Î¾ì¹ç¡¢
-¿¿¤ÈÉ¾²Á¤µ¤ì¤Þ¤¹¡£
-¤Þ¤¿¡¢\fIboolean-expression\fR ¤ÎÉ¾²Á·ë²Ì¤¬¿¿¤Î¾ì¹ç¡¢µ¶¤ÈÉ¾²Á¤µ¤ì¤Þ¤¹¡£
-\fIboolean-expression\fR ¤ÎÉ¾²Á·ë²Ì¤¬¶õ¤Î¾ì¹ç¡¢·ë²Ì¤â¤Þ¤¿¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
+\fBnot\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½\fIboolean-expression\fR ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢
+ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Þ¤ï¿½ï¿½ï¿½\fIboolean-expression\fR ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+\fIboolean-expression\fR ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½Ì¤ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B exists \fIoption-name\fR
 .PP
 .RS 0.25i
-\fBexists\fR ¼°¤Ï¡¢½èÍýÂÐ¾Ý¤ÎÆþÎÏ DCHP ¥Ñ¥±¥Ã¥ÈÃæ¤Ë¡¢
-»ØÄê¤µ¤ì¤¿¥ª¥×¥·¥ç¥ó¤¬Â¸ºß¤¹¤ë¾ì¹ç¡¢¿¿¤òÊÖ¤·¤Þ¤¹¡£
+\fBexists\fR ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ð¾Ý¤ï¿½ï¿½ï¿½ï¿½ï¿½ DCHP ï¿½Ñ¥ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½Ë¡ï¿½
+ï¿½ï¿½ï¿½ê¤µï¿½ì¤¿ï¿½ï¿½ï¿½×¥ï¿½ï¿½ï¿½ï¿½Â¸ï¿½ß¤ï¿½ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .B known
 .PP
 .RS 0.25i
-\fBknown\fR ¼°¤Ï¡¢Í×µáÂÐ±þÃæ¤Î¥¯¥é¥¤¥¢¥ó¥È¤¬´ûÃÎ¤Î¾ì¹ç¡¢
-¤¹¤Ê¤ï¤Á¥Û¥¹¥ÈÀë¸À¤¬¤¢¤ë¾ì¹ç¡¢¿¿¤òÊÖ¤·¤Þ¤¹¡£
+\fBknown\fR ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½×µï¿½ï¿½Ð±ï¿½ï¿½ï¿½Î¥ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½ï¿½ï¿½Î¤Î¾ï¿½ç¡¢
+ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½Û¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .B static
 .PP
 .RS 0.25i
-\fBstatic\fR ¼°¤Ï¡¢Í×µáÂÐ±þÃæ¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ø¤Î¥ê¡¼¥¹³ä¤êÅö¤Æ¤¬¡¢
-ÀÅÅª¥¢¥É¥ì¥¹³ä¤êÅö¤Æ¤Ë¤è¤ë¤â¤Î¤Ç¤¢¤Ã¤¿¾ì¹ç¡¢¿¿¤òÊÖ¤·¤Þ¤¹¡£
+\fBstatic\fR ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½×µï¿½ï¿½Ð±ï¿½ï¿½ï¿½Î¥ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Ø¤Î¥ê¡¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½Åªï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Æ¤Ë¤ï¿½ï¿½ï¿½Î¤Ç¤ï¿½ï¿½Ã¤ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
-.SH ¥Ç¡¼¥¿¼°
-Á°½Ò¤Î¥Ö¡¼¥ë¼°¤Ï¡¢¥Ç¡¼¥¿¼°¤ÎÉ¾²Á·ë²Ì¤Ë°ÍÂ¸¤·¤Þ¤¹¡£
-¥Ç¡¼¥¿¼°¤ò¤³¤³¤Ë¼¨¤·¤Þ¤¹¡£
+.SH ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ò¤Î¥Ö¡ï¿½ï¿½ë¼°ï¿½Ï¡ï¿½ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤Ë°ï¿½Â¸ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ò¤³¤ï¿½ï¿½Ë¼ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .PP
 .B substring (\fIdata-expr\fB, \fIoffset\fB, \fIlength\fB)\fR
 .PP
 .RS 0.25i
-\fBsubstring\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢¥Ç¡¼¥¿¼°¤òÉ¾²Á¤·¡¢
-É¾²Á·ë²ÌÃæ¤Î \fIoffset\fR ¥Ð¥¤¥È¤«¤é³«»Ï¤·¤Æ \fIlength\fR ¥Ð¥¤¥È·ÑÂ³¤¹¤ë
-¥µ¥Ö¥¹¥È¥ê¥ó¥°¤òÊÖ¤·¤Þ¤¹¡£
-\fIoffset\fR ¤È \fIlength\fR ¤Ï¶¦¤Ë¿ôÃÍ¼°¤Ç¤¹¡£
-\fIdata-expr\fR, \fIoffset\fR, \fIlength\fR ¤Î¤¤¤º¤ì¤«¤¬¶õ¤ÈÉ¾²Á¤µ¤ì¤ë¾ì¹ç¡¢
-·ë²Ì¤â¤Þ¤¿¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
-\fIoffset\fR ¤¬¡¢É¾²Á¤µ¤ì¤¿¥Ç¡¼¥¿¤ÎÄ¹¤µ°Ê¾å¤Ç¤¢¤ë¾ì¹ç¡¢
-Ä¹¤µ 0 ¤Î¥Ç¡¼¥¿Ê¸»úÎó¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
-\fIlength\fI ¤¬¡¢É¾²Á¤µ¤ì¤¿¥Ç¡¼¥¿¤Î \fIoffset\fR ¤è¤ê¸å¤ÎÄ¹¤µ¤è¤êÂç¤¤¤¾ì¹ç¡¢
-É¾²Á¤µ¤ì¤¿¥Ç¡¼¥¿¤Î \fIoffset\fR ¤«¤é½ªÃ¼¤Þ¤Ç¤ÎÁ´¥Ç¡¼¥¿¤ò´Þ¤à
-¥Ç¡¼¥¿Ê¸»úÎó¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
+\fBsubstring\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
+É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ \fIoffset\fR ï¿½Ð¥ï¿½ï¿½È¤ï¿½ï¿½é³«ï¿½Ï¤ï¿½ï¿½ï¿½ \fIlength\fR ï¿½Ð¥ï¿½ï¿½È·ï¿½Â³ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ö¥ï¿½ï¿½È¥ï¿½ó¥°¤ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+\fIoffset\fR ï¿½ï¿½ \fIlength\fR ï¿½Ï¶ï¿½ï¿½Ë¿ï¿½ï¿½Í¼ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
+\fIdata-expr\fR, \fIoffset\fR, \fIlength\fR ï¿½Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ç¡¢
+ï¿½ï¿½Ì¤ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
+\fIoffset\fR ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¤¿ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½Ä¹ï¿½ï¿½ï¿½Ê¾ï¿½Ç¤ï¿½ï¿½ï¿½ï¿½ç¡¢
+Ä¹ï¿½ï¿½ 0 ï¿½Î¥Ç¡ï¿½ï¿½ï¿½Ê¸ï¿½ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+\fIlength\fI ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¤¿ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ \fIoffset\fR ï¿½ï¿½ï¿½ï¿½ï¿½Ä¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ç¤ï¿½ï¿½ï¿½ï¿½ç¡¢
+É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¤¿ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ \fIoffset\fR ï¿½ï¿½ï¿½é½ªÃ¼ï¿½Þ¤Ç¤ï¿½ï¿½ï¿½ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½
+ï¿½Ç¡ï¿½ï¿½ï¿½Ê¸ï¿½ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B suffix (\fIdata-expr\fB, \fIlength\fB)\fR
 .PP
 .RS 0.25i
-\fBsuffix\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢\fIdata-expr\fR ¤òÉ¾²Á¤·¡¢
-É¾²Á·ë²Ì¤ÎºÇ¸å¤Î \fIlength\fR ¥Ð¥¤¥È¤òÊÖ¤·¤Þ¤¹¡£
-\fIlength\fR ¤Ï¿ôÃÍ¼°¤Ç¤¹¡£
-\fIdata-expr\fR ¤Þ¤¿¤Ï \fIlength\fR ¤ÎÉ¾²Á·ë²Ì¤¬¶õ¤Î¾ì¹ç¡¢
-·ë²Ì¤â¤Þ¤¿¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
+\fBsuffix\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½\fIdata-expr\fR ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
+É¾ï¿½ï¿½ï¿½ï¿½Ì¤ÎºÇ¸ï¿½ï¿½ \fIlength\fR ï¿½Ð¥ï¿½ï¿½È¤ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+\fIlength\fR ï¿½Ï¿ï¿½ï¿½Í¼ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
+\fIdata-expr\fR ï¿½Þ¤ï¿½ï¿½ï¿½ \fIlength\fR ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢
+ï¿½ï¿½Ì¤ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 \fIsuffix\fR
-(ÌõÃí: \fIlength\fR ¤¬Àµ¤·¤¤¤È»×¤ï¤ì¤Þ¤¹)
-¤ÎÉ¾²Á·ë²Ì¤¬É¾²Á¤µ¤ì¤¿¥Ç¡¼¥¿¤ÎÄ¹¤µ¤è¤êÂç¤¤¤¾ì¹ç¡¢
-É¾²Á¤µ¤ì¤¿¥Ç¡¼¥¿¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
+(ï¿½ï¿½ï¿½ï¿½: \fIlength\fR ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È»×¤ï¿½ï¿½Þ¤ï¿½)
+ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¤¿ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½Ä¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ç¤ï¿½ï¿½ï¿½ï¿½ç¡¢
+É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¤¿ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .\" horikawa@jp.FreeBSD.org 2002/04/29
 .RE
 .PP
 .B option \fIoption-name\fR
 .PP
 .RS 0.25i
-\fBoption\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢¥µ¡¼¥Ð¤¬±þÅú½èÍýÃæ¤Î¥Ñ¥±¥Ã¥È¤ÎÃæ¤Î¡¢
-»ØÄê¤·¤¿¥ª¥×¥·¥ç¥ó¤ÎÆâÍÆ¤òÊÖ¤·¤Þ¤¹¡£
+\fBoption\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Î¥Ñ¥ï¿½ï¿½Ã¥È¤ï¿½ï¿½ï¿½Î¡ï¿½
+ï¿½ï¿½ï¿½ê¤·ï¿½ï¿½ï¿½ï¿½ï¿½×¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B config-option \fIoption-name\fR
 .PP
 .RS 0.25i
-\fBconfig-option\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢»ØÄê¤·¤¿¥ª¥×¥·¥ç¥ó¤ËÂÐ¤·¡¢
-DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Þ¤¿¤Ï¥µ¡¼¥Ð¤¬Á÷½Ð¤¹¤ë¤è¤¦ÀßÄê¤µ¤ì¤¿ÃÍ¤òÊÖ¤·¤Þ¤¹¡£
+\fBconfig-option\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½ê¤·ï¿½ï¿½ï¿½ï¿½ï¿½×¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½
+DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Þ¤ï¿½ï¿½Ï¥ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½è¤¦ï¿½ï¿½ï¿½ê¤µï¿½ì¤¿ï¿½Í¤ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B hardware
 .PP
 .RS 0.25i
-\fBhardware\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢¥Ç¡¼¥¿¥¹¥È¥ê¥ó¥°¤òÊÖ¤·¤Þ¤¹¡£
-¥Ç¡¼¥¿¥¹¥È¥ê¥ó¥°¤ÎºÇ½é¤ÎÍ×ÁÇ¤Ï¡¢
-ÂÐ¾Ý¥Ñ¥±¥Ã¥È¤¬¼¨¤¹¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î¥¿¥¤¥×¤Ç¤¢¤ê¡¢
-¸åÂ³¤¹¤ëÍ×ÁÇ¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥ó¥¯ÁØ¥¢¥É¥ì¥¹¤Ç¤¹¡£
-¥Ñ¥±¥Ã¥È¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤â¤·¤¯¤Ï RFC2131 \fIhlen\fR ¥Õ¥£¡¼¥ë¥É¤¬Ìµ¸ú¤Ê¾ì¹ç¡¢
-·ë²Ì¤Ï¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
-¥Ï¡¼¥É¥¦¥§¥¢¥¿¥¤¥×¤Ë¤Ï¡¢¥¤¡¼¥µ¥Í¥Ã¥È (1)¡¢¥È¡¼¥¯¥ó¥ê¥ó¥° (6)¡¢
-FDDI (8) ¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-¥Ï¡¼¥É¥¦¥§¥¢¥¿¥¤¥×¤Ï IETF ¤Ë¤è¤Ã¤Æµ¬Äê¤µ¤ì¡¢
-¤É¤Î¤è¤¦¤Ë¥¿¥¤¥×¤Î¿ôÃÍ¤¬ÄêµÁ¤µ¤ì¤ë¤«¤Î¾ÜºÙ¤Ï RFC2131
-(ISC DHCP ÇÛÉÛÊª¤Ç¤Ï¡¢doc/ ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹) ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+\fBhardware\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¥ï¿½ó¥°¤ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¥ï¿½ó¥°¤ÎºÇ½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ï¡ï¿½
+ï¿½Ð¾Ý¥Ñ¥ï¿½ï¿½Ã¥È¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Í¥Ã¥È¥ï¡¼ï¿½ï¿½ï¿½ï¿½ï¿½ó¥¿¥Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Î¥ï¿½ï¿½ï¿½ï¿½×¤Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½Â³ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ï¡ï¿½ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Î¥ï¿½ï¿½ï¿½Ø¥ï¿½ï¿½É¥ì¥¹ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½Ñ¥ï¿½ï¿½Ã¥È¤ï¿½Â¸ï¿½ß¤ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½ï¿½â¤·ï¿½ï¿½ï¿½ï¿½ RFC2131 \fIhlen\fR ï¿½Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½É¤ï¿½Ìµï¿½ï¿½ï¿½Ê¾ï¿½ç¡¢
+ï¿½ï¿½Ì¤Ï¶ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Ï¡ï¿½ï¿½É¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½×¤Ë¤Ï¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Í¥Ã¥ï¿½ (1)ï¿½ï¿½ï¿½È¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ (6)ï¿½ï¿½
+FDDI (8) ï¿½ï¿½ï¿½Þ¤Þ¤ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Ï¡ï¿½ï¿½É¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½×¤ï¿½ IETF ï¿½Ë¤ï¿½Ã¤Æµï¿½ï¿½ê¤µï¿½ì¡¢
+ï¿½É¤Î¤è¤¦ï¿½Ë¥ï¿½ï¿½ï¿½ï¿½×¤Î¿ï¿½ï¿½Í¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ë¤«ï¿½Î¾ÜºÙ¤ï¿½ RFC2131
+(ISC DHCP ï¿½ï¿½ï¿½ï¿½Êªï¿½Ç¤Ï¡ï¿½doc/ ï¿½ï¿½ï¿½Ö¥Ç¥ï¿½ï¿½ì¥¯ï¿½È¥ï¿½Ë¤ï¿½ï¿½ï¿½Þ¤ï¿½) ï¿½ò»²¾È¤ï¿½ï¿½Æ¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
 .RE
 .PP
 .B packet (\fIoffset\fB, \fIlength\fB)\fR
 .PP
 .RS 0.25i
-\fBpacket\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢ÂÐ¾Ý¥Ñ¥±¥Ã¥È¤Î»ØÄêÉôÊ¬¤òÊÖ¤¹¤«¡¢
-ÂÐ¾Ý¥Ñ¥±¥Ã¥È¤¬Ìµ¤¤Ê¸Ì®¤Ç¤Ï¶õ¤òÊÖ¤·¤Þ¤¹¡£
-\fIoffset\fR ¤È \fIlength\fR ¤Ï¡¢
-\fBsubstring\fR ¥ª¥Ú¥ì¡¼¥¿¤ÈÆ±ÍÍ¤Ë¡¢¥Ñ¥±¥Ã¥È¤ÎÆâÍÆ¤ËÅ¬ÍÑ¤µ¤ì¤Þ¤¹¡£
+\fBpacket\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½Ð¾Ý¥Ñ¥ï¿½ï¿½Ã¥È¤Î»ï¿½ï¿½ï¿½ï¿½ï¿½Ê¬ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½Ð¾Ý¥Ñ¥ï¿½ï¿½Ã¥È¤ï¿½Ìµï¿½ï¿½Ê¸Ì®ï¿½Ç¤Ï¶ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+\fIoffset\fR ï¿½ï¿½ \fIlength\fR ï¿½Ï¡ï¿½
+\fBsubstring\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½ï¿½Æ±ï¿½Í¤Ë¡ï¿½ï¿½Ñ¥ï¿½ï¿½Ã¥È¤ï¿½ï¿½ï¿½ï¿½Æ¤ï¿½Å¬ï¿½Ñ¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .I string
 .PP
 .RS 0.25i
-¥¯¥©¡¼¥È¤Ç³ç¤é¤ì¤¿¥¹¥È¥ê¥ó¥°¤Ï¥Ç¡¼¥¿¼°¤È¤·¤Æ»ØÄê²ÄÇ½¤Ç¤¢¤ê¡¢
-¥¯¥©¡¼¥È¤Î´Ö¤ò ASCII ¥¨¥ó¥³¡¼¥É¤·¤¿¤Î¥Æ¥¥¹¥È¤òÊÖ¤·¤Þ¤¹¡£
-¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å ('\\') Ê¸»ú¤Ï C ¥×¥í¥°¥é¥à¤Î¤è¤¦¤ËÆÃÊÌ°·¤¤¤µ¤ì¤Þ¤¹:
-¤¹¤Ê¤ï¤Á '\\t' ¤Ï¥¿¥Ö¤ò¡¢'\\r' ¤ÏÉü²þ¤ò¡¢'\\n' ¤Ï²þ¹Ô¤ò¡¢'\\b' ¤Ï¥Ù¥ë¤ò
-°ÕÌ£¤·¤Þ¤¹¡£
-8 ¿Ê¿ôÃÍ¤Ï '\\nnn' ¤Ç»ØÄê²ÄÇ½¤Ç¤¢¤ê¡¢nnn ¤Ï 0 °Ê¾å 0377 °Ê²¼¤Î 8 ¿Ê¿ôÃÍ¤Ç¤¹¡£
-16 ¿Ê¿ôÃÍ¤Ï '\\xnn' ¤Ç»ØÄê²ÄÇ½¤Ç¤¢¤ê¡¢nn ¤Ï 0 °Ê¾å 0xff °Ê²¼¤Î 16 ¿Ê¿ôÃÍ¤Ç¤¹¡£
-.\" ÃÍ¤ÎÈÏ°Ï¤Î¸í¤ê¤Ë¤Ä¤¤¤Æ¤Ï¡¢Murray ·ÐÍ³¤Ç¥ì¥Ý¡¼¥ÈºÑ
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¤Ç³ï¿½ï¿½ì¤¿ï¿½ï¿½ï¿½È¥ï¿½ó¥°¤Ï¥Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½Æ»ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¤Î´Ö¤ï¿½ ASCII ï¿½ï¿½ï¿½ó¥³¡ï¿½ï¿½É¤ï¿½ï¿½ï¿½ï¿½Î¥Æ¥ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Ð¥Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ ('\\') Ê¸ï¿½ï¿½ï¿½ï¿½ C ï¿½×¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Î¤è¤¦ï¿½ï¿½ï¿½ï¿½ï¿½Ì°ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½:
+ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½ '\\t' ï¿½Ï¥ï¿½ï¿½Ö¤ï¿½'\\r' ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½'\\n' ï¿½Ï²ï¿½ï¿½Ô¤ï¿½'\\b' ï¿½Ï¥Ù¥ï¿½ï¿½
+ï¿½ï¿½Ì£ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+8 ï¿½Ê¿ï¿½ï¿½Í¤ï¿½ '\\nnn' ï¿½Ç»ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ê¡¢nnn ï¿½ï¿½ 0 ï¿½Ê¾ï¿½ 0377 ï¿½Ê²ï¿½ï¿½ï¿½ 8 ï¿½Ê¿ï¿½ï¿½Í¤Ç¤ï¿½ï¿½ï¿½
+16 ï¿½Ê¿ï¿½ï¿½Í¤ï¿½ '\\xnn' ï¿½Ç»ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ê¡¢nn ï¿½ï¿½ 0 ï¿½Ê¾ï¿½ 0xff ï¿½Ê²ï¿½ï¿½ï¿½ 16 ï¿½Ê¿ï¿½ï¿½Í¤Ç¤ï¿½ï¿½ï¿½
+.\" ï¿½Í¤ï¿½ï¿½Ï°Ï¤Î¸ï¿½ï¿½ï¿½Ë¤Ä¤ï¿½ï¿½Æ¤Ï¡ï¿½Murray ï¿½ï¿½Í³ï¿½Ç¥ï¿½Ý¡ï¿½ï¿½Èºï¿½
 .\" horikawa@jp.FreeBSD.org 2002/05/01
 .RE
 .PP
 .I colon-separated hexadecimal list
 .PP
 .RS 0.25i
-¥³¥í¥ó¤Ç¶èÀÚ¤é¤ì¤¿ 16 ¿Ê¿ô¤Î¥ª¥¯¥Æ¥Ã¥ÈÃÍ¤Î¥ê¥¹¥È¤ò¡¢
-¥Ç¡¼¥¿¼°¤È¤·¤Æ»ØÄê²ÄÇ½¤Ç¤¹¡£
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¶ï¿½ï¿½Ú¤ï¿½ì¤¿ 16 ï¿½Ê¿ï¿½ï¿½Î¥ï¿½ï¿½ï¿½ï¿½Æ¥Ã¥ï¿½ï¿½Í¤Î¥ê¥¹ï¿½È¤ï¿½
+ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½Æ»ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B concat (\fIdata-expr1\fB, ..., \fIdata-exprN\fB)\fR
 .RS 0.25i
-¼°¤¬É¾²Á¤µ¤ì¡¢³ÆÉ¾²Á·ë²Ì¤¬¥µ¥Ö¼°¤Î½çÈÖ¤ËÏ¢·ë¤µ¤ì¤Þ¤¹¡£
-¥µ¥Ö¼°¤Î¤¤¤º¤ì¤«¤ÎÉ¾²Á·ë²Ì¤¬¶õ¤Ë¤Ê¤ë¾ì¹ç¡¢Ï¢·ë¤Î·ë²Ì¤Ï¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
+ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¡¢ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Ö¼ï¿½ï¿½Î½ï¿½ï¿½Ö¤ï¿½Ï¢ï¿½ë¤µï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ö¼ï¿½ï¿½Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½ï¿½ç¡¢Ï¢ï¿½ï¿½Î·ï¿½Ì¤Ï¶ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B reverse (\fInumeric-expr1\fB, \fIdata-expr2\fB)\fR
 .RS 0.25i
-2 ¸Ä¤Î¼°¤¬É¾²Á¤µ¤ì¡¢¥Ç¡¼¥¿¼°¤ÎÉ¾²Á·ë²Ì¤¬¤½¤Î¾ì¤ÇÈ¿Å¾¤µ¤ì¤Þ¤¹¡£
-È¿Å¾¤Ï¡¢¿ôÃÍ¼°¤Ç»ØÄê¤µ¤ì¤ëÂç¤¤µ¤ÎÃ±°Ì¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
-Îã¤¨¤Ð¡¢¿ôÃÍ¼°¤ÎÉ¾²Á·ë²Ì¤¬ 4 ¤Î¾ì¹ç¤Ç¡¢
-¥Ç¡¼¥¿¼°¤ÎÉ¾²Á·ë²Ì¤¬ 12 ¥Ð¥¤¥È¤Ë¤Ê¤ë¾ì¹ç¡¢
-reverse ¼°¤ÎÉ¾²Á·ë²Ì¤Ï¡¢¼¡¤Î¤è¤¦¤Ê 12 ¥Ð¥¤¥È¤Î¥Ç¡¼¥¿¤Ë¤Ê¤ê¤Þ¤¹¡£
-¤¹¤Ê¤ï¤Á¡¢ÆþÎÏ¤ÎºÇ¸å¤Î 4 ¥Ð¥¤¥È¡¢¿¿Ãæ¤Î 4¥Ð¥¤¥È¡¢ºÇ½é¤Î 4 ¥Ð¥¤¥È¤Î
-½ç¤Ë¤Ê¤ê¤Þ¤¹¡£
+2 ï¿½Ä¤Î¼ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¡¢ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ï¿½È¿Å¾ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+È¿Å¾ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½Í¼ï¿½ï¿½Ç»ï¿½ï¿½ê¤µï¿½ï¿½ï¿½ï¿½ç¤ï¿½ï¿½ï¿½ï¿½Ã±ï¿½Ì¤Ç¹Ô¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ã¤¨ï¿½Ð¡ï¿½ï¿½ï¿½ï¿½Í¼ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ 4 ï¿½Î¾ï¿½ï¿½Ç¡ï¿½
+ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ 12 ï¿½Ð¥ï¿½ï¿½È¤Ë¤Ê¤ï¿½ï¿½ç¡¢
+reverse ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤Ï¡ï¿½ï¿½ï¿½ï¿½Î¤è¤¦ï¿½ï¿½ 12 ï¿½Ð¥ï¿½ï¿½È¤Î¥Ç¡ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ï¤ÎºÇ¸ï¿½ï¿½ 4 ï¿½Ð¥ï¿½ï¿½È¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 4ï¿½Ð¥ï¿½ï¿½È¡ï¿½ï¿½Ç½ï¿½ï¿½ 4 ï¿½Ð¥ï¿½ï¿½È¤ï¿½
+ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B leased-address
 .RS 0.25i
-¤¤¤«¤Ê¤ëÊ¸Ì®¤Ë¤ª¤¤¤Æ¤â¡¢
-Í×µá½èÍýÂÐ¾Ý¤È¤Ê¤Ã¤Æ¤¤¤ë¥¯¥é¥¤¥¢¥ó¥È¤Ë IP ¥¢¥É¥ì¥¹¤¬³ä¤êÅö¤ÆºÑ¤Î¾ì¹ç¡¢
-¤½¤Î IP ¥¢¥É¥ì¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
+ï¿½ï¿½ï¿½ï¿½ï¿½Ê¤ï¿½Ê¸Ì®ï¿½Ë¤ï¿½ï¿½ï¿½ï¿½Æ¤â¡¢
+ï¿½×µï¿½ï¿½ï¿½ï¿½ï¿½Ð¾Ý¤È¤Ê¤Ã¤Æ¤ï¿½ï¿½ë¥¯ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ÆºÑ¤Î¾ï¿½ç¡¢
+ï¿½ï¿½ï¿½ï¿½ IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B binary-to-ascii (\fInumeric-expr1\fB, \fInumeric-expr2\fB,
 .B \fIdata-expr1\fB,\fR \fIdata-expr2\fB)\fR
 .RS 0.25i
-data-expr2 ¤ÎÉ¾²Á·ë²Ì¤ò¥Æ¥¥¹¥È¥¹¥È¥ê¥ó¥°¤ËÊÑ´¹¤·¤Þ¤¹¡£
-¤³¤Î¥Æ¥¥¹¥È¥¹¥È¥ê¥ó¥°Ãæ¤Ç¤Ï¡¢
-data-expr2 ¤ÎÉ¾²Á·ë²Ì¤Î³ÆÍ×ÁÇ¤¬¡¢1 ¸Ä¤Î¿ôÃÍ¤Ë¤Ê¤ê¤Þ¤¹¡£
-³Æ¿ôÃÍ¤Ï¡¢¤½¤ì¤¾¤ì¡¢data-expr1 ¤ÎÉ¾²Á·ë²Ì¤Ë¤è¤Ã¤Æ¶èÀÚ¤é¤ì¤Þ¤¹¡£
-numeric-expr1 ¤ÎÉ¾²Á·ë²Ì¤Ï¡¢´ð¿ô (2 ¤«¤é 16) ¤Ç¤¢¤ê¡¢
-¤³¤Î´ð¿ô¤Ë¿ôÃÍ¤¬ÊÑ´¹¤µ¤ì¤Þ¤¹¡£
-numeric-expr2 ¤ÎÉ¾²Á·ë²Ì¤Ï¡¢³Æ¿ôÃÍ¤Î¥Ó¥Ã¥ÈÉý¤Ç¤¢¤ê¡¢
-8, 16, 32 ¤Î¤¤¤º¤ì¤«¤Ç¤¹¡£
-.PP
-ºÇ½é¤Î 3 ¸Ä¤Î¥¿¥¤¥×¤Î¼°¤ÎÎã¤È¤·¤Æ¡¢
-¥¯¥é¥¤¥¢¥ó¥È¤Ë³ä¤êÅö¤Æ¤é¤ì¤¿ IP ¥¢¥É¥ì¥¹ÍÑ¤Î
-PTR ¥ì¥³¡¼¥É¤ÎÌ¾Á°¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë»ÈÍÑ²ÄÇ½¤Ê¼°¤ò¼¨¤·¤Þ¤¹
+data-expr2 ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½Æ¥ï¿½ï¿½ï¿½ï¿½È¥ï¿½ï¿½È¥ï¿½ó¥°¤ï¿½ï¿½Ñ´ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¥Æ¥ï¿½ï¿½ï¿½ï¿½È¥ï¿½ï¿½È¥ï¿½ï¿½ï¿½ï¿½Ç¤Ï¡ï¿½
+data-expr2 ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤Î³ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½1 ï¿½Ä¤Î¿ï¿½ï¿½Í¤Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Æ¿ï¿½ï¿½Í¤Ï¡ï¿½ï¿½ï¿½ï¿½ì¤¾ï¿½ì¡¢data-expr1 ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤Ë¤ï¿½Ã¤Æ¶ï¿½ï¿½Ú¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+numeric-expr1 ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤Ï¡ï¿½ï¿½ï¿½ï¿½ (2 ï¿½ï¿½ï¿½ï¿½ 16) ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½Î´ï¿½ï¿½ï¿½Ë¿ï¿½ï¿½Í¤ï¿½ï¿½Ñ´ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+numeric-expr2 ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤Ï¡ï¿½ï¿½Æ¿ï¿½ï¿½Í¤Î¥Ó¥Ã¥ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ê¡¢
+8, 16, 32 ï¿½Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½Ç¤ï¿½ï¿½ï¿½
+.PP
+ï¿½Ç½ï¿½ï¿½ 3 ï¿½Ä¤Î¥ï¿½ï¿½ï¿½ï¿½×¤Î¼ï¿½ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½Æ¡ï¿½
+ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Ë³ï¿½ï¿½ï¿½ï¿½ï¿½Æ¤ï¿½ì¤¿ IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½Ñ¤ï¿½
+PTR ï¿½ì¥³ï¿½ï¿½ï¿½É¤ï¿½Ì¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ë¤¿ï¿½ï¿½Ë»ï¿½ï¿½Ñ²ï¿½Ç½ï¿½Ê¼ï¿½ï¿½ò¼¨¤ï¿½ï¿½Þ¤ï¿½
 .RE
 .PP
 .nf
@@ -301,182 +301,182 @@
 .PP
 .B encode-int (\fInumeric-expr\fB, \fIwidth\fB)\fR
 .RS 0.25i
-¿ôÃÍ¼°¤¬É¾²Á¤µ¤ì¡¢»ØÄê¤µ¤ì¤¿Éý¤Î¥Ç¡¼¥¿¥¹¥È¥ê¥ó¥°¤Ë
-¥Í¥Ã¥È¥ï¡¼¥¯¥Ð¥¤¥È½ç (ºÇ¾å°Ì¥Ð¥¤¥È¤¬ºÇ½é) ¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹¡£
-¿ôÃÍ¼°¤ÎÉ¾²Á·ë²Ì¤¬¶õ¤ÎÃÍ¤Ë¤Ê¤ë¾ì¹ç¡¢·ë²Ì¤â¤Þ¤¿¶õ¤Ç¤¹¡£
+ï¿½ï¿½ï¿½Í¼ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¡¢ï¿½ï¿½ï¿½ê¤µï¿½ì¤¿ï¿½ï¿½ï¿½Î¥Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¥ï¿½ó¥°¤ï¿½
+ï¿½Í¥Ã¥È¥ï¡¼ï¿½ï¿½ï¿½Ð¥ï¿½ï¿½È½ï¿½ (ï¿½Ç¾ï¿½Ì¥Ð¥ï¿½ï¿½È¤ï¿½ï¿½Ç½ï¿½) ï¿½Ç¥ï¿½ï¿½ó¥³¡ï¿½ï¿½É¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Í¼ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Í¤Ë¤Ê¤ï¿½ï¿½ç¡¢ï¿½ï¿½Ì¤ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
 .RE
-.\" ¤³¤Î ".RE" ¤¬Ìµ¤¤¤È¡¢¥¤¥ó¥Ç¥ó¥È¤¬Àµ¤·¤¯¤Ê¤¤¤Ç¤¹
+.\" ï¿½ï¿½ï¿½ï¿½ ".RE" ï¿½ï¿½Ìµï¿½ï¿½ï¿½È¡ï¿½ï¿½ï¿½ï¿½ï¿½Ç¥ï¿½È¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½Ç¤ï¿½
 .\" horikawa@jp.FreeBSD.org 2002/04/29
 .PP
 .B pick-first-value (\fIdata-expr1\fR ... \fIexpr\fRn \fB)\fR
 .RS 0.25i
-pick-first-value ´Ø¿ô¤Ï¡¢Ç¤°Õ¸Ä¤Î¥Ç¡¼¥¿¼°¤ò¼è¤êÆÀ¤Þ¤¹¡£
-¥ê¥¹¥È¤ÎÀèÆ¬¤«¤é³Æ¼°¤¬É¾²Á¤µ¤ì¡¢
-É¾²Á·ë²Ì¤¬¶õ¤Ç¤Ï¤Ê¤¤¼°¤¬¸«ÉÕ¤«¤ë¤Þ¤Ç¤³¤ì¤¬Â³¤¤Þ¤¹¡£
-¤³¤Î¼°¤¬ÊÖ¤µ¤ì¡¢¤³¤Î¼°¤Ë¸åÂ³¤¹¤ë¼°¤ÏÉ¾²Á¤µ¤ì¤Þ¤»¤ó¡£
-¤¹¤Ù¤Æ¤Î¼°¤ÎÉ¾²Á·ë²Ì¤¬¶õ¤Î¾ì¹ç¡¢¶õ¤ÎÃÍ¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
+pick-first-value ï¿½Ø¿ï¿½ï¿½Ï¡ï¿½Ç¤ï¿½Õ¸Ä¤Î¥Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ê¥¹ï¿½È¤ï¿½ï¿½ï¿½Æ¬ï¿½ï¿½ï¿½ï¿½Æ¼ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ì¡¢
+É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Ç¤Ï¤Ê¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½ï¿½ï¿½Þ¤Ç¤ï¿½ï¿½ì¤¬Â³ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¼ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ì¡¢ï¿½ï¿½ï¿½Î¼ï¿½ï¿½Ë¸ï¿½Â³ï¿½ï¿½ï¿½ë¼°ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ù¤Æ¤Î¼ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½Î¾ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½ï¿½Í¤ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B host-decl-name
 .RS 0.25i
-host-decl-name ´Ø¿ô¤Ï¡¢¸½ºßÍ×µá½èÍýÂÐ¾Ý¤È¤Ê¤Ã¤Æ¤¤¤ë¥¯¥é¥¤¥¢¥ó¥È¤Ë¥Þ¥Ã¥Á¤¹¤ë¡¢
-¥Û¥¹¥ÈÀë¸À¤ÎÌ¾Á°¤òÊÖ¤·¤Þ¤¹¡£
-¤É¤Î¥Û¥¹¥ÈÀë¸À¤â¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç¡¢·ë²Ì¤Ï¶õ¤Ë¤Ê¤ê¤Þ¤¹¡£
+host-decl-name ï¿½Ø¿ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½×µï¿½ï¿½ï¿½ï¿½ï¿½Ð¾Ý¤È¤Ê¤Ã¤Æ¤ï¿½ï¿½ë¥¯ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Ë¥Þ¥Ã¥ï¿½ï¿½ï¿½ï¿½ë¡¢
+ï¿½Û¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ì¾ï¿½ï¿½ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½É¤Î¥Û¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¥Ã¥ï¿½ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½Ì¤Ï¶ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
-.SH ¿ôÃÍ¼°
-¿ôÃÍ¼°¤Ï¡¢É¾²Á·ë²Ì¤¬À°¿ô¤Ë¤Ê¤ë¼°¤Ç¤¹¡£
-°ìÈÌ¤Ë¡¢À°¿ô¤ÎºÇÂç¥µ¥¤¥º¤¬ 32 ¥Ó¥Ã¥ÈÌ¤Ëþ¤Ç¤¢¤ë¤È²¾Äê¤¹¤Ù¤¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
-À°¿ô¤ÎÀºÅÙ¤¬ 32 ¥Ó¥Ã¥È¤ò±Û¤¨¤ë¤³¤È¤Ï¤¢¤êÆÀ¤Þ¤¹¡£
+.SH ï¿½ï¿½ï¿½Í¼ï¿½
+ï¿½ï¿½ï¿½Í¼ï¿½ï¿½Ï¡ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ë¤Ê¤ë¼°ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ì¤Ë¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Îºï¿½ï¿½ç¥µï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 32 ï¿½Ó¥Ã¥ï¿½Ì¤ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½È²ï¿½ï¿½ê¤¹ï¿½Ù¤ï¿½ï¿½Ç¤Ï¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ó¤¬¡ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ù¤ï¿½ 32 ï¿½Ó¥Ã¥È¤ï¿½Û¤ï¿½ï¿½ë¤³ï¿½È¤Ï¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .PP
 .B extract-int (\fIdata-expr\fB, \fIwidth\fB)\fR
 .PP
 .RS 0.25i
-\fBextract-int\fR ¥ª¥Ú¥ì¡¼¥¿¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¥Ð¥¤¥È½ç¤ÎÀ°¿ô¤ò¡¢
-»ØÄê¤·¤¿¥Ç¡¼¥¿¼°¤ÎÉ¾²Á·ë²Ì¤«¤é¼è¤ê½Ð¤·¤Þ¤¹¡£
-Éý¤Ï¡¢¼è¤ê½Ð¤¹À°¿ô¤Î¥Ó¥Ã¥ÈÉý¤Ç¤¹¡£
-¸½ºß¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ëÉý¤Ï 8, 16, 32 ¤Î¤¤¤º¤ì¤«¤Ç¤¹¡£
-¥Ç¡¼¥¿¼°¤ÎÉ¾²Á·ë²Ì¤¬¡¢»ØÄê¤·¤¿Âç¤¤µ¤ÎÀ°¿ô¤È¼è¤ê½Ð¤¹¤Î¤Ë
-½½Ê¬¤Ê¥Ó¥Ã¥È¤òÄó¶¡¤·¤Ê¤¤¾ì¹ç¡¢¶õ¤ÎÃÍ¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
+\fBextract-int\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½Í¥Ã¥È¥ï¡¼ï¿½ï¿½ï¿½Ð¥ï¿½ï¿½È½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ê¤·ï¿½ï¿½ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Î¥Ó¥Ã¥ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ß¡ï¿½ï¿½ï¿½ï¿½Ý¡ï¿½ï¿½È¤ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 8, 16, 32 ï¿½Î¤ï¿½ï¿½ï¿½ï¿½ì¤«ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¾ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ê¤·ï¿½ï¿½ï¿½ç¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¼ï¿½ï¿½Ð¤ï¿½ï¿½Î¤ï¿½
+ï¿½ï¿½Ê¬ï¿½Ê¥Ó¥Ã¥È¤ï¿½ï¿½ó¶¡¤ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½ï¿½ï¿½Í¤ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B lease-time
 .PP
 .RS 0.25i
-¸½ºß¤Î¥ê¡¼¥¹¤Î´ü´Ö¤Ç¤¹¡£
-¤¹¤Ê¤ï¤Á¡¢¸½ºß¤Î»þ¹ï¤È¥ê¡¼¥¹¤Î´ü¸Â¤¬ÀÚ¤ì¤ë»þ¹ï¤È¤Îº¹¤Ç¤¹¡£
+ï¿½ï¿½ï¿½ß¤Î¥ê¡¼ï¿½ï¿½ï¿½Î´ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ß¤Î»ï¿½ï¿½ï¿½È¥ê¡¼ï¿½ï¿½ï¿½Î´ï¿½ï¿½Â¤ï¿½ï¿½Ú¤ï¿½ï¿½ï¿½ï¿½ï¿½È¤Îºï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .I number
 .PP
 .RS 0.25i
-0 ¤«¤éÉ½¸½²ÄÇ½¤ÊºÇÂç¥µ¥¤¥º¤ÎÈÏ°Ï¤ÎÇ¤°Õ¤Î¿ôÃÍ¤ò¡¢¿ôÃÍ¼°¤È¤·¤Æ»ØÄê²ÄÇ½¤Ç¤¹¡£
+0 ï¿½ï¿½ï¿½ï¿½É½ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Êºï¿½ï¿½ç¥µï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ï°Ï¤ï¿½Ç¤ï¿½Õ¤Î¿ï¿½ï¿½Í¤ò¡¢¿ï¿½ï¿½Í¼ï¿½ï¿½È¤ï¿½ï¿½Æ»ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ï¿½
 .RE
 .PP
 .B client-state
 .PP
 .RS 0.25i
-½èÍýÂÐ¾Ý¤Î¥¯¥é¥¤¥¢¥ó¥È¤Î¸½ºß¤Î¾õÂÖ¤Ç¤¹¡£
-DHCP ¥¯¥é¥¤¥¢¥ó¥ÈÀßÄê¥Õ¥¡¥¤¥ë¤Ë¤ª¤¤¤Æ¤Î¤ßÍÍÑ¤Ç¤¹¡£
-¼è¤êÆÀ¤ëÃÍ¤Ï¼¡¤ÎÄÌ¤ê¤Ç¤¹:
+ï¿½ï¿½ï¿½ï¿½ï¿½Ð¾Ý¤Î¥ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Î¸ï¿½ï¿½ß¤Î¾ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½Ë¤ï¿½ï¿½ï¿½ï¿½Æ¤Î¤ï¿½Íï¿½Ñ¤Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Í¤Ï¼ï¿½ï¿½ï¿½ï¿½Ì¤ï¿½Ç¤ï¿½:
 .TP 2
 .I \(bu
-Booting - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï INIT ¾õÂÖ¤Ç¤¢¤ê¡¢
-IP ¥¢¥É¥ì¥¹¤ò¤Þ¤À»ý¤Á¤Þ¤»¤ó¡£
-¼¡¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ï DHCPDISCOVER ¤Ç¤¢¤ê¡¢
-¤³¤ì¤Ï¥Ö¥í¡¼¥É¥¥ã¥¹¥È¤µ¤ì¤Þ¤¹¡£
+Booting - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ INIT ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ê¡¢
+IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ DHCPDISCOVER ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½ï¿½Ï¥Ö¥ï¿½ï¿½ï¿½ï¿½É¥ï¿½ï¿½ã¥¹ï¿½È¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .TP
 .I \(bu
-Reboot - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï INIT-REBOOT ¾õÂÖ¤Ç¤¹¡£
-IP ¥¢¥É¥ì¥¹¤ò»ý¤Á¤Þ¤¹¤¬¤Þ¤À»ÈÍÑ¤·¤Æ¤¤¤Þ¤»¤ó¡£
-¼¡¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ï DHCPREQUEST ¤Ç¤¢¤ê¡¢
-¤³¤ì¤Ï¥Ö¥í¡¼¥É¥¥ã¥¹¥È¤µ¤ì¤Þ¤¹¡£
-±þÅú¤¬²¿¤âÊ¹¤³¤¨¤Ê¤¤¤È¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¤³¤Î¥¢¥É¥ì¥¹¤Ë¥Ð¥¤¥ó¥É¤·¡¢
-BOUND ¾õÂÖ¤ËÁ«°Ü¤·¤Þ¤¹¡£
+Reboot - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ INIT-REBOOT ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ DHCPREQUEST ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½ï¿½Ï¥Ö¥ï¿½ï¿½ï¿½ï¿½É¥ï¿½ï¿½ã¥¹ï¿½È¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ê¹ï¿½ï¿½ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½È¡ï¿½ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Ï¤ï¿½ï¿½Î¥ï¿½ï¿½É¥ì¥¹ï¿½Ë¥Ð¥ï¿½ï¿½ï¿½É¤ï¿½ï¿½ï¿½
+BOUND ï¿½ï¿½ï¿½Ö¤ï¿½ï¿½ï¿½ï¿½Ü¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .TP
 .I \(bu
-Select - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï SELECTING ¾õÂÖ¤Ç¤¹¡£
-¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î DHCPOFFER ¥á¥Ã¥»¡¼¥¸¤Ï¼õ¿®¤·¤Þ¤·¤¿¤¬¡¢
-Â¾¤Î DHCPOFFER ¥á¥Ã¥»¡¼¥¸¤òÂ¾¤Î¥µ¡¼¥Ð¤«¤é¼õ¤±¼è¤ë¤«¤É¤¦¤«ÂÔ¤Ã¤Æ¤¤¤Þ¤¹¡£
-SELECTING ¾õÂÖ¤Ç¤Ï¥á¥Ã¥»¡¼¥¸¤ÏÁ÷¿®¤µ¤ì¤Þ¤»¤ó¡£
+Select - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ SELECTING ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½È¤ï¿½ 1 ï¿½Ä¤ï¿½ DHCPOFFER ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ï¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
+Â¾ï¿½ï¿½ DHCPOFFER ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Â¾ï¿½Î¥ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ë¤«ï¿½É¤ï¿½ï¿½ï¿½ï¿½Ô¤Ã¤Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+SELECTING ï¿½ï¿½ï¿½Ö¤Ç¤Ï¥ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .TP
 .I \(bu
-Request - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï REQUESTING ¾õÂÖ¤Ç¤¹¡£
-¾¯¤Ê¤¯¤È¤â 1 ¸Ä¤Î DHCPOFFER ¥á¥Ã¥»¡¼¥¸¤ò¼õ¿®¤·¡¢
-¤½¤Î¤¦¤Á¤Î¤É¤ì¤òÍ×µá¤¹¤ë¤«ÁªÂò¤·¤Þ¤·¤¿¡£
-¼¡¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ï DHCPREQUEST ¥á¥Ã¥»¡¼¥¸¤Ç¤¢¤ê¡¢
-¤³¤ì¤Ï¥Ö¥í¡¼¥É¥¥ã¥¹¥È¤µ¤ì¤Þ¤¹¡£
+Request - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ REQUESTING ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ê¤ï¿½ï¿½È¤ï¿½ 1 ï¿½Ä¤ï¿½ DHCPOFFER ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¤ï¿½ï¿½ï¿½ï¿½Î¤É¤ï¿½ï¿½ï¿½×µá¤¹ï¿½ë¤«ï¿½ï¿½ï¿½ò¤·¤Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ DHCPREQUEST ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½ï¿½Ï¥Ö¥ï¿½ï¿½ï¿½ï¿½É¥ï¿½ï¿½ã¥¹ï¿½È¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .TP
 .I \(bu
-Bound - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï BOUND ¾õÂÖ¤Ç¤¹¡£
-IP ¥¢¥É¥ì¥¹¤ò½êÍ¤·¤Æ¤¤¤Þ¤¹¡£
-¤³¤Î¾õÂÖ¤Ç¤Ï¥á¥Ã¥»¡¼¥¸¤ÏÁ÷¿®¤µ¤ì¤Þ¤»¤ó¡£
+Bound - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ BOUND ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½ï¿½Íï¿½ï¿½ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¾ï¿½ï¿½Ö¤Ç¤Ï¥ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .TP
 .I \(bu
-Renew - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï RENEWING ¾õÂÖ¤Ç¤¹¡£
-IP ¥¢¥É¥ì¥¹¤ò½êÍ¤·¤Æ¤ª¤ê¡¢¤³¤ì¤ò¹¹¿·¤¹¤ë¤¿¤á¤Ë¥µ¡¼¥Ð¤ËÀÜÂ³¤ò»î¤ß¤Æ¤¤¤Þ¤¹¡£
-¼¡¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ï DHCPREQUEST ¥á¥Ã¥»¡¼¥¸¤Ç¤¢¤ê¡¢
-¤³¤ì¤Ï¥µ¡¼¥Ð¤ËÄ¾ÀÜ¥æ¥Ë¥¥ã¥¹¥È¤µ¤ì¤Þ¤¹¡£
+Renew - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ RENEWING ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½ï¿½Íï¿½ï¿½ï¿½Æ¤ï¿½ï¿½ê¡¢ï¿½ï¿½ï¿½ï¿½ò¹¹¿ï¿½ï¿½ï¿½ï¿½ë¤¿ï¿½ï¿½Ë¥ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½Â³ï¿½ï¿½ï¿½ß¤Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ DHCPREQUEST ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½ï¿½Ï¥ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½Ä¾ï¿½Ü¥ï¿½Ë¥ï¿½ï¿½ã¥¹ï¿½È¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .TP
 .I \(bu
-Rebind - DHCP ¥¯¥é¥¤¥¢¥ó¥È¤Ï REBINDING ¾õÂÖ¤Ç¤¹¡£
-IP ¥¢¥É¥ì¥¹¤ò½êÍ¤·¤Æ¤ª¤ê¡¢
-¤³¤ì¤ò¹¹¿·¤¹¤ë¤¿¤á¤ËÇ¤°Õ¤Î¥µ¡¼¥Ð¤ËÀÜÂ³¤ò»î¤ß¤Æ¤¤¤Þ¤¹¡£
-¼¡¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ï DHCPREQUEST ¥á¥Ã¥»¡¼¥¸¤Ç¤¢¤ê¡¢
-¤³¤ì¤Ï¥Ö¥í¡¼¥É¥¥ã¥¹¥È¤µ¤ì¤Þ¤¹¡£
+Rebind - DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ REBINDING ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½ï¿½ï¿½
+IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½ï¿½Íï¿½ï¿½ï¿½Æ¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½ï¿½ò¹¹¿ï¿½ï¿½ï¿½ï¿½ë¤¿ï¿½ï¿½ï¿½Ç¤ï¿½Õ¤Î¥ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½Â³ï¿½ï¿½ï¿½ß¤Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ DHCPREQUEST ï¿½ï¿½Ã¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ê¡¢
+ï¿½ï¿½ï¿½ï¿½Ï¥Ö¥ï¿½ï¿½ï¿½ï¿½É¥ï¿½ï¿½ã¥¹ï¿½È¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
-.SH »²¾È: ¥í¥°
-¥í¥°Ê¸¤ò»ÈÍÑ¤·¤Æ¡¢É¸½à¥í¥°¥Á¥ã¥Í¥ë¤Ë¾ðÊó¤òÁ÷¿®²ÄÇ½¤Ç¤¹¡£
-¥í¥°Ê¸¤Ï¡¢¾ÊÎ¬²ÄÇ½¤Ê priority
-(\fBfatal\fR, \fBerror\fR, \fBinfo\fR, \fBdebug\fR ¤Î¤¤¤º¤ì¤«) ¤È¡¢
-¥Ç¡¼¥¿¼°¤ò¼è¤ê¤Þ¤¹¡£
+.SH ï¿½ï¿½ï¿½ï¿½: ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½Ê¸ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½Æ¡ï¿½É¸ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Í¥ï¿½Ë¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½Ê¸ï¿½Ï¡ï¿½ï¿½ï¿½Î¬ï¿½ï¿½Ç½ï¿½ï¿½ priority
+(\fBfatal\fR, \fBerror\fR, \fBinfo\fR, \fBdebug\fR ï¿½Î¤ï¿½ï¿½ï¿½ï¿½ì¤«) ï¿½È¡ï¿½
+ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .PP
 .B log (\fIpriority\fB, \fIdata-expr\fB)\fR
-.\" "\FB" ¤Ï "\fB" ¤¬Àµ¤·¤¤
+.\" "\FB" ï¿½ï¿½ "\fB" ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
 .\" horikawa@jp.FreeBSD.org 2002/04/29
 .PP
-¥í¥°Ê¸¤Ï¡¢Ã±°ì¤Î¥Ç¡¼¥¿¼°°ú¿ô¤Î¤ß¼è¤ê¤Þ¤¹¡£
-Ê£¿ô¤Î¥Ç¡¼¥¿ÃÍ¤ò½ÐÎÏ¤·¤¿¤¤¾ì¹ç¡¢
-\fBconcat\fR ¥ª¥Ú¥ì¡¼¥¿¤ò»ÈÍÑ¤·¤Æ¤½¤ì¤é¤òÏ¢·ë¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹¡£
+ï¿½ï¿½ï¿½ï¿½Ê¸ï¿½Ï¡ï¿½Ã±ï¿½ï¿½Î¥Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Î¤ß¼ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+Ê£ï¿½ï¿½ï¿½Î¥Ç¡ï¿½ï¿½ï¿½ï¿½Í¤ï¿½ï¿½ï¿½Ï¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ç¡¢
+\fBconcat\fR ï¿½ï¿½ï¿½Ú¥ì¡¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½Æ¤ï¿½ï¿½ï¿½ï¿½ï¿½Ï¢ï¿½ë¤¹ï¿½ï¿½É¬ï¿½×¤ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
 .RE
-.SH »²¾È: Æ°Åª¤Ê DNS ¹¹¿·
-.PP
-DHCP ¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¤Ï¡¢
-Æ°Åª¤Ë¥É¥á¥¤¥ó¥Í¡¼¥à¥·¥¹¥Æ¥à¤ò¹¹¿·¤¹¤ëÇ½ÎÏ¤¬¤¢¤ê¤Þ¤¹¡£
-ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ë¡¢¤É¤Î¤è¤¦¤Ë¥É¥á¥¤¥ó¥Í¡¼¥à¥·¥¹¥Æ¥à¤ò¹¹¿·¤·¤ÆÍß¤·¤¤¤«¡¢
-ÄêµÁ²ÄÇ½¤Ç¤¹¡£
-¹¹¿·¤Ï RFC 2136 ¤Ë½¾¤Ã¤Æ¤¤¤ë¤¿¤á¡¢
-RFC 2136 ¤ò¥µ¥Ý¡¼¥È¤¹¤ë DNS ¥µ¡¼¥Ð¤Ï¡¢
-DHCP ¥µ¡¼¥Ð¤«¤é¤Î¹¹¿·¤ò¼õ¤±ÉÕ¤±²ÄÇ½¤È»×¤ï¤ì¤Þ¤¹¡£
-.SH ¥»¥¥å¥ê¥Æ¥£
-TSIG ¤ª¤è¤Ó DNSSEC ¤Ï¤Þ¤À¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-DHCP ¥µ¡¼¥Ð¤Þ¤¿¤Ï¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¹¹¿·¤ò¼õ¤±ÉÕ¤±¤ë¤è¤¦¤Ë
-DNS ¥µ¡¼¥Ð¤òÀßÄê¤¹¤ë¾ì¹ç¡¢¸¢¸Â¤ÎÌµ¤¤¹¹¿·¤ËÂÐ¤·¤Æ
-DNS ¥µ¡¼¥Ð¤ò»¯¤¹¤³¤È¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-¤³¤ì¤òÈò¤±¤ë¤¿¤á¤Ëº£¤¹¤°¤Ç¤¤ëºÇÎÉ¤ÎÊýË¡¤Ï¡¢
-IP ¥¢¥É¥ì¥¹¥Ù¡¼¥¹¤Î¥Ñ¥±¥Ã¥È¥Õ¥£¥ë¥¿¤ò»ÈÍÑ¤·¤Æ¡¢
-¸¢¸Â¤ÎÌµ¤¤¥Û¥¹¥È¤«¤é¤Î¹¹¿·Í×µáÈ¯¹Ô¤òÍÞ»ß¤¹¤ë¤³¤È¤Ç¤¹¡£
-ÌÀ¤é¤«¤Ë¡¢¸½¾õ¤Ç¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î¹¹¿·¤ËÂÐ¤¹¤ë¥»¥¥å¥ê¥Æ¥£¤òÄó¶¡¤¹¤ëÊýË¡¤Ï
-¤¢¤ê¤Þ¤»¤ó¡£
-¤³¤Î¤¿¤á¤Ë¤Ï TSIG ¤« DNSSEC ¤¬É¬Í×¤Ç¤¹¤¬¡¢
-¤³¤Î DHCP ÇÛÉÛÊª¤Ë¤Ï¤Þ¤À´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-.PP
-Æ°Åª DNS (DDNS) ¹¹¿·¤Ï¡¢\fBdns-update\fR ¼°¤ò»ÈÍÑ¤¹¤ë¤³¤È¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-\fBdns-update\fR ¼°¤Ï¡¢¥Ö¡¼¥ë¼°¤Ç¤¢¤ê¡¢4 ¸Ä¤Î¥Ñ¥é¥á¡¼¥¿¤ò¼è¤ê¤Þ¤¹¡£
-¹¹¿·¤ËÀ®¸ù¤¹¤ë¤È¡¢·ë²Ì¤Ï¿¿¤Ë¤Ê¤ê¤Þ¤¹¡£
-¼ºÇÔ¤¹¤ë¤È¡¢·ë²Ì¤Ïµ¶¤Ë¤Ê¤ê¤Þ¤¹¡£
-4 ¸Ä¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¡¢¥ê¥½¡¼¥¹¥ì¥³¡¼¥É¥¿¥¤¥× (RR)¡¢
-RR ¤Îº¸ÊÕ¡¢RR ¤Î±¦ÊÕ¡¢¥ì¥³¡¼¥É¤ËÅ¬ÍÑ¤µ¤ì¤ë¤Ù¤ ttl ¤Ç¤¹¡£
-¤³¤Î´Ø¿ô¤ÎºÇ¤â´ÊÃ±¤Ê»ÈÍÑÎã¤Ï¡¢dhcpd.conf ¥Õ¥¡¥¤¥ë¤Î»²¾ÈÀá¤Ë¤¢¤ê¡¢
-¤Ê¤Ë¤¬µ¯¤¤ë¤«µ½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-¤³¤ÎÎã¤Ç¤Ï¡¢Ê£¿ô¤Î¼°¤¬»ÈÍÑ¤µ¤ì¤Æ¡¢
-\fBdns-update\fR ÍÑ¤Î°ú¿ô¤¬ºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-.PP
-Îã¤ÎÃæ¤Ç¤Ï¡¢ºÇ½é¤Î \fBdns-update\fR ¼°¤Ø¤Î 1 ÈÖÌÜ¤Î°ú¿ô¤Ï¡¢
-A RR ¥¿¥¤¥×¤ËÉ¾²Á¤µ¤ì¤ë¥Ç¡¼¥¿¼°¤Ç¤¹¡£
-2 ÈÖÌÜ¤Î°ú¿ô¤Ï¡¢DHCP host-name ¥ª¥×¥·¥ç¥ó¤È
-¥í¡¼¥«¥ë¥É¥á¥¤¥ó¡¢¤³¤Î¾ì¹ç "ssd.example.net"¡¢
-¤ò´Þ¤à¥Æ¥¥¹¥È¥¹¥È¥ê¥ó¥°¤òÏ¢·ë¤¹¤ë¤³¤È¤Ç¡¢¹½ÃÛ¤µ¤ì¤Þ¤¹¡£
-3 ÈÖÌÜ¤Î°ú¿ô¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ë³ä¤êÅö¤Æ¤é¤ì¤¿¥¢¥É¥ì¥¹¤ò¡¢
-32 ¥Ó¥Ã¥È¤Î¿ôÃÍ¤«¤é³Æ¥Ð¥¤¥È¤ò "." ¤Ç¶èÀÚ¤Ã¤¿ ASCII Ê¸»úÎó¤ËÊÑ´¹¤¹¤ë¤³¤È¤Ç¡¢
-¹½ÃÛ¤µ¤ì¤Þ¤¹¡£
-4 ÈÖÌÜ¤Î°ú¿ô TTL ¤Ï¡¢¥ê¡¼¥¹¤Î»Ä¤ê»þ´Ö¤Ç¤¹
-(¤³¤ì¤ÏËÜÅö¤ÏÀµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£
-¤Ê¤¼¤Ê¤é DNS ¥µ¡¼¥Ð¤Ï¡¢Í×µá¤ËÂÐ¤·¤Æ¤¤¤Ä¤â¤³¤Î TTL ÃÍ¤ò½ÐÎÏ¤·¤Æ¤·¤Þ¤¦¤«¤é¤Ç¤¹¡£
-¤³¤ì¤Ï¡¢¥ê¡¼¥¹´ü¸ÂÀÚ¤ì¤Î¿ôÉÃÁ°¤Ç¤¢¤Ã¤Æ¤â¤Ç¤¹)¡£
-.PP
-ºÇ½é¤Î \fBdns-update\fR Ê¸¤¬À®¸ù¤¹¤ë¤È¡¢
-°ú¤Â³¤¤¤Æ 2 ÈÖÌÜ¤Î¹¹¿·¤Ë¤è¤ê PTR RR ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
-PTR ¥ì¥³¡¼¥É¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¡¢A RR ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÈÆ±ÍÍ¤Ç¤¹¤¬¡¢
-¥ì¥³¡¼¥É¤Îº¸ÊÕ¤Ï¥ê¡¼¥¹¤µ¤ì¤¿¥¢¥É¥ì¥¹¤òµÕ¤Ë¤·¤Æ ".in-addr.arpa" ¤È
-·ë¹ç¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£
-±¦ÊÕ¤Ï¡¢¥¢¥É¥ì¥¹¤Î¥ê¡¼¥¹Äó¶¡Àè¥¯¥é¥¤¥¢¥ó¥È¤Î¡¢´°Á´¤Ê·Á¤Ç¤Î¥É¥á¥¤¥óÌ¾¤Ç¤¹¡£
-.SH ´ØÏ¢¹àÌÜ
+.SH ï¿½ï¿½ï¿½ï¿½: Æ°Åªï¿½ï¿½ DNS ï¿½ï¿½ï¿½ï¿½
+.PP
+DHCP ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤È¥ï¿½ï¿½ï¿½ï¿½Ð¤Ï¡ï¿½
+Æ°Åªï¿½Ë¥É¥á¥¤ï¿½ï¿½Í¡ï¿½ï¿½à¥·ï¿½ï¿½ï¿½Æ¥ï¿½ò¹¹¿ï¿½ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ï¤ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ë¡ï¿½ï¿½É¤Î¤è¤¦ï¿½Ë¥É¥á¥¤ï¿½ï¿½Í¡ï¿½ï¿½à¥·ï¿½ï¿½ï¿½Æ¥ï¿½ò¹¹¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ß¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½Ç½ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ RFC 2136 ï¿½Ë½ï¿½ï¿½Ã¤Æ¤ï¿½ï¿½ë¤¿ï¿½á¡¢
+RFC 2136 ï¿½ò¥µ¥Ý¡ï¿½ï¿½È¤ï¿½ï¿½ï¿½ DNS ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤Ï¡ï¿½
+DHCP ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½Î¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½ï¿½ï¿½Ç½ï¿½È»×¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+.SH ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Æ¥ï¿½
+TSIG ï¿½ï¿½ï¿½ï¿½ï¿½ DNSSEC ï¿½Ï¤Þ¤ï¿½ï¿½ï¿½ï¿½Ý¡ï¿½ï¿½È¤ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+DHCP ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤Þ¤ï¿½ï¿½Ï¥ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤ï¿½ï¿½ï¿½Î¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Õ¤ï¿½ï¿½ï¿½è¤¦ï¿½ï¿½
+DNS ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½ï¿½ê¤¹ï¿½ï¿½ï¿½ç¡¢ï¿½ï¿½ï¿½Â¤ï¿½Ìµï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ï¿½
+DNS ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ò»¯¤ï¿½ï¿½ï¿½ï¿½È¤Ë¤Ê¤ë¤«ï¿½â¤·ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ò¤±¤ë¤¿ï¿½ï¿½Ëºï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½ï¿½ï¿½É¤ï¿½ï¿½ï¿½Ë¡ï¿½Ï¡ï¿½
+IP ï¿½ï¿½ï¿½É¥ì¥¹ï¿½Ù¡ï¿½ï¿½ï¿½ï¿½Î¥Ñ¥ï¿½ï¿½Ã¥È¥Õ¥ï¿½ï¿½ë¥¿ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½Æ¡ï¿½
+ï¿½ï¿½ï¿½Â¤ï¿½Ìµï¿½ï¿½ï¿½Û¥ï¿½ï¿½È¤ï¿½ï¿½ï¿½Î¹ï¿½ï¿½ï¿½ï¿½×µï¿½È¯ï¿½Ô¤ï¿½ï¿½Þ»ß¤ï¿½ï¿½ë¤³ï¿½È¤Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½é¤«ï¿½Ë¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ï¥ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Î¹ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤ï¿½ï¿½ë¥»ï¿½ï¿½ï¿½ï¿½ï¿½Æ¥ï¿½ï¿½ï¿½ï¿½ó¶¡¤ï¿½ï¿½ï¿½ï¿½ï¿½Ë¡ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î¤ï¿½ï¿½ï¿½Ë¤ï¿½ TSIG ï¿½ï¿½ DNSSEC ï¿½ï¿½É¬ï¿½×¤Ç¤ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ DHCP ï¿½ï¿½ï¿½ï¿½Êªï¿½Ë¤Ï¤Þ¤ï¿½ï¿½Þ¤Þ¤ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+.PP
+Æ°Åª DNS (DDNS) ï¿½ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½\fBdns-update\fR ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½ë¤³ï¿½È¤Ç¼Â¹Ô¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+\fBdns-update\fR ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½Ö¡ï¿½ï¿½ë¼°ï¿½Ç¤ï¿½ï¿½ê¡¢4 ï¿½Ä¤Î¥Ñ¥ï¿½á¡¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¡ï¿½ï¿½ï¿½Ì¤Ï¿ï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Ô¤ï¿½ï¿½ï¿½È¡ï¿½ï¿½ï¿½Ì¤Ïµï¿½ï¿½Ë¤Ê¤ï¿½Þ¤ï¿½ï¿½ï¿½
+4 ï¿½Ä¤Î¥Ñ¥ï¿½á¡¼ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ê¥½ï¿½ï¿½ï¿½ï¿½ï¿½ì¥³ï¿½ï¿½ï¿½É¥ï¿½ï¿½ï¿½ï¿½ï¿½ (RR)ï¿½ï¿½
+RR ï¿½Îºï¿½ï¿½Õ¡ï¿½RR ï¿½Î±ï¿½ï¿½Õ¡ï¿½ï¿½ì¥³ï¿½ï¿½ï¿½É¤ï¿½Å¬ï¿½Ñ¤ï¿½ï¿½ï¿½ï¿½Ù¤ï¿½ ttl ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Î´Ø¿ï¿½ï¿½ÎºÇ¤ï¿½ï¿½Ã±ï¿½Ê»ï¿½ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½dhcpd.conf ï¿½Õ¥ï¿½ï¿½ï¿½ï¿½ï¿½Î»ï¿½ï¿½ï¿½ï¿½ï¿½Ë¤ï¿½ï¿½ê¡¢
+ï¿½Ê¤Ë¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ë¤«ï¿½ï¿½ï¿½Ò¤ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ï¡ï¿½Ê£ï¿½ï¿½ï¿½Î¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ñ¤ï¿½ï¿½ï¿½Æ¡ï¿½
+\fBdns-update\fR ï¿½Ñ¤Î°ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+.PP
+ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤Ï¡ï¿½ï¿½Ç½ï¿½ï¿½ \fBdns-update\fR ï¿½ï¿½ï¿½Ø¤ï¿½ 1 ï¿½ï¿½ï¿½Ü¤Î°ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½
+A RR ï¿½ï¿½ï¿½ï¿½ï¿½×¤ï¿½É¾ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
+2 ï¿½ï¿½ï¿½Ü¤Î°ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½DHCP host-name ï¿½ï¿½ï¿½×¥ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½É¥á¥¤ï¿½ó¡¢¤ï¿½ï¿½Î¾ï¿½ï¿½ "ssd.example.net"ï¿½ï¿½
+ï¿½ï¿½Þ¤ï¿½Æ¥ï¿½ï¿½ï¿½ï¿½È¥ï¿½ï¿½È¥ï¿½ó¥°¤ï¿½Ï¢ï¿½ë¤¹ï¿½ë¤³ï¿½È¤Ç¡ï¿½ï¿½ï¿½ï¿½Û¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+3 ï¿½ï¿½ï¿½Ü¤Î°ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ï¿½ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Ë³ï¿½ï¿½ï¿½ï¿½ï¿½Æ¤ï¿½ì¤¿ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½
+32 ï¿½Ó¥Ã¥È¤Î¿ï¿½ï¿½Í¤ï¿½ï¿½ï¿½Æ¥Ð¥ï¿½ï¿½È¤ï¿½ "." ï¿½Ç¶ï¿½ï¿½Ú¤Ã¤ï¿½ ASCII Ê¸ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ñ´ï¿½ï¿½ï¿½ï¿½ë¤³ï¿½È¤Ç¡ï¿½
+ï¿½ï¿½ï¿½Û¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+4 ï¿½ï¿½ï¿½Ü¤Î°ï¿½ï¿½ï¿½ TTL ï¿½Ï¡ï¿½ï¿½ê¡¼ï¿½ï¿½ï¿½Î»Ä¤ï¿½ï¿½ï¿½Ö¤Ç¤ï¿½
+(ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+ï¿½Ê¤ï¿½ï¿½Ê¤ï¿½ DNS ï¿½ï¿½ï¿½ï¿½ï¿½Ð¤Ï¡ï¿½ï¿½×µï¿½ï¿½ï¿½Ð¤ï¿½ï¿½Æ¤ï¿½ï¿½Ä¤â¤³ï¿½ï¿½ TTL ï¿½Í¤ï¿½ï¿½ï¿½Ï¤ï¿½ï¿½Æ¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½ï¿½ê¡¼ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ú¤ï¿½Î¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ç¤ï¿½ï¿½Ã¤Æ¤ï¿½Ç¤ï¿½)ï¿½ï¿½
+.PP
+ï¿½Ç½ï¿½ï¿½ \fBdns-update\fR Ê¸ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¡ï¿½
+ï¿½ï¿½ï¿½ï¿½Â³ï¿½ï¿½ï¿½ï¿½ 2 ï¿½ï¿½ï¿½Ü¤Î¹ï¿½ï¿½ï¿½ï¿½Ë¤ï¿½ï¿½ PTR RR ï¿½ï¿½ï¿½ï¿½ï¿½ó¥¹¥È¡ï¿½ï¿½ë¤µï¿½ï¿½Þ¤ï¿½ï¿½ï¿½
+PTR ï¿½ì¥³ï¿½ï¿½ï¿½É¤Î¥ï¿½ï¿½ó¥¹¥È¡ï¿½ï¿½ï¿½Ï¡ï¿½A RR ï¿½Î¥ï¿½ï¿½ó¥¹¥È¡ï¿½ï¿½ï¿½ï¿½Æ±ï¿½Í¤Ç¤ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½ì¥³ï¿½ï¿½ï¿½É¤Îºï¿½ï¿½Õ¤Ï¥ê¡¼ï¿½ï¿½ï¿½ï¿½ï¿½ì¤¿ï¿½ï¿½ï¿½É¥ì¥¹ï¿½ï¿½Õ¤Ë¤ï¿½ï¿½ï¿½ ".in-addr.arpa" ï¿½ï¿½
+ï¿½ï¿½ç¤µï¿½ì¤¿ï¿½ï¿½Î¤Ç¤ï¿½ï¿½ï¿½
+ï¿½ï¿½ï¿½Õ¤Ï¡ï¿½ï¿½ï¿½ï¿½É¥ì¥¹ï¿½Î¥ê¡¼ï¿½ï¿½ï¿½ï¿½ï¿½è¥¯ï¿½é¥¤ï¿½ï¿½ï¿½ï¿½È¤Î¡ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ê·ï¿½ï¿½Ç¤Î¥É¥á¥¤ï¿½ï¿½Ì¾ï¿½Ç¤ï¿½ï¿½ï¿½
+.SH ï¿½ï¿½Ï¢ï¿½ï¿½ï¿½ï¿½
 dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcp-eval(5), dhcpd(8),
 dhclient(8), RFC2132, RFC2131
-.SH ºî¼Ô
+.SH ï¿½ï¿½ï¿½
 Internet Systems Consortium DHCP Distribution
-¤Ï¡¢Vixie Labs ¤È¤Î·ÀÌó¤Î¤â¤È¤Ç¡¢Ted Lemon ¤¬µ½Ò¤·¤Þ¤·¤¿¡£
-ËÜ¥×¥í¥¸¥§¥¯¥È¤Î»ñ¶â¤Ï¡¢Internet Systems Consortium ¤¬Äó¶¡¤·¤Þ¤·¤¿¡£
-Internet Systems Consortium ¤Ë´Ø¤¹¤ë¾ðÊó¤Ï¡¢
+ï¿½Ï¡ï¿½Vixie Labs ï¿½È¤Î·ï¿½ï¿½ï¿½Î¤ï¿½È¤Ç¡ï¿½Ted Lemon ï¿½ï¿½ï¿½ï¿½ï¿½Ò¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½
+ï¿½Ü¥×¥ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½È¤Î»ï¿½ï¿½Ï¡ï¿½Internet Systems Consortium ï¿½ï¿½ï¿½ó¶¡¤ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½ï¿½ï¿½
+Internet Systems Consortium ï¿½Ë´Ø¤ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½Ï¡ï¿½
 .B https://www.isc.org
-¤Ë¤¢¤ê¤Þ¤¹¡£
+ï¿½Ë¤ï¿½ï¿½ï¿½Þ¤ï¿½ï¿½ï¿½

_service:tar_scm:dhcp-4.4.2.tar.gz/doc/ja_JP.eucJP/dhcp-options.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/doc/ja_JP.eucJP/dhcp-options.5 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -147,8 +147,8 @@
   }
 am__installdirs = "$(DESTDIR)$(includedir)"
 HEADERS = $(nobase_include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -165,8 +165,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 A = @A@
@@ -196,6 +194,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -207,6 +207,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -427,7 +428,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/arpa/nameser.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/arpa/nameser.h Changed

@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 1983, 1989, 1993
 * The Regents of the University of California. All rights reserved.
- * 
+ *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
@@ -13,7 +13,7 @@
 * 3. Neither the name of the University nor the names of its contributors
 * may be used to endorse or promote products derived from this software
 * without specific prior written permission.
- * 
+ *
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -28,7 +28,7 @@
 */
 
 /*
- * Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1996-2003 by Internet Software Consortium
 *
 * Permission to use, copy, modify, and distribute this software for any
@@ -44,8 +44,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 */

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/cdefs.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/cdefs.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/config.h.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/config.h.in Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/ctrace.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/ctrace.h Changed

@@ -3,7 +3,7 @@
 Definitions for dhcp tracing facility... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 2001-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -61,7 +61,7 @@
 void trace_outpacket_input (trace_type_t *, unsigned, char *);
 void trace_outpacket_stop (trace_type_t *);
 ssize_t trace_packet_send (struct interface_info *,
-			 struct packet *, struct dhcp_packet *, size_t, 
+			 struct packet *, struct dhcp_packet *, size_t,
 			 struct in_addr,
 			 struct sockaddr_in *, struct hardware *);
 void trace_icmp_input_input (trace_type_t *, unsigned, char *);

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/dhcp.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/dhcp.h Changed

@@ -3,7 +3,7 @@
 Protocol structures... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -156,6 +156,7 @@
 #define DHO_AUTHENTICATE			90 /* RFC3118, was 210 */
 #define DHO_CLIENT_LAST_TRANSACTION_TIME	91
 #define DHO_ASSOCIATED_IP			92
+#define DHO_V6_ONLY_PREFERRED			108 /* RFC8925 */
 #define DHO_SUBNET_SELECTION			118 /* RFC3011! */
 #define DHO_DOMAIN_SEARCH			119 /* RFC3397 */
 #define DHO_VIVCO_SUBOPTIONS			124
@@ -201,4 +202,3 @@
 #define VENDOR_ISC_SUBOPTIONS		2495
 
 #endif /* DHCP_H */
-

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/dhcp6.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/dhcp6.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/dhcpd.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/dhcpd.h Changed

@@ -3,7 +3,7 @@
 Definitions for dhcpd... */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -877,6 +877,10 @@
 # define DEFAULT_ABANDON_LEASE_TIME 86400
 #endif
 
+#if !defined (MIN_V6ONLY_WAIT)
+# define MIN_V6ONLY_WAIT 300
+#endif
+
 #define PLM_IGNORE 0
 #define PLM_PREFER 1
 #define PLM_EXACT 2
@@ -1204,7 +1208,8 @@
 	S_RENEWING = 6,
 	S_REBINDING = 7,
 	S_DECLINING = 8,
-	S_STOPPED = 9
+	S_STOPPED = 9,
+	S_V6ONLY = 10
 };
 
 /* Possible pending client operations. */
@@ -3003,6 +3008,10 @@
 void state_stop (void *);
 void state_panic (void *);
 
+uint32_t check_v6only (struct packet *, struct client_state *);
+void start_v6only (struct client_state *, uint32_t);
+void finish_v6only (void *);
+
 void bind_lease (struct client_state *);
 
 void make_client_options (struct client_state *,
@@ -3901,4 +3910,3 @@
 #define FIND_POND6_PERCENT(count, percent)	\
 	((count) > (POND_TRACK_MAX / 100) ?	\
 	 ((count) / 100) * (percent) : ((count) * (percent)) / 100)
-

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/dhctoken.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/dhctoken.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/failover.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/failover.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/inet.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/inet.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/ldap_casa.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/ldap_casa.h Changed

@@ -1,38 +1,38 @@
 /* ldap_casa.h
- 
+
 Definition for CASA modules... */
 
 /* Copyright (c) 2006 Novell, Inc.
 
 * All rights reserved.
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- * 1.Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * 2.Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 3.Neither the name of ISC, ISC DHCP, nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission. 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1.Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2.Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3.Neither the name of ISC, ISC DHCP, nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
 
- * THIS SOFTWARE IS PROVIDED BY INTERNET SYSTEMS CONSORTIUM AND CONTRIBUTORS 
+ * THIS SOFTWARE IS PROVIDED BY INTERNET SYSTEMS CONSORTIUM AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ISC OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ISC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 
 * This file was written by S Kalyanasundaram <skalyanasundaram@novell.com>
 */
 
 /*
- * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1995-2003 by Internet Software Consortium
 *
 * Permission to use, copy, modify, and distribute this software for any
@@ -48,8 +48,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 */
@@ -69,7 +69,7 @@
 SSCS_SECRET_ID_T *sharedSecretID,
 uint32_t *credentialType,
 void *credential,
- SSCS_EXT_T *ext 
+ SSCS_EXT_T *ext
 );
 SSCS_TYPEDEF_LIBCALL(int, CASA_SetCredential_T)
 (
@@ -99,4 +99,3 @@
 
 #endif /* __LDAP_CASA_H__ */
 #endif /* LDAP_CASA_AUTH */
-

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/netinet/udp.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/netinet/udp.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/ns_name.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/ns_name.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/alloc.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/alloc.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/buffer.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/buffer.h Changed

@@ -3,7 +3,7 @@
 Definitions for the object management API protocol buffering... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -52,7 +52,7 @@
 	u_int16_t head, tail;		/* Buffers are organized in a ring. */
 	char buf OMAPI_BUF_SIZE;	/* The actual buffer is included in
 					 the buffer data structure. */
-} omapi_buffer_t;	
+} omapi_buffer_t;
 
 #define BUFFER_BYTES_FREE(x)	\
 	((x) -> tail > (x) -> head \
@@ -74,4 +74,3 @@
 isc_result_t omapi_connection_put_uint32 (omapi_object_t *, u_int32_t);
 isc_result_t omapi_connection_get_uint16 (omapi_object_t *, u_int16_t *);
 isc_result_t omapi_connection_put_uint16 (omapi_object_t *, u_int32_t);
-

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/convert.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/convert.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/hash.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/hash.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/isclib.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/isclib.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/omapip.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/omapip.h Changed

@@ -3,7 +3,7 @@
 Definitions for the object management API and protocol... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -93,7 +93,7 @@
 typedef struct __omapi_object_type_t {
 	const char *name;
 	struct __omapi_object_type_t *next;
-	
+
 	isc_result_t (*set_value) (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
 				 omapi_typed_data_t *);
@@ -284,7 +284,7 @@
 				 omapi_typed_data_t *);
 isc_result_t omapi_protocol_get_value (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
-				 omapi_value_t **); 
+				 omapi_value_t **);
 isc_result_t omapi_protocol_stuff_values (omapi_object_t *,
 					 omapi_object_t *,
 					 omapi_object_t *);
@@ -303,7 +303,7 @@
 isc_result_t omapi_protocol_listener_get_value (omapi_object_t *,
 						omapi_object_t *,
 						omapi_data_string_t *,
-						omapi_value_t **); 
+						omapi_value_t **);
 isc_result_t omapi_protocol_listener_destroy (omapi_object_t *,
 					 const char *, int);
 isc_result_t omapi_protocol_listener_signal (omapi_object_t *,
@@ -334,7 +334,7 @@
 					 omapi_typed_data_t *);
 isc_result_t omapi_connection_get_value (omapi_object_t *, omapi_object_t *,
 					 omapi_data_string_t *,
-					 omapi_value_t **); 
+					 omapi_value_t **);
 isc_result_t omapi_connection_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_connection_signal_handler (omapi_object_t *,
 					 const char *, va_list);
@@ -365,7 +365,7 @@
 				 omapi_typed_data_t *);
 isc_result_t omapi_listener_get_value (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
-				 omapi_value_t **); 
+				 omapi_value_t **);
 isc_result_t omapi_listener_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_listener_signal_handler (omapi_object_t *,
 					 const char *, va_list);
@@ -393,7 +393,7 @@
 				 omapi_data_string_t *,
 				 omapi_typed_data_t *);
 isc_result_t omapi_io_get_value (omapi_object_t *, omapi_object_t *,
-				 omapi_data_string_t *, omapi_value_t **); 
+				 omapi_data_string_t *, omapi_value_t **);
 isc_result_t omapi_io_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_io_signal_handler (omapi_object_t *, const char *, va_list);
 isc_result_t omapi_io_stuff_values (omapi_object_t *,
@@ -411,7 +411,7 @@
 				 omapi_typed_data_t *);
 isc_result_t omapi_generic_get_value (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
-				 omapi_value_t **); 
+				 omapi_value_t **);
 isc_result_t omapi_generic_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_generic_signal_handler (omapi_object_t *,
 					 const char *, va_list);
@@ -426,7 +426,7 @@
 				 omapi_typed_data_t *);
 isc_result_t omapi_message_get_value (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
-				 omapi_value_t **); 
+				 omapi_value_t **);
 isc_result_t omapi_message_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_message_signal_handler (omapi_object_t *,
 					 const char *, va_list);
@@ -448,7 +448,7 @@
 				 omapi_object_t *);
 isc_result_t omapi_auth_key_get_value (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
-				 omapi_value_t **); 
+				 omapi_value_t **);
 isc_result_t omapi_auth_key_stuff_values (omapi_object_t *,
 					 omapi_object_t *,
 					 omapi_object_t *);
@@ -520,9 +520,9 @@
 				 const char *, const char *);
 isc_result_t omapi_get_value (omapi_object_t *, omapi_object_t *,
 			 omapi_data_string_t *,
-			 omapi_value_t **); 
+			 omapi_value_t **);
 isc_result_t omapi_get_value_str (omapi_object_t *, omapi_object_t *,
-				 const char *, omapi_value_t **); 
+				 const char *, omapi_value_t **);
 isc_result_t omapi_stuff_values (omapi_object_t *,
 				 omapi_object_t *,
 				 omapi_object_t *);

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/omapip_p.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/omapip_p.h Changed

@@ -3,7 +3,7 @@
 Private master include file for the OMAPI library. */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -60,6 +60,9 @@
 #include <dst/dst.h>
 #include "result.h"
 
+/* Uncomment this to enable protocol level debug logs */
+/* #define DEBUG_PROTOCOL 1 */
+
 #include <omapip/convert.h>
 #include <omapip/hash.h>
 #include <omapip/omapip.h>
@@ -134,7 +137,7 @@
 
 typedef struct __omapi_protocol_object {
 	OMAPI_OBJECT_PREAMBLE;
-	u_int32_t header_size;		
+	u_int32_t header_size;
 	u_int32_t protocol_version;
 	u_int32_t next_xid;

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/result.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/result.h Changed

@@ -2,7 +2,7 @@
 */
 
 /*
- * Copyright (C) 2009-2017 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2022 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
@@ -17,8 +17,8 @@
 * PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 */
@@ -84,36 +84,36 @@
 #ifdef INCLUDE_OLD_DHCP_ISC_ERROR_CODES
 #define ISC_R_HOSTUNKNOWN	DHCP_R_HOSTUNKNOWN
 #define ISC_R_VERSIONMISMATCH	DHCP_R_VERSIONMISMATCH
-#define ISC_R_PROTOCOLERROR	DHCP_R_PROTOCOLERROR	
-#define ISC_R_INVALIDARG	DHCP_R_INVALIDARG	
-#define ISC_R_NOTYET		DHCP_R_NOTYET		
-#define ISC_R_UNCHANGED		DHCP_R_UNCHANGED		
-#define ISC_R_KEYCONFLICT	DHCP_R_KEYCONFLICT	
-#define ISC_R_BADPARSE		DHCP_R_BADPARSE		
-#define ISC_R_NOKEYS		DHCP_R_NOKEYS		
-#define ISC_R_KEY_UNKNOWN	DHCP_R_KEY_UNKNOWN	
-#define ISC_R_INVALIDKEY	DHCP_R_INVALIDKEY	
-#define ISC_R_INCOMPLETE	DHCP_R_INCOMPLETE	
-#define ISC_R_FORMERR		DHCP_R_FORMERR		
-#define ISC_R_SERVFAIL		DHCP_R_SERVFAIL		
-#define ISC_R_NXDOMAIN		DHCP_R_NXDOMAIN		
-#define ISC_R_NOTIMPL		DHCP_R_NOTIMPL		
-#define ISC_R_REFUSED		DHCP_R_REFUSED		
-#define ISC_R_YXDOMAIN		DHCP_R_YXDOMAIN		
-#define ISC_R_YXRRSET		DHCP_R_YXRRSET		
-#define ISC_R_NXRRSET		DHCP_R_NXRRSET		
-#define ISC_R_NOTAUTH		DHCP_R_NOTAUTH		
-#define ISC_R_NOTZONE		DHCP_R_NOTZONE		
-#define ISC_R_BADSIG		DHCP_R_BADSIG		
-#define ISC_R_BADKEY		DHCP_R_BADKEY		
-#define ISC_R_BADTIME		DHCP_R_BADTIME		
-#define ISC_R_NOROOTZONE	DHCP_R_NOROOTZONE	
-#define ISC_R_DESTADDRREQ	DHCP_R_DESTADDRREQ	
-#define ISC_R_CROSSZONE		DHCP_R_CROSSZONE		
-#define ISC_R_NO_TSIG		DHCP_R_NO_TSIG		
-#define ISC_R_NOT_EQUAL		DHCP_R_NOT_EQUAL		
-#define ISC_R_CONNRESET		DHCP_R_CONNRESET		
-#define ISC_R_UNKNOWNATTRIBUTE	DHCP_R_UNKNOWNATTRIBUTE	
+#define ISC_R_PROTOCOLERROR	DHCP_R_PROTOCOLERROR
+#define ISC_R_INVALIDARG	DHCP_R_INVALIDARG
+#define ISC_R_NOTYET		DHCP_R_NOTYET
+#define ISC_R_UNCHANGED		DHCP_R_UNCHANGED
+#define ISC_R_KEYCONFLICT	DHCP_R_KEYCONFLICT
+#define ISC_R_BADPARSE		DHCP_R_BADPARSE
+#define ISC_R_NOKEYS		DHCP_R_NOKEYS
+#define ISC_R_KEY_UNKNOWN	DHCP_R_KEY_UNKNOWN
+#define ISC_R_INVALIDKEY	DHCP_R_INVALIDKEY
+#define ISC_R_INCOMPLETE	DHCP_R_INCOMPLETE
+#define ISC_R_FORMERR		DHCP_R_FORMERR
+#define ISC_R_SERVFAIL		DHCP_R_SERVFAIL
+#define ISC_R_NXDOMAIN		DHCP_R_NXDOMAIN
+#define ISC_R_NOTIMPL		DHCP_R_NOTIMPL
+#define ISC_R_REFUSED		DHCP_R_REFUSED
+#define ISC_R_YXDOMAIN		DHCP_R_YXDOMAIN
+#define ISC_R_YXRRSET		DHCP_R_YXRRSET
+#define ISC_R_NXRRSET		DHCP_R_NXRRSET
+#define ISC_R_NOTAUTH		DHCP_R_NOTAUTH
+#define ISC_R_NOTZONE		DHCP_R_NOTZONE
+#define ISC_R_BADSIG		DHCP_R_BADSIG
+#define ISC_R_BADKEY		DHCP_R_BADKEY
+#define ISC_R_BADTIME		DHCP_R_BADTIME
+#define ISC_R_NOROOTZONE	DHCP_R_NOROOTZONE
+#define ISC_R_DESTADDRREQ	DHCP_R_DESTADDRREQ
+#define ISC_R_CROSSZONE		DHCP_R_CROSSZONE
+#define ISC_R_NO_TSIG		DHCP_R_NO_TSIG
+#define ISC_R_NOT_EQUAL		DHCP_R_NOT_EQUAL
+#define ISC_R_CONNRESET		DHCP_R_CONNRESET
+#define ISC_R_UNKNOWNATTRIBUTE	DHCP_R_UNKNOWNATTRIBUTE
 #endif
 
 isc_result_t

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/omapip/trace.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/omapip/trace.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/osdep.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/osdep.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/site.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/site.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/statement.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/statement.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/includes/tree.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/includes/tree.h Changed

@@ -3,7 +3,7 @@
 Definitions for address trees... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -47,7 +47,7 @@
 	const char *name;
 	unsigned width;
 	struct enumeration_value *values;
-};	
+};
 
 /* Tree node types... */
 #define TREE_CONCAT		1
@@ -69,7 +69,7 @@
 XXX ephemeral by default and be made a persistent reference explicitly. */
 /* XXX on the other hand, it seems to work pretty nicely, so maybe the
 XXX above comment is meshuggenah. */
-/* XXX I think the above comment tries to say this: 
+/* XXX I think the above comment tries to say this:
 XXX http://tinyurl.com/2tjqre */
 
 /* A string of data bytes, possibly accompanied by a larger buffer. */
@@ -281,7 +281,7 @@
 	} data;
 	int flags;
 #	define EXPR_EPHEMERAL	1
-};		
+};
 
 /* DNS host entry structure... */
 struct dns_host_entry {

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/ChangeLog.md -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/ChangeLog.md Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -194,9 +194,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	ChangeLog.md README.md
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 A = @A@
 ACLOCAL = @ACLOCAL@
@@ -225,6 +224,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -236,6 +237,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -536,7 +538,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/conflex.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/conflex.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -186,7 +186,7 @@
 
 	if (!cfile->ugflag) {
 		if (c == EOL) {
-			if (cfile->cur_line == cfile->line1) {	
+			if (cfile->cur_line == cfile->line1) {
 				cfile->cur_line = cfile->line2;
 				cfile->prev_line = cfile->line1;
 			} else {
@@ -224,11 +224,11 @@
 /*
 * GENERAL NOTE ABOUT TOKENS
 *
- * We normally only want non-whitespace tokens. There are some 
+ * We normally only want non-whitespace tokens. There are some
 * circumstances where we *do* want to see whitespace (for example
 * when parsing IPv6 addresses).
 *
- * Generally we use the next_token() function to read tokens. This 
+ * Generally we use the next_token() function to read tokens. This
 * in turn calls get_next_token, which does *not* return tokens for
 * whitespace. Rather, it skips these.
 *
@@ -254,7 +254,7 @@
 		p = cfile->lpos;
 
 		c = get_char(cfile);
-		if (!((c == '\n') && cfile->eol_token) && 
+		if (!((c == '\n') && cfile->eol_token) &&
 		 isascii(c) && isspace(c)) {
 		 	ttok = read_whitespace(c, cfile);
 			break;
@@ -301,12 +301,12 @@
 * The get_next_token() function consumes the next token and
 * returns it to the caller.
 *
- * Since the code is almost the same for "normal" and "raw" 
+ * Since the code is almost the same for "normal" and "raw"
 * input, we pass a flag to alter the way it works.
 */
 
-static enum dhcp_token 
-get_next_token(const char **rval, unsigned *rlen, 
+static enum dhcp_token
+get_next_token(const char **rval, unsigned *rlen,
 	 struct parse *cfile, isc_boolean_t raw) {
 	int rv;
 
@@ -328,7 +328,7 @@
 			cfile->token_line = cfile->cur_line;
 		}
 	}
-	
+
 	if (rval)
 		*rval = cfile->tval;
 	if (rlen)
@@ -339,10 +339,10 @@
 /*
 * Get the next token from cfile and return it.
 *
- * If rval is non-NULL, set the pointer it contains to 
+ * If rval is non-NULL, set the pointer it contains to
 * the contents of the token.
 *
- * If rlen is non-NULL, set the integer it contains to 
+ * If rlen is non-NULL, set the integer it contains to
 * the length of the token.
 */
 
@@ -367,8 +367,8 @@
 * The do_peek_token() function checks the next token without
 * consuming it, and returns it to the caller.
 *
- * Since the code is almost the same for "normal" and "raw" 
- * input, we pass a flag to alter the way it works. (See the 
+ * Since the code is almost the same for "normal" and "raw"
+ * input, we pass a flag to alter the way it works. (See the
 * warning in the GENERAL NOTES ABOUT TOKENS above though.)
 */
 
@@ -405,15 +405,15 @@
 
 
 /*
- * Get the next token from cfile and return it, leaving it for a 
+ * Get the next token from cfile and return it, leaving it for a
 * subsequent call to next_token().
 *
 * Note that it WILL consume whitespace tokens.
 *
- * If rval is non-NULL, set the pointer it contains to 
+ * If rval is non-NULL, set the pointer it contains to
 * the contents of the token.
 *
- * If rlen is non-NULL, set the integer it contains to 
+ * If rlen is non-NULL, set the integer it contains to
 * the length of the token.
 */
 
@@ -484,7 +484,7 @@
 		c = get_char(cfile);
 		if (c == EOF)
 			return END_OF_FILE;
-	} while (!((c == '\n') && cfile->eol_token) && 
+	} while (!((c == '\n') && cfile->eol_token) &&
 		 isascii(c) && isspace(c));
 
 	/*
@@ -648,7 +648,7 @@
 			goto end_read;
 
 		default:
-			parse_error(cfile, 
+			parse_error(cfile,
 				 "read_number(): impossible case");
 		}
 
@@ -936,7 +936,7 @@
 		}
 		break;
 	case 'e':
-		if (isascii(atom 1) && 
+		if (isascii(atom 1) &&
 		 tolower((unsigned char)atom1) == 'x') {
 			if (!strcasecmp(atom + 2, "tract-int"))
 				return EXTRACT_INT;
@@ -1035,15 +1035,15 @@
 		}
 		break;
 	case 'i':
-	 	if (!strcasecmp(atom+1, "a-na")) 
+	 	if (!strcasecmp(atom+1, "a-na"))
 			return IA_NA;
-	 	if (!strcasecmp(atom+1, "a-ta")) 
+	 	if (!strcasecmp(atom+1, "a-ta"))
 			return IA_TA;
-	 	if (!strcasecmp(atom+1, "a-pd")) 
+	 	if (!strcasecmp(atom+1, "a-pd"))
 			return IA_PD;
-	 	if (!strcasecmp(atom+1, "aaddr")) 
+	 	if (!strcasecmp(atom+1, "aaddr"))
 			return IAADDR;
-	 	if (!strcasecmp(atom+1, "aprefix")) 
+	 	if (!strcasecmp(atom+1, "aprefix"))
 			return IAPREFIX;
 		if (!strcasecmp(atom + 1, "nclude"))
 			return INCLUDE;
@@ -1332,11 +1332,11 @@
 	case 's':
 		if (!strcasecmp(atom + 1, "cript"))
 			return SCRIPT;
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'e') {
 			if (!strcasecmp(atom + 2, "arch"))
 				return SEARCH;
-			if (isascii(atom2) && 
+			if (isascii(atom2) &&
 			 tolower((unsigned char)atom2) == 'c') {
 				if (!strncasecmp(atom + 3, "ond", 3)) {
 if (!strcasecmp(atom + 6, "ary"))
@@ -1366,7 +1366,7 @@
 return TOKEN_SERVER;
 					if (atom6 == '-') {
 						if (!strcasecmp(atom + 7,
-								"duid")) 
+								"duid"))
 							return SERVER_DUID;
 if (!strcasecmp(atom + 7,
 								"name"))
@@ -1386,7 +1386,7 @@
 return TOKEN_SET;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'h') {
 if (!strcasecmp(atom + 2, "ared-network"))
 return SHARED_NETWORK;
@@ -1394,7 +1394,7 @@
 return SHUTDOWN;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'i') {
 if (!strcasecmp(atom + 2, "addr"))
 return SIADDR;
@@ -1404,9 +1404,9 @@
 return SIZE;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'p') {
-			if (isascii(atom2) && 
+			if (isascii(atom2) &&
 			 tolower((unsigned char)atom2) == 'a') {
 if (!strcasecmp(atom + 3, "ce"))
 return SPACE;
@@ -1418,9 +1418,9 @@
 return SPLIT;
 			break;
 		}
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 't') {
-			if (isascii(atom2) && 
+			if (isascii(atom2) &&
 			 tolower((unsigned char)atom2) == 'a') {
 				if (!strncasecmp(atom + 3, "rt", 2)) {
 if (!strcasecmp(atom + 5, "s"))
@@ -1453,7 +1453,7 @@
 return SUBSTRING;
 break;
 }
-		if (isascii(atom1) && 
+		if (isascii(atom1) &&
 		 tolower((unsigned char)atom1) == 'u') {
 if (!strcasecmp(atom + 2, "ffix"))
 return SUFFIX;
@@ -1547,4 +1547,3 @@
 	}
 	return dfv;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/confparse.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/confparse.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -607,7 +607,7 @@
 		read_conf_file(cfile, val, type);
 		parse_semi(cfile);
 		return 1;
-		
+
 	case HOST:
 		skip_token(&val, NULL, cfile);
 		if (type != HOST_DECL && type != CLASS_DECL)
@@ -924,7 +924,7 @@
 		failover_once = ISC_FALSE;
 		skip_to_semi(cfile);
 		break;
-			
+
 	case SERVER_DUID:
 		if (local_family != AF_INET6)
 			goto unknown;
@@ -966,7 +966,7 @@
 		}
 		if (mapSize(et) == 0)
 			return declaration;
-		
+
 		et->skip = ISC_TRUE;
 		cfile->issue_counter++;
 		mapSet(cfile->stackcfile->stack_top, et, "statement");
@@ -976,12 +976,12 @@
 }
 
 /*!
- * 
+ *
 * \brief Parse allow and deny statements
 *
 * This function handles the common processing code for permit and deny
 * statements in the parse_pool_statement and parse_pool6_statement functions.
- * 
+ *
 * The allow or deny token should already be consumed, this function expects
 * one of the following:
 * known-clients;
@@ -1019,7 +1019,7 @@
 		negative = ISC_TRUE;
 		alias = makeString(-1, "unknown clients");
 		break;
-				
+
 	case KNOWN_CLIENTS:
 		need_clients = ISC_FALSE;
 		permit = CLASS_KNOWN;
@@ -1037,7 +1037,7 @@
 		permit = CLASS_KNOWN;
 		alias = makeString(-1, "known clients");
 		break;
-				
+
 	case AUTHENTICATED:
 		permit = CLASS_ALL;
 		alias = makeString(-1, "authenticated clients");
@@ -1046,7 +1046,7 @@
 		comment = createComment("/// unauthenticated-clients is "
 					"not supported by ISC DHCP and Kea");
 		break;
-				
+
 	case UNAUTHENTICATED:
 		permit = CLASS_ALL;
 		alias = makeString(-1, "unauthenticated clients");
@@ -1057,7 +1057,7 @@
 		permit = CLASS_ALL;
 		alias = makeString(-1, "all clients");
 		break;
-				
+
 	case DYNAMIC:
 		/* bootp is not supported by Kea so the dynamic bootp
 		 * client set is the empty set. */
@@ -1192,7 +1192,7 @@
 			skip_token(&val, NULL, cfile);
 			get_permit(cfile, prohibit);
 			break;
-			
+
 		case RBRACE:
 			skip_token(&val, NULL, cfile);
 			done = ISC_TRUE;
@@ -1412,7 +1412,7 @@
 			host_id = makeString(-1, val);
 			appendString(host_id, " ");
 			if (token == V6RELOPT) {
-				token = next_token(&val, NULL, cfile); 
+				token = next_token(&val, NULL, cfile);
 
 				if (token != NUMBER)
 					parse_error(cfile,
@@ -1428,7 +1428,7 @@
 				if (relays > MAX_V6RELAY_HOPS)
 					relays = MAX_V6RELAY_HOPS + 1;
 			} else if (token != OPTION)
-				parse_error(cfile, 
+				parse_error(cfile,
 					 "host-identifier must be an option"
 					 " or v6relopt");
 			known = ISC_FALSE;
@@ -1571,7 +1571,7 @@
 * in fact:
 * (CLASS) NAME(STRING) LBRACE ... RBRACE
 * (SUBCLASS) SUPER(STRING) DATA/HASH(STRING | <hexa>) BRACE ... RBRACE
- * 
+ *
 * class "name" { MATCH IF <boolean-expr> }: direct: belong when true
 * class "name" { MATCH <data-expr> }: indirect: use subclasses
 * class "name" { MATCH <data-expr> SPAWN WITH <data-expr> }: indirect:
@@ -1600,7 +1600,7 @@
 	isc_boolean_t lose = ISC_FALSE;
 	isc_boolean_t matchedonce = ISC_FALSE;
 	isc_boolean_t submatchedonce = ISC_FALSE;
-	
+
 	token = next_token(&val, NULL, cfile);
 	if (token != STRING)
 		parse_error(cfile, "Expecting class name");
@@ -1708,7 +1708,7 @@
 			}
 		}
 	}
-			
+
 	/* Note the class declaration in the enclosing group */
 	if (group_classes != classes) {
 		struct element *gc;
@@ -2536,12 +2536,12 @@
 	token = peek_token(&val, NULL, cfile);
 	if (is_identifier(token) || token == STRING) {
 		skip_token(&val, NULL, cfile);
-		
+
 		name = makeString(-1, val);
 		if (!name)
 			parse_error(cfile, "no memory for group decl name %s",
 				 val);
-	}		
+	}
 
 	parse_lbrace(cfile);
 
@@ -3208,7 +3208,7 @@
 			 | ip-address6 SLASH number SEMI
 			 | ip-address6 SLASH number TEMPORARY SEMI */
 
-void 
+void
 parse_address_range6(struct parse *cfile, int type, size_t where)
 {
 	struct string *low, *high, *range;
@@ -3234,7 +3234,7 @@
 	range = allocString();
 	concatString(range, low);
 
-	/* 
+	/*
 	 * See if we we're using range or CIDR notation or TEMPORARY
 	 */
 	token = peek_token(&val, NULL, cfile);
@@ -3260,7 +3260,7 @@
 			appendString(range, " ");
 			appendString(range, val);
 			skip_token(NULL, NULL, cfile);
-		}			
+		}
 	} else if (token == TEMPORARY) {
 		/*
 		 * temporary (RFC 4941)
@@ -3271,7 +3271,7 @@
 		skip_token(NULL, NULL, cfile);
 	} else {
 		/*
-		 * No '/', so we are looking for the end address of 
+		 * No '/', so we are looking for the end address of
 		 * the IPv6 pool.
 		 */
 		high = parse_ip6_addr_txt(cfile);
@@ -3329,7 +3329,7 @@
 
 /* prefix6-declaration :== ip-address6 ip-address6 SLASH number SEMI */
 
-void 
+void
 parse_prefix6(struct parse *cfile, int type, size_t where)
 {
 	struct string *lo, *hi;
@@ -3528,7 +3528,7 @@
 			skip_token(NULL, NULL, cfile);
 			get_permit(cfile, prohibit);
 			break;
-			
+
 		case RBRACE:
 			skip_token(&val, NULL, cfile);
 			done = ISC_TRUE;
@@ -3786,7 +3786,7 @@
 * server-duid ll ethernet|ieee802|fddi 00:16:6F:49:7D:9B;
 * server-duid en 2495 "enterprise-specific-identifier-1234";
 */
-void 
+void
 parse_server_duid_conf(struct parse *cfile) {
 	enum dhcp_token token;
 	const char *val;
@@ -3809,7 +3809,7 @@
 	 */
 	token = next_token(&val, NULL, cfile);
 
-	/* 
+	/*
 	 * Enterprise is the easiest - enterprise number and raw data
 	 * are required.
 	 */
@@ -3837,7 +3837,7 @@
 		mapSet(duid, item, "identifier");
 	}
 
-	/* 
+	/*
 	 * Next easiest is the link-layer DUID. It consists only of
 	 * the LL directive, or optionally the specific value to use.
 	 *
@@ -3878,7 +3878,7 @@
 		}
 	}
 
-	/* 
+	/*
 	 * Finally the link-layer DUID plus time. It consists only of
 	 * the LLT directive, or optionally the specific value to use.
 	 *
@@ -3932,7 +3932,7 @@
 	 *
 	 * In this case, they have to put in the complete value.
 	 *
-	 * This also works for existing DUID types of course. 
+	 * This also works for existing DUID types of course.
 	 */
 	else if (token == NUMBER) {
 		item = createString(makeString(-1, val));

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/data.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/data.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * http://www.isc.org/
 */
@@ -199,7 +199,7 @@
 
 	case 'I': {
 		/* IPv4 address to text */
-		char buf40 /* INET_ADDRSTRLEN == 26 */; 
+		char buf40 /* INET_ADDRSTRLEN == 26 */;
 
 		assert(l > 3);
 		assert(inet_ntop(AF_INET, s, buf, sizeof(buf)) != NULL);
@@ -263,7 +263,7 @@
 		assert(0);
 	}
 }
-	
+
 struct string *
 makeStringArray(int l, const char *s, char fmt)
 {
@@ -542,7 +542,7 @@
 	e->type = ELEMENT_INTEGER;
 	e->value.int_value = i;
 }
-	
+
 void
 resetDouble(struct element *e, double d)
 {
@@ -677,7 +677,7 @@
 		TAILQ_INSERT_HEAD(&l->value.list_value, e);
 	} else {
 		struct element *prev;
-		
+
 		prev = TAILQ_FIRST(&l->value.list_value);
 		assert(prev != NULL);
 		assert(prev->key == NULL);
@@ -964,7 +964,7 @@
 	} else
 		for (sp = 0; sp < indent; ++sp)
 			fprintf(fp, " ");
-}	
+}
 
 void
 printList(FILE *fp, const struct list *l, isc_boolean_t skip, unsigned indent)

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/data.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/data.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/dhctoken.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/dhctoken.h Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/eval.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/eval.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -456,7 +456,7 @@
 * data_expression :== SUBSTRING LPAREN data-expression COMMA
 * numeric-expression COMMA
 * numeric-expression RPAREN |
- * CONCAT LPAREN data-expression COMMA 
+ * CONCAT LPAREN data-expression COMMA
 * data-expression RPAREN
 * SUFFIX LPAREN data_expression COMMA
 * numeric-expression RPAREN |
@@ -1155,7 +1155,7 @@
 				fmt = "%x";
 				break;
 			}
-			
+
 			for (i = 0; i < buf->length; i++) {
 				uint8_t val;
 				char num4;
@@ -1172,7 +1172,7 @@
 
 			if ((buf->length % 2) != 0)
 				return expr;
-			
+
 			switch (b) {
 			case 8:
 				fmt = "%o";
@@ -1185,11 +1185,11 @@
 				fmt = "%x";
 				break;
 			}
-			
+
 			for (i = 0; i < buf->length; i += 2) {
 				uint16_t val;
 				char num8;
-				
+
 				if (i != 0)
 					concatString(r, sep);
 				memcpy(&val, buf->content + i, 2);
@@ -1203,7 +1203,7 @@
 
 			if ((buf->length % 4) != 0)
 				return expr;
-			
+
 			switch (b) {
 			case 8:
 				fmt = "%llo";
@@ -1216,11 +1216,11 @@
 				fmt = "%llx";
 				break;
 			}
-			
+
 			for (i = 0; i < buf->length; i += 4) {
 				uint32_t val;
 				char num40;
-				
+
 				if (i != 0)
 					concatString(r, sep);
 				memcpy(&val, buf->content + i, 4);

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/json.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/json.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/keama.8 -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/keama.8 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/keama.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/keama.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017-2019 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(C) 2017-2022 Internet Systems Consortium, Inc.("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -47,6 +47,9 @@
 	exit(1);
 }
 
+enum resolve resolve;
+struct parses parses;
+
 int local_family = 0;
 char *hook_library_path = NULL;
 char *input_file = NULL;
@@ -60,7 +63,7 @@
 static const char use_noarg = "No argument for command: %s";
 static const char bad_resolve = "Bad -r argument: %s";
 
-int 
+int
 main(int argc, char **argv) {
 	int i, fd;
 	char *inbuf = NULL;
@@ -104,7 +107,7 @@
 			if (++i == argc)
 				usage(use_noarg, argvi - 1);
 			output_file = argvi;
- 		} else 
+ 		} else
 			usage("Unknown command: %s", argvi);
 	}
 
@@ -198,10 +201,10 @@
 	char mbuf1024;
 	char fbuf1024;
 	unsigned i, lix;
-	
+
 	snprintf(fbuf, sizeof(fbuf), "%s line %d: %s",
 		 cfile->tlname, cfile->lexline, fmt);
-	
+
 	va_start(list, fmt);
 	vsnprintf(mbuf, sizeof(mbuf), fbuf, list);
 	va_end(list);

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/keama.h -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/keama.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -31,11 +31,13 @@
 #include <time.h>
 
 /* Resolution of FQDNs into IPv4 addresses */
-enum resolve { 
+enum resolve {
 	perform = 0,	/* resolve */
 	fatal,		/* raise a fatal error */
 	pass		/* pass the string wth a warning */
-} resolve;
+};
+
+extern enum resolve resolve;
 
 /* From includes/dhcp.h */
 
@@ -58,8 +60,6 @@
 
 /* A parsing context. */
 
-TAILQ_HEAD(parses, parse) parses;
-
 struct parse {
 	int lexline;
 	int lexchar;
@@ -120,6 +120,8 @@
 
 };
 
+extern TAILQ_HEAD(parses, parse) parses;
+
 #define PARAMETER	0
 #define TOPLEVEL	1
 #define	ROOT_GROUP	2

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/options.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/options.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -170,6 +170,7 @@
 { "geoconf-civic", "X", "dhcp", 99, 2},
 	{ "pcode", "t",				"dhcp", 100, 2},
 	{ "tcode", "t",				"dhcp", 101, 2},
+	{ "v6-only-preferred", "L",		"dhcp", 108, 2},
 	{ "netinfo-server-address", "Ia",	"dhcp", 112, 2},
 	{ "netinfo-server-tag", "t",		"dhcp", 113, 2},
 	{ "default-url", "t",			"dhcp", 114, 2},
@@ -1060,7 +1061,7 @@
 	log_threshold:
 		comment = createComment("/// Reference Kea #222");
 TAILQ_INSERT_TAIL(&comments, comment);
- break;		
+ break;
 
 	case 84: /* log-threshold-high */
 		comment = createComment("/// log-threshold-high is not (yet?) "

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/parse.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/parse.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -88,7 +88,7 @@
 	statement foo bar { }
 	statement foo bar { statement { } }
 	statement}
- 
+
 	...et cetera. */
 void
 skip_to_rbrace(struct parse *cfile, int brace_count)
@@ -176,7 +176,7 @@
 	const char *val;
 	enum dhcp_token token;
 	struct string *s = NULL;
-	
+
 	/* Read a dotted hostname... */
 	do {
 		/* Read a token, which should be an identifier. */
@@ -204,7 +204,7 @@
 
 /* ip-addr-or-hostname :== ip-address | hostname
 ip-address :== NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
- 
+
 Parse an ip address or a hostname.
 
 Note that RFC1123 permits hostnames to consist of all digits,
@@ -282,7 +282,7 @@
 
 	return makeStringExt(bin->length, bin->content, 'I');
 }
-	
+
 /*
 * ip-address :== NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
 */
@@ -294,7 +294,7 @@
 	unsigned len = sizeof(addr);
 
 	return parse_numeric_aggregate(cfile, addr, &len, DOT, 10, 8);
-}	
+}
 
 /*
 * Return true if every character in the string is hexadecimal.
@@ -316,7 +316,7 @@
 *
 * See section 2.2 of RFC 1884 for details.
 *
- * We are lazy for this. We pull numbers, names, colons, and dots 
+ * We are lazy for this. We pull numbers, names, colons, and dots
 * together and then throw the resulting string at the inet_pton()
 * function.
 */
@@ -332,7 +332,7 @@
 	int v6_len;
 
 	/*
-	 * First token is non-raw. This way we eat any whitespace before 
+	 * First token is non-raw. This way we eat any whitespace before
 	 * our IPv6 address begins, like one would expect.
 	 */
 	token = peek_token(&val, NULL, cfile);
@@ -655,7 +655,7 @@
 	if (!is_identifier(token))
 		parse_error(cfile,
 			 "expecting identifier after option keyword.");
-	
+
 	uname = strdup(val);
 	if (!uname)
 		parse_error(cfile, "no memory for uname information.");
@@ -792,7 +792,7 @@
 	universe->old = strdup(val);
 	universe->name = universe->old;
 	push_space(universe);
-	
+
 	do {
 		token = next_token(&val, NULL, cfile);
 		switch(token) {
@@ -951,7 +951,7 @@
 	struct string *saved;
 	struct string *format;
 	struct element *optdef;
-	
+
 	if (option->space->status == special) {
 		parse_vendor_code_definition(cfile, option);
 		return;
@@ -1451,7 +1451,7 @@
 	struct string *t;
 	struct string *r;
 	isc_boolean_t valid_base64;
-	
+
 	r = allocString();
 
 	/* It's possible for a + or a / to cause a base64 quantity to be
@@ -1582,7 +1582,7 @@
 	}
 	if (!*lose)
 		return ISC_TRUE;
-		
+
 	return ISC_FALSE;
 }
 
@@ -1731,7 +1731,7 @@
 	case ON:
 		skip_token(&val, NULL, cfile);
 		return parse_on_statement(result, cfile, lose);
-			
+
 	case SWITCH:
 		skip_token(&val, NULL, cfile);
 		return parse_switch_statement(result, cfile, lose);
@@ -1755,7 +1755,7 @@
 		cfile->issue_counter++;
 		mapSet(result, st, "default");
 		return ISC_TRUE;
-			
+
 	case DEFINE:
 	case TOKEN_SET:
 		skip_token(&val, NULL, cfile);
@@ -2028,7 +2028,7 @@
 		if (!parse_zone(zone, cfile))
 			goto badzone;
 		return ISC_TRUE;
-		
+
 		/* Also not really a statement, but same idea as above. */
 	case KEY:
 		skip_token(&val, NULL, cfile);
@@ -2116,7 +2116,7 @@
 		 values = createList();
 		 mapSet(zone, values, "primary");
 		 goto consemup;
-		 
+
 	 case SECONDARY:
 		 if (mapContains(zone, "secondary"))
 			 parse_error(cfile, "more than one secondary.");
@@ -2183,7 +2183,7 @@
 		 mapSet(zone, createString(key_name), "key");
 		 parse_semi(cfile);
 		 break;
-		 
+
 	 default:
 		 done = 1;
 		 break;
@@ -2256,7 +2256,7 @@
 			if (!s)
 				appendString(alg, ".SIG-ALG.REG.INT.");
 			/* If there is no trailing '.', hack one in. */
-			else 
+			else
 				appendString(alg, ".");
 			mapSet(key, createString(alg), "algorithm");
 			break;
@@ -2329,7 +2329,7 @@
 		case COMMIT:
 		case RELEASE:
 		case TRANSMISSION:
-			appendString(cond, val); 
+			appendString(cond, val);
 			break;
 
 		default:
@@ -2339,7 +2339,7 @@
 		if (token == OR)
 			appendString(cond, " or ");
 	} while (token == OR);
-		
+
 	mapSet(statement, createString(cond), "condition");
 
 	/* Semicolon means no statements. */
@@ -2567,7 +2567,7 @@
 		}
 		mapSet(statement, branch, "else");
 	}
-	
+
 	return ISC_TRUE;
 }
 
@@ -2581,7 +2581,7 @@
 *			 boolean-expression OR boolean-expression
 *			 EXISTS OPTION-NAME
 */
- 			 
+
 isc_boolean_t
 parse_boolean_expression(struct element *expr,
 			 struct parse *cfile,
@@ -2625,7 +2625,7 @@
 * data_expression :== SUBSTRING LPAREN data-expression COMMA
 *					numeric-expression COMMA
 *					numeric-expression RPAREN |
- *		 CONCAT LPAREN data-expression COMMA 
+ *		 CONCAT LPAREN data-expression COMMA
 *					data-expression RPAREN
 *		 SUFFIX LPAREN data_expression COMMA
 *		 		 numeric-expression RPAREN |
@@ -3181,14 +3181,14 @@
 		if (token != RPAREN)
 			goto norparen;
 		break;
-		
+
 	case STRING:
 		skip_token(&val, &len, cfile);
 		resetString(expr, makeString(len, val));
 		break;
 
 	case EXTRACT_INT:
-		skip_token(&val, NULL, cfile);	
+		skip_token(&val, NULL, cfile);
 		nexp = createMap();
 		nexp->skip = ISC_TRUE;
 		cfile->issue_counter++;
@@ -3232,9 +3232,9 @@
 		if (token != RPAREN)
 			parse_error(cfile, "right parenthesis expected.");
 		break;
-	
+
 	case ENCODE_INT:
-		skip_token(&val, NULL, cfile);	
+		skip_token(&val, NULL, cfile);
 		nexp = createMap();
 		nexp->skip = ISC_TRUE;
 		cfile->issue_counter++;
@@ -3274,7 +3274,7 @@
 		if (token != RPAREN)
 			parse_error(cfile, "right parenthesis expected.");
 		break;
-	
+
 	case NUMBER:
 		/* If we're in a numeric context, this should just be a
 		 number, by itself. */
@@ -3535,7 +3535,7 @@
 		nexp->skip = ISC_TRUE;
 		cfile->issue_counter++;
 		mapSet(expr, nexp, "v6relay");
-		
+
 		token = next_token(&val, NULL, cfile);
 		if (token != LPAREN)
 			goto nolparen;
@@ -3736,7 +3736,7 @@
 			resetBy(expr, rhs);
 			return ISC_TRUE;
 		}
-		
+
 		lhs = rhs;
 		rhs = NULL;
 		binop = next_op;
@@ -3775,7 +3775,7 @@
 		rhs_context = expression_context(rhs);
 		lhs_context = expression_context(lhs);
 
-		if ((rhs_context != context_any) && 
+		if ((rhs_context != context_any) &&
 		 (lhs_context != context_any) &&
 		 (rhs_context != lhs_context))
 			parse_error(cfile, "illegal expression relating "
@@ -3876,20 +3876,20 @@
 	/* Now combine the LHS and the RHS using binop. */
 	tmp = createMap();
 	tmp->skip = ISC_TRUE;
-	
+
 	/* Store the LHS and RHS. */
 	mapSet(tmp, lhs, "left");
 	mapSet(tmp, rhs, "right");
 
 	lhs = createMap();
 	mapSet(lhs, tmp, binop_name);
-	
+
 	tmp = NULL;
 	rhs = NULL;
 
 	binop = next_op;
 	goto new_rhs;
-}	
+}
 
 /* Escape embedded commas, detected heading and leading space */
 struct string *
@@ -4296,7 +4296,7 @@
 	if ((token == SEMI) && (option->format0 != 'Z')) {
 		/* Eat the semicolon... */
 		/*
-		 * XXXSK: I'm not sure why we should ever get here, but we 
+		 * XXXSK: I'm not sure why we should ever get here, but we
 		 * 	 do during our startup. This confuses things if
 		 * 	 we are parsing a zero-length option, so don't
 		 * 	 eat the semicolon token in that case.
@@ -4335,7 +4335,7 @@
 
 			r = makeStringExt(s->length, s->content, 'X');
 			data = createString(r);
-			mapSet(opt_data, data, "data"); 
+			mapSet(opt_data, data, "data");
 		} else if ((expr->type == ELEMENT_MAP) &&
 			 mapContains(expr, "const-data")) {
 			struct element *value;
@@ -4819,7 +4819,7 @@
 		parse_error(cfile, "Bad format '%c' in parse_config_data.",
 			 option->format0);
 	}
-				
+
 	mapSet(expr, elem, "value");
 
 return ISC_TRUE;
@@ -4888,7 +4888,7 @@
 	if ((token == SEMI) && (option->format0 != 'Z')) {
 		/* Eat the semicolon... */
 		/*
-		 * XXXSK: I'm not sure why we should ever get here, but we 
+		 * XXXSK: I'm not sure why we should ever get here, but we
 		 * 	 do during our startup. This confuses things if
 		 * 	 we are parsing a zero-length option, so don't
 		 * 	 eat the semicolon token in that case.

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/print.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/print.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -44,7 +44,7 @@
 		return print_numeric_expression(expr, lose);
 	if (expr->type == ELEMENT_STRING)
 		return print_data_expression(expr, lose);
-		
+
 	if (is_boolean_expression(expr))
 		return print_boolean_expression(expr, lose);
 	if (is_numeric_expression(expr))
@@ -821,7 +821,7 @@
 		struct element *width;
 		struct element *separator;
 		struct element *buffer;
-		
+
 		appendString(result, "binary-to-ascii(");
 		arg = mapGet(expr, "binary-to-ascii");
 		if ((arg == NULL) || (arg->type != ELEMENT_MAP)) {
@@ -877,7 +877,7 @@
 		struct element *arg;
 		struct element *width;
 		struct element *buffer;
-		
+
 		appendString(result, "reverse(");
 		arg = mapGet(expr, "reverse");
 		if ((arg == NULL) || (arg->type != ELEMENT_MAP)) {
@@ -986,7 +986,7 @@
 		struct element *arg;
 		struct element *relay;
 		struct element *option;
-		
+
 
 		appendString(result, "v6relay(");
 		arg = mapGet(expr, "v6relay");

_service:tar_scm:dhcp-4.4.2.tar.gz/keama/reduce.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/keama/reduce.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017-2022 Internet Systems Consortium, Inc. ("ISC")
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -355,7 +355,7 @@
 * data_expression :== SUBSTRING LPAREN data-expression COMMA
 * numeric-expression COMMA
 * numeric-expression RPAREN |
- * CONCAT LPAREN data-expression COMMA 
+ * CONCAT LPAREN data-expression COMMA
 * data-expression RPAREN
 * SUFFIX LPAREN data_expression COMMA
 * numeric-expression RPAREN |
@@ -504,7 +504,7 @@
 		concatString(result, stringValue(string));
 		snprintf(buf, sizeof(buf), ",-%u,all)", (unsigned)len);
 		appendString(result, buf);
-		return createString(result);			
+		return createString(result);
 	}
 
 	/* lowercase */

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -217,8 +217,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.am.in $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -249,6 +247,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -260,6 +260,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -582,7 +583,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/alloc.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/alloc.c Changed

@@ -4,7 +4,7 @@
 protocol... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -20,8 +20,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -141,7 +141,7 @@
 	return bar;
 }
 
-void 
+void
 dfree(void *ptr, const char *file, int line) {
 	if (!ptr) {
 		log_error ("dfree %s(%d): free on null pointer.", file, line);
@@ -208,7 +208,7 @@
 /* For allocation functions that keep their own free lists, we want to
 account for the reuse of the memory. */
 
-void 
+void
 dmalloc_reuse(void *foo, const char *file, int line, int justref) {
 	struct dmalloc_preamble *dp;
 
@@ -333,7 +333,7 @@
 			if (!inhistory)
 #endif
 				log_info (" %s(%d): %ld",
-					 dp -> file, dp -> line, 
+					 dp -> file, dp -> line,
 					 (long) dp -> size);
 		}
 #endif
@@ -535,11 +535,11 @@
 			tsize = (*type -> sizer) (size);
 		else
 			tsize = type -> size;
-		
+
 		/* Sanity check. */
 		if (tsize < sizeof (omapi_object_t))
 			return DHCP_R_INVALIDARG;
-		
+
 		foo = dmalloc (tsize, file, line);
 		if (!foo)
 			return ISC_R_NOMEMORY;
@@ -610,7 +610,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	if ((*h) -> refcnt <= 0) {
 #if defined (POINTER_DEBUG)
 		log_error ("%s(%d): dereference of pointer with refcnt of zero!",
@@ -624,7 +624,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	/* See if this object's inner object refers to it, but don't
 	 count this as a reference if we're being asked to free the
 	 reference from the inner object. */
@@ -695,7 +695,7 @@
 				rc_register (file, line, h, hp,
 					 0, 1, hp -> type -> rc_flag);
 			if (handle_reference) {
-				if (omapi_handle_clear(hp->handle) != 
+				if (omapi_handle_clear(hp->handle) !=
 				 ISC_R_SUCCESS) {
 					log_debug("Attempt to clear null "
 						 "handle pointer");
@@ -729,7 +729,7 @@
 {
 	omapi_buffer_t *t;
 	isc_result_t status;
-	
+
 	t = (omapi_buffer_t *)dmalloc (sizeof *t, file, line);
 	if (!t)
 		return ISC_R_NOMEMORY;
@@ -777,7 +777,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	if ((*h) -> refcnt <= 0) {
 #if defined (POINTER_DEBUG)
 		log_error ("%s(%d): dereference of pointer with refcnt of zero!",
@@ -912,7 +912,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	if ((*h) -> refcnt <= 0) {
 #if defined (POINTER_DEBUG)
 		log_error ("%s(%d): dereference of pointer with refcnt of zero!",
@@ -926,7 +926,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	--((*h) -> refcnt);
 	rc_register (file, line, h, *h, (*h) -> refcnt, 1, RC_MISC);
 	if ((*h) -> refcnt <= 0 ) {
@@ -999,7 +999,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	if ((*h) -> refcnt <= 0) {
 #if defined (POINTER_DEBUG)
 		log_error ("%s(%d): dereference of pointer with refcnt of zero!",
@@ -1071,7 +1071,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	if ((*h) -> refcnt <= 0) {
 #if defined (POINTER_DEBUG)
 		log_error ("%s(%d): dereference of pointer with refcnt of zero!",
@@ -1085,7 +1085,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	--((*h) -> refcnt);
 	rc_register (file, line, h, *h, (*h) -> refcnt, 1, RC_MISC);
 	if ((*h) -> refcnt == 0) {
@@ -1153,7 +1153,7 @@
 		return DHCP_R_INVALIDARG;
 #endif
 	}
-	
+
 	if ((*h) -> refcnt <= 0) {
 #if defined (POINTER_DEBUG)
 		log_error ("%s(%d): dereference of pointer with zero refcnt!",
@@ -1176,4 +1176,3 @@
 	*h = 0;
 	return ISC_R_SUCCESS;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/array.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/array.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/auth.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/auth.c Changed

@@ -3,7 +3,7 @@
 Subroutines having to do with authentication. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1998-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -66,7 +66,7 @@
 		omapi_data_string_dereference(&a->key, MDL);
 	if (a->tsec_key != NULL)
 		dns_tsec_destroy(&a->tsec_key);
-	
+
 	return ISC_R_SUCCESS;
 }
 
@@ -100,7 +100,7 @@
 
 	/*
 	 * If possible create a tsec structure for this key,
-	 * if we can't create the structure we put out a warning 
+	 * if we can't create the structure we put out a warning
 	 * and continue.
 	 */
 	status = isclib_make_dst_key(a->name, a->algorithm,

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/buffer.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/buffer.c Changed

@@ -3,7 +3,7 @@
 Buffer access functions for the object management protocol... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -146,7 +146,7 @@
 	int read_status;
 	omapi_connection_object_t *c;
 	unsigned bytes_to_read;
-	
+
 	if (!h || h -> type != omapi_type_connection)
 		return DHCP_R_INVALIDARG;
 	c = (omapi_connection_object_t *)h;
@@ -421,7 +421,7 @@
 			buffer -> head = first_byte + bytes_this_copy - 1;
 			c -> in_bytes -= bytes_this_copy;
 		}
-			
+
 		if (!BYTES_IN_BUFFER (buffer))
 			buffer = buffer -> next;
 	}
@@ -516,14 +516,14 @@
 				isc_result_t status;
 				trace_iov_t iov 2;
 				int32_t connect_index;
-				
+
 				connect_index = htonl (c -> index);
-				
+
 				iov 0.buf = (char *)&connect_index;
 				iov 0.len = sizeof connect_index;
 				iov 1.buf = &buffer -> buf buffer -> tail;
 				iov 1.len = bytes_written;
-				
+
 				status = (trace_write_packet_iov
 					 (trace_connection_input, 2, iov,
 					 MDL));
@@ -545,11 +545,11 @@
 			if (bytes_written != bytes_this_write)
 				return ISC_R_INPROGRESS;
 		}
-			
+
 		if (!BYTES_IN_BUFFER (buffer))
 			buffer = buffer -> next;
 	}
-		
+
 	/* Get rid of any output buffers we emptied. */
 	buffer = (omapi_buffer_t *)0;
 	while (c -> outbufs &&
@@ -598,7 +598,7 @@
 	u_int32_t inbuf;
 
 	inbuf = htonl (value);
-	
+
 	return omapi_connection_copyin (c, (unsigned char *)&inbuf,
 					sizeof inbuf);
 }
@@ -624,7 +624,7 @@
 	u_int16_t inbuf;
 
 	inbuf = htons (value);
-	
+
 	return omapi_connection_copyin (c, (unsigned char *)&inbuf,
 					sizeof inbuf);
 }
@@ -740,4 +740,3 @@
 	status = omapi_connection_put_uint32(c, value);
 	return (status);
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/connection.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/connection.c Changed

@@ -3,7 +3,7 @@
 Subroutines for dealing with connections. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -44,6 +44,9 @@
 #endif
 static isc_result_t omapi_connection_connect_internal (omapi_object_t *);
 
+static isc_result_t ctring_from_attribute(omapi_object_t *obj, char *attr_name,
+ char **cstr);
+
 OMAPI_OBJECT_ALLOC (omapi_connection,
 		 omapi_connection_object_t, omapi_type_connection)
 
@@ -163,7 +166,7 @@
 			local_sin.sin_family = AF_INET;
 			memset (&local_sin.sin_zero, 0,
 				sizeof local_sin.sin_zero);
-			
+
 			if (bind (obj -> socket, (struct sockaddr *)&local_sin,
 				 sizeof local_sin) < 0) {
 				omapi_connection_object_t **objp = &obj;
@@ -196,7 +199,7 @@
 			omapi_connection_dereference (&obj, MDL);
 			return ISC_R_UNEXPECTED;
 		}
-	
+
 		/* Set the file to nonblocking mode. */
 		if (fcntl (obj -> socket, F_SETFL, O_NONBLOCK) < 0) {
 			omapi_connection_dereference (&obj, MDL);
@@ -213,7 +216,7 @@
 			 (char *)&flag, sizeof(flag)) < 0) {
 			omapi_connection_dereference (&obj, MDL);
 			return ISC_R_UNEXPECTED;
-		}			
+		}
 #endif
 
 		status = (omapi_register_io_object
@@ -285,7 +288,7 @@
 #if defined (TRACING)
 	if (trace_record ()) {
 		/* Connection registration packet:
-		 
+
 		 int32_t index
 		 int32_t listener_index -1 means no listener
 		 u_int16_t remote_port
@@ -365,7 +368,7 @@
 				omapi_listener_reference (&listener, lp, MDL);
 				omapi_listener_dereference (&lp, MDL);
 				break;
-			} 
+			}
 		} omapi_array_foreach_end (trace_listeners,
 					 omapi_listener_object_t, lp);
 		if (!listener) {
@@ -411,7 +414,7 @@
 		}
 	} omapi_array_foreach_end (omapi_connections,
 				 omapi_connection_object_t, lp);
-						 
+
 	log_error ("Spurious traced connect - index %ld, addr %s, port %d",
 		 (long int)connect_index, inet_ntoa (remote.sin_addr),
 		 ntohs (remote.sin_port));
@@ -428,7 +431,7 @@
 		log_error ("trace disconnect: wrong length %d", length);
 		return;
 	}
-	
+
 	index = (int32_t *)buf;
 
 	omapi_array_foreach_begin (omapi_connections,
@@ -458,7 +461,7 @@
 	omapi_connection_object_t *c;
 
 #ifdef DEBUG_PROTOCOL
-	log_debug ("omapi_disconnect(%s)", force ? "force" : "");
+	log_debug ("omapi_disconnect(force=%d)", force);
 #endif
 
 	c = (omapi_connection_object_t *)h;
@@ -613,7 +616,7 @@
 	 * pass it on as a signal.
 	 */
 	status = omapi_connection_connect_internal (h);
-	if (status == ISC_R_INPROGRESS) 
+	if (status == ISC_R_INPROGRESS)
 		return ISC_R_INPROGRESS;
 
 	if (status != ISC_R_SUCCESS)
@@ -705,7 +708,7 @@
 		}
 		c -> state = omapi_connection_connected;
 	}
-	
+
 	/* I don't know why this would fail, so I'm tempted not to test
 	 the return value. */
 	sl = sizeof (c -> local_addr);
@@ -763,64 +766,41 @@
 }
 
 static isc_result_t make_dst_key (dst_key_t **dst_key, omapi_object_t *a) {
-	omapi_value_t *name = (omapi_value_t *)0;
-	omapi_value_t *algorithm = (omapi_value_t *)0;
-	omapi_value_t *key = (omapi_value_t *)0;
-	char *name_str = NULL;
+	omapi_value_t *key = 0;
+	char *name_str = 0;
+	char *algorithm_str = 0;
 	isc_result_t status = ISC_R_SUCCESS;
 
-	if (status == ISC_R_SUCCESS)
-		status = omapi_get_value_str
-			(a, (omapi_object_t *)0, "name", &name);
-
-	if (status == ISC_R_SUCCESS)
-		status = omapi_get_value_str
-			(a, (omapi_object_t *)0, "algorithm", &algorithm);
-
-	if (status == ISC_R_SUCCESS)
-		status = omapi_get_value_str
-			(a, (omapi_object_t *)0, "key", &key);
-
+	/* Get the key name as a C string. */
+	status = ctring_from_attribute(a, "name", &name_str);
 	if (status == ISC_R_SUCCESS) {
-		if ((algorithm->value->type != omapi_datatype_data &&
-		 algorithm->value->type != omapi_datatype_string) ||
-		 strncasecmp((char *)algorithm->value->u.buffer.value,
-				NS_TSIG_ALG_HMAC_MD5 ".",
-				algorithm->value->u.buffer.len) != 0) {
-			status = DHCP_R_INVALIDARG;
+		/* Get the algorithm name as a C string. */
+		status = ctring_from_attribute(a, "algorithm", &algorithm_str);
+		if (status == ISC_R_SUCCESS) {
+			/* Get the key secret value */
+			status = omapi_get_value_str(a, 0, "key", &key);
+			if (status == ISC_R_SUCCESS) {
+				/* Now let's try and create the key */
+				status = isclib_make_dst_key(
+						name_str,
+						algorithm_str,
+						key->value->u.buffer.value,
+						key->value->u.buffer.len,
+						dst_key);
+
+				if (*dst_key == NULL) {
+					status = ISC_R_NOMEMORY;
+				}
+			}
 		}
 	}
 
-	if (status == ISC_R_SUCCESS) {
-		name_str = dmalloc (name -> value -> u.buffer.len + 1, MDL);
-		if (!name_str)
-			status = ISC_R_NOMEMORY;
-	}
-
-	if (status == ISC_R_SUCCESS) {
-		memcpy (name_str,
-			name -> value -> u.buffer.value,
-			name -> value -> u.buffer.len);
-		name_str name -> value -> u.buffer.len = 0;
-
-		status = isclib_make_dst_key(name_str,
-					 DHCP_HMAC_MD5_NAME,
-					 key->value->u.buffer.value,
-					 key->value->u.buffer.len,
-					 dst_key);
-
-		if (*dst_key == NULL)
-			status = ISC_R_NOMEMORY;
-	}
-
 	if (name_str)
 		dfree (name_str, MDL);
+	if (algorithm_str)
+		dfree (algorithm_str, MDL);
 	if (key)
 		omapi_value_dereference (&key, MDL);
-	if (algorithm)
-		omapi_value_dereference (&algorithm, MDL);
-	if (name)
-		omapi_value_dereference (&name, MDL);
 
 	return status;
 }
@@ -970,7 +950,7 @@
 
 		return ISC_R_SUCCESS;
 	}
-	
+
 	if (h -> inner && h -> inner -> type -> set_value)
 		return (*(h -> inner -> type -> set_value))
 			(h -> inner, id, name, value);
@@ -1013,7 +993,7 @@
 		status = dst_key_sigsize(c->in_key, &sigsize);
 		if (status != ISC_R_SUCCESS) {
 			return(status);
-		}		
+		}
 
 		return omapi_make_int_value(value, name, sigsize, MDL);
 
@@ -1040,11 +1020,11 @@
 		status = dst_key_sigsize(c->out_key, &sigsize);
 		if (status != ISC_R_SUCCESS) {
 			return(status);
-		}		
+		}
 
 		return omapi_make_int_value(value, name, sigsize, MDL);
 	}
-	
+
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
 			(h -> inner, id, name, value);
@@ -1081,7 +1061,7 @@
 #ifdef DEBUG_PROTOCOL
 	log_debug ("omapi_connection_signal_handler(%s)", name);
 #endif
-	
+
 	if (h -> inner && h -> inner -> type -> signal_handler)
 		return (*(h -> inner -> type -> signal_handler)) (h -> inner,
 								 name, ap);
@@ -1103,3 +1083,50 @@
 								m -> inner);
 	return ISC_R_SUCCESS;
 }
+
+/* @brief Fetches the value of an attribute in an object as an allocated
+ * C string
+ *
+ * @param obj ompapi object containing the desire attribute
+ * @param attr_name name of the desired attribute
+ * @paramout cstr pointer in which to place the allocated C string's address
+ *
+ * Caller is responsible for freeing (via dfree) the allocated string.
+ *
+ * @return ISC_R_SUCCESS if successful, otherwise indicates the type of failure
+*/
+static isc_result_t ctring_from_attribute(omapi_object_t *obj, char *attr_name,
+ char **cstr) {
+	isc_result_t status = ISC_R_SUCCESS;
+	omapi_value_t *attr = 0;
+
+	/* Find the attribute in the object. */
+	status = omapi_get_value_str(obj, (omapi_object_t *)0, attr_name,
+ &attr);
+	if (status != ISC_R_SUCCESS) {
+		return (status);
+	}
+
+	/* Got it, let's make sure it's either data or string type. */
+	if (attr->value->type != omapi_datatype_data &&
+ attr->value->type != omapi_datatype_string) {
+		return (DHCP_R_INVALIDARG);
+ }
+
+	/* Make a C string from the attribute value. */
+	*cstr = dmalloc (attr->value->u.buffer.len + 1, MDL);
+	if (!(*cstr)) {
+		status = ISC_R_NOMEMORY;
+ } else {
+	 memcpy (*cstr, attr->value->u.buffer.value,
+		 attr->value->u.buffer.len);
+	 (*cstr)attr->value->u.buffer.len = 0;
+	}
+
+	/* Get rid of the attribute reference */
+	if (attr) {
+		omapi_value_dereference (&attr, MDL);
+	}
+
+	return (status);
+}

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/convert.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/convert.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/dispatch.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/dispatch.c Changed

@@ -3,7 +3,7 @@
 I/O dispatcher. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -53,14 +53,14 @@
 			return; /* handler already registered */
 		t = q;
 	}
-		
+
 	q = ((struct eventqueue *)dmalloc(sizeof(struct eventqueue), MDL));
 	if (!q)
 		log_fatal("register_eventhandler: no memory!");
 	memset(q, 0, sizeof *q);
 	if (t)
 		t->next = q;
-	else 
+	else
 		*queue	= q;
 	q->handler = handler;
 	return;
@@ -70,7 +70,7 @@
 unregister_eventhandler(struct eventqueue **queue, void (*handler)(void *))
 {
 	struct eventqueue *t, *q;
-	
+
 	/* traverse to end of list */
 	t= NULL;
 	for (q = *queue ; q ; q = q->next) {
@@ -93,7 +93,7 @@
 	struct eventqueue *q;
 
 	for (q=*queue ; q ; q=q->next) {
-		if (q->handler) 
+		if (q->handler)
 			(*q->handler)(NULL);
 	}
 }
@@ -102,7 +102,7 @@
 * Callback routine to connect the omapi I/O object and socket with
 * the isc socket code. The isc socket code will call this routine
 * which will then call the correct local routine to process the bytes.
- * 
+ *
 * Currently we are always willing to read more data, this should be modified
 * so that on connections we don't read more if we already have enough.
 *
@@ -159,13 +159,13 @@
 	if (obj->closed == ISC_TRUE) {
 		return(0);
 	}
-#endif	 
+#endif
 
 	if ((flags == ISC_SOCKFDWATCH_READ) &&
 	 (obj->reader != NULL) &&
 	 (obj->inner != NULL)) {
 		status = obj->reader(obj->inner);
-		/* 
+		/*
 		 * If we are shutting down (basically tried to
 		 * read and got no bytes) we don't need to try
 		 * again.
@@ -218,7 +218,7 @@
 		omapi_io_states.refcnt = 1;
 		omapi_io_states.type = omapi_type_io_object;
 	}
-		
+
 	obj = (omapi_io_object_t *)0;
 	status = omapi_io_allocate (&obj, MDL);
 	if (status != ISC_R_SUCCESS)
@@ -239,7 +239,7 @@
 	}
 
 	/*
-	 * Attach the I/O object to the isc socket library via the 
+	 * Attach the I/O object to the isc socket library via the
 	 * fdwatch function. This allows the socket library to watch
 	 * over a socket that we built. If there are both a read and
 	 * a write socket we asssume they are the same socket.
@@ -317,7 +317,7 @@
 
 	if ((!h -> outer) || (h -> outer -> type != omapi_type_io_object)) {
 		/*
-		 * If we don't have an object or if the type isn't what 
+		 * If we don't have an object or if the type isn't what
 		 * we expect do the normal registration (which will overwrite
 		 * an incorrect type, that's what we did historically, may
 		 * want to change that)
@@ -348,7 +348,7 @@
 	}
 
 	isc_socket_fdwatchpoke(obj->fd, fd_flags);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -356,7 +356,7 @@
 {
 	omapi_io_object_t *obj, *ph;
 #if SOCKDELETE
-	omapi_io_object_t *p, *last; 
+	omapi_io_object_t *p, *last;
 #endif
 
 	if (!h -> outer || h -> outer -> type != omapi_type_io_object)
@@ -413,13 +413,26 @@
 
 isc_result_t omapi_dispatch (struct timeval *t)
 {
+#ifdef DEBUG_PROTOCOL
+	log_debug("omapi_dispatch()");
+#endif
 	return omapi_wait_for_completion ((omapi_object_t *)&omapi_io_states,
+
 					 t);
 }
 
 isc_result_t omapi_wait_for_completion (omapi_object_t *object,
 					struct timeval *t)
 {
+#ifdef DEBUG_PROTOCOL
+	if (t) {
+ 	log_debug ("omapi_wait_for_completion(%u.%u secs)",
+			 (unsigned int)(t->tv_sec),
+			 (unsigned int)(t->tv_usec));
+	} else {
+ 	log_debug ("omapi_wait_for_completion(no timeout)");
+	}
+#endif
 	isc_result_t status;
 	omapi_waiter_object_t *waiter;
 	omapi_object_t *inner;
@@ -440,7 +453,7 @@
 			omapi_waiter_dereference (&waiter, MDL);
 			return status;
 		}
-		
+
 		status = omapi_object_reference (&inner -> inner,
 						 (omapi_object_t *)waiter,
 						 MDL);
@@ -453,10 +466,17 @@
 
 	do {
 		status = omapi_one_dispatch ((omapi_object_t *)waiter, t);
-		if (status != ISC_R_SUCCESS)
-			return status;
+		if (status != ISC_R_SUCCESS) {
+#ifdef DEBUG_PROTOCOL
+			log_debug ("- call to omapi_one_dispatch failed: %s",
+				 isc_result_totext (status));
+#endif
+			/* Break out on failure, to ensure we free up the waiter(s) */
+			break;
+		}
 	} while (!waiter || !waiter -> ready);
 
+
 	if (waiter -> outer) {
 		if (waiter -> outer -> inner) {
 			omapi_object_dereference (&waiter -> outer -> inner,
@@ -470,8 +490,13 @@
 	}
 	if (waiter -> inner)
 		omapi_object_dereference (&waiter -> inner, MDL);
-	
-	status = waiter -> waitstatus;
+
+	if (status == ISC_R_SUCCESS) {
+		/* If the invocation worked, return the server's
+		 * execution status */
+		status = waiter -> waitstatus;
+	}
+
 	omapi_waiter_dereference (&waiter, MDL);
 	return status;
 }
@@ -479,6 +504,9 @@
 isc_result_t omapi_one_dispatch (omapi_object_t *wo,
 				 struct timeval *t)
 {
+#ifdef DEBUG_PROTOCOL
+ log_debug ("omapi_one_dispatch()");
+#endif
 	fd_set r, w, x, rr, ww, xx;
 	int max = 0;
 	int count;
@@ -503,7 +531,7 @@
 		if (now.tv_sec > t -> tv_sec ||
 		 (now.tv_sec == t -> tv_sec && now.tv_usec >= t -> tv_usec))
 			return ISC_R_TIMEDOUT;
-			
+
 		/* We didn't time out, so figure out how long until
 		 we do. */
 		to.tv_sec = t -> tv_sec - now.tv_sec;
@@ -520,12 +548,12 @@
 		if (to.tv_sec > (60 * 60 * 24))
 			to.tv_sec = 60 * 60 * 24;
 	}
-	
+
 	/* If the object we're waiting on has reached completion,
 	 return now. */
 	if (waiter && waiter -> ready)
 		return ISC_R_SUCCESS;
-	
+
 again:
 	/* If we have no I/O state, we can't proceed. */
 	if (!(io = omapi_io_states.next))
@@ -545,32 +573,59 @@
 			if (desc > max)
 				max = desc;
 		}
-		
+
 		/* Same deal for write fdets. */
 		if (io -> writefd && io -> inner &&
 		 (desc = (*(io -> writefd)) (io -> inner)) >= 0) {
+			/* This block avoids adding writefds that are already connected
+			 * but that do not have data waiting to write. This avoids
+			 * select() calls dropping immediately simply because the
+			 * the writefd is ready to write. Without this synchronous
+			 * waiting becomes CPU intensive polling */
+			if (io->inner && io->inner->type == omapi_type_connection) {
+				omapi_connection_object_t* c;
+				c = (omapi_connection_object_t *)(io->inner);
+				if (c->state == omapi_connection_connected && c->out_bytes == 0) {
+					/* We are already connected and have no data waiting to
+					 * be written, so we avoid registering the fd. */
+#ifdef DEBUG_PROTOCOL
+					log_debug ("--- Connected, nothing to write, skip writefd\n");
+#endif
+					continue;
+				}
+			}
+
+
 			FD_SET (desc, &w);
 			if (desc > max)
 				max = desc;
 		}
 	}
 
-	/* poll if all reader are dry */ 
+	/* poll if all reader are dry */
 	now.tv_sec = 0;
 	now.tv_usec = 0;
-	rr=r; 
-	ww=w; 
+	rr=r;
+	ww=w;
 	xx=x;
 
 	/* poll once */
 	count = select(max + 1, &r, &w, &x, &now);
-	if (!count) { 
-		/* We are dry now */ 
+	if (!count) {
+		/* We are dry now */
 		trigger_event(&rw_queue_empty);
 		/* Wait for a packet or a timeout... XXX */
 		r = rr;
 		w = ww;
 		x = xx;
+
+#ifdef DEBUG_PROTOCOL
+		if (t) {
+			log_debug (" calling select with timout: %u.%u secs",
+			 	 (unsigned int)(to.tv_sec),
+			 	 (unsigned int)(to.tv_usec));
+		}
+#endif
 		count = select(max + 1, &r, &w, &x, t ? &to : NULL);
 	}
 
@@ -648,7 +703,7 @@
 				goto again;
 			 }
 			}
-			
+
 			FD_ZERO (&r);
 			FD_ZERO (&w);
 			t0.tv_sec = t0.tv_usec = 0;
@@ -670,7 +725,7 @@
 		}
 		if (prev)
 			omapi_io_dereference (&prev, MDL);
-		
+
 	}
 
 	for (io = omapi_io_states.next; io; io = io -> next) {
@@ -681,16 +736,18 @@
 		 see if we got input on that socket. */
 		if (io -> readfd &&
 		 (desc = (*(io -> readfd)) (tmp)) >= 0) {
-			if (FD_ISSET (desc, &r))
+			if (FD_ISSET (desc, &r)) {
 				((*(io -> reader)) (tmp));
+			}
 		}
-		
+
 		/* Same deal for write descriptors. */
 		if (io -> writefd &&
 		 (desc = (*(io -> writefd)) (tmp)) >= 0)
 		{
-			if (FD_ISSET (desc, &w))
+			if (FD_ISSET (desc, &w)) {
 				((*(io -> writer)) (tmp));
+			}
 		}
 		omapi_object_dereference (&tmp, MDL);
 	}
@@ -703,9 +760,9 @@
 		omapi_io_reference(&io, omapi_io_states.next, MDL);
 	}
 	while (io != NULL) {
-		if ((io->inner == NULL) || 
-		 ((io->reaper != NULL) && 
-		 ((io->reaper)(io->inner) != ISC_R_SUCCESS))) 
+		if ((io->inner == NULL) ||
+		 ((io->reaper != NULL) &&
+		 ((io->reaper)(io->inner) != ISC_R_SUCCESS)))
 		{
 
 			omapi_io_object_t *tmp = NULL;
@@ -721,7 +778,7 @@
 					omapi_io_reference(&prev->next,
 							 tmp, MDL);
 			} else {
-				omapi_io_dereference(&omapi_io_states.next, 
+				omapi_io_dereference(&omapi_io_states.next,
 						 MDL);
 				if (tmp != NULL)
 					omapi_io_reference
@@ -773,7 +830,7 @@
 {
 	if (h -> type != omapi_type_io_object)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> set_value)
 		return (*(h -> inner -> type -> set_value))
 			(h -> inner, id, name, value);
@@ -787,7 +844,7 @@
 {
 	if (h -> type != omapi_type_io_object)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
 			(h -> inner, id, name, value);
@@ -808,7 +865,7 @@
 
 	if (h -> type != omapi_type_io_object)
 		return DHCP_R_INVALIDARG;
-	
+
 	/* remove from the list of I/O states */
 	for (p = omapi_io_states.next; p; p = p -> next) {
 		if (p == (omapi_io_object_t *)h) {
@@ -837,9 +894,12 @@
 isc_result_t omapi_io_signal_handler (omapi_object_t *h,
 				 const char *name, va_list ap)
 {
+#ifdef DEBUG_PROTOCOL
+ log_debug ("omapi_io_signal_handler(%s)", name);
+#endif
 	if (h -> type != omapi_type_io_object)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> signal_handler)
 		return (*(h -> inner -> type -> signal_handler)) (h -> inner,
 								 name, ap);
@@ -864,9 +924,12 @@
 {
 	omapi_waiter_object_t *waiter;
 
+#ifdef DEBUG_PROTOCOL
+ log_debug ("omapi_waiter_signal_handler(%s)", name);
+#endif
 	if (h -> type != omapi_type_waiter)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (!strcmp (name, "ready")) {
 		waiter = (omapi_waiter_object_t *)h;
 		waiter -> ready = 1;

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/errwarn.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/errwarn.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/generic.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/generic.c Changed

@@ -3,7 +3,7 @@
 Subroutines that support the generic object. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -98,7 +98,7 @@
 		/* Notice a free slot if we pass one. */
 		else if (vfree == -1 && !g -> values i)
 			vfree = i;
-	}			
+	}
 
 	/* If the name isn't already attached to this object, see if an
 	 inner object has it. */
@@ -176,7 +176,7 @@
 	if (h -> type != omapi_type_generic)
 		return DHCP_R_INVALIDARG;
 	g = (omapi_generic_object_t *)h;
-	
+
 	/* Look up the specified name in our list of objects. */
 	for (i = 0; i < g -> nvalues; i++) {
 		if (!g -> valuesi)
@@ -191,7 +191,7 @@
 			return omapi_value_reference (value,
 						 g -> values i, MDL);
 		}
-	}			
+	}
 
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
@@ -208,7 +208,7 @@
 	if (h -> type != omapi_type_generic)
 		return ISC_R_UNEXPECTED;
 	g = (omapi_generic_object_t *)h;
-	
+
 	if (g -> values) {
 		for (i = 0; i < g -> nvalues; i++) {
 			if (g -> values i)
@@ -230,7 +230,7 @@
 {
 	if (h -> type != omapi_type_generic)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> signal_handler)
 		return (*(h -> inner -> type -> signal_handler)) (h -> inner,
 								 name, ap);
@@ -251,7 +251,7 @@
 	if (g -> type != omapi_type_generic)
 		return DHCP_R_INVALIDARG;
 	src = (omapi_generic_object_t *)g;
-	
+
 	for (i = 0; i < src -> nvalues; i++) {
 		if (src -> values i && src -> values i -> name -> len &&
 		 src -> changed i) {
@@ -270,7 +270,7 @@
 			if (status != ISC_R_SUCCESS)
 				return status;
 		}
-	}			
+	}
 
 	if (g -> inner && g -> inner -> type -> stuff_values)
 		return (*(g -> inner -> type -> stuff_values)) (c, id,

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/handle.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/handle.c Changed

@@ -3,7 +3,7 @@
 Functions for maintaining handles on objects. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -47,7 +47,7 @@
 next handle should go, and if necessary create additional nodes in
 the tree to contain the new handle. The pointer to the object is
 then stored in the correct position.
- 
+
 Theoretically, we could have some code here to free up handle
 tables as they go out of use, but by and large handle tables won't
 go out of use, so this is being skipped for now. It shouldn't be
@@ -77,7 +77,7 @@
 		*h = o -> handle;
 		return ISC_R_SUCCESS;
 	}
-	
+
 	if (!omapi_handle_table) {
 		omapi_handle_table = dmalloc (sizeof *omapi_handle_table, MDL);
 		if (!omapi_handle_table)
@@ -96,7 +96,7 @@
 
 	while (omapi_next_handle >= omapi_handle_table -> limit) {
 		omapi_handle_table_t *new;
-		
+
 		new = dmalloc (sizeof *new, MDL);
 		if (!new)
 			return ISC_R_NOMEMORY;
@@ -145,7 +145,7 @@
 
 	if (table -> first > h || table -> limit <= h)
 		return ISC_R_NOSPACE;
-	
+
 	/* If this is a leaf table, just stash the object in the
 	 appropriate place. */
 	if (table -> leafp) {
@@ -249,7 +249,7 @@
 
 	if (!table || table->first > h || table->limit <= h)
 		return(ISC_R_NOTFOUND);
-	
+
 	/* If this is a leaf table, just grab the object. */
 	if (table->leafp) {
 		/* Not there? */

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/hash.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/hash.c Changed

@@ -3,7 +3,7 @@
 Routines for manipulating hash tables... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -149,7 +149,7 @@
 		if (!n)
 			p = &c -> next;
 	}
-		
+
 	for (c = hash_bucket_hunks; c; c = n) {
 		n = c -> next;
 		if (c -> len != 126) {
@@ -300,7 +300,7 @@
 	 * The switch handles our starting conditions, then we hash the
 	 * remaining bytes in groups of 3
 	 */
-	 
+
 	switch (len % 3) {
 	case 0:
 		break;
@@ -386,7 +386,7 @@
 	 maxlen > 2147483647)
 		return (unsigned char *) "Report out of range for display.";
 
-	sprintf((char *)retbuf, 
+	sprintf((char *)retbuf,
 		"Contents/Size (%%): %u/%u (%u%%). Min/max: %u/%u",
 		contents, table->hash_count, pct, minlen, maxlen);
 
@@ -536,7 +536,7 @@
 	size_t i;
 	const unsigned char *s = v1;
 	const unsigned char *t = v2;
-	
+
 	for (i = 0; i < len; i++)
 	{
 		int c1, c2;

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/isclib.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/isclib.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2009-2019 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(C) 2009-2022 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
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * http://www.isc.org/
 *
@@ -40,7 +40,7 @@
 * It may be moved to be part of the dns client code instead
 * of being in the DHCP code
 */
-isc_result_t 
+isc_result_t
 dhcp_dns_client_setservers(void)
 {
 	isc_result_t result;
@@ -183,7 +183,7 @@
 		}
 
 		memset(&dhcp_gbl_ctx, 0, sizeof (dhcp_gbl_ctx));
-	
+
 		isc_lib_register();
 
 		/* get the current time for use as the random seed */
@@ -318,7 +318,7 @@
 	isc_buffer_t b;
 	isc_result_t result;
 
-	namelen = strlen((char *)namestr); 
+	namelen = strlen((char *)namestr);
 	isc_buffer_init(&b, namestr, namelen);
 	isc_buffer_add(&b, namelen);
 	dns_fixedname_init(namefix);

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/listener.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/listener.c Changed

@@ -3,7 +3,7 @@
 Subroutines that support the generic listener object. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -181,7 +181,7 @@
 error_exit:
 	if (obj != NULL) {
 		if (h->outer == (omapi_object_t *)obj) {
-			omapi_object_dereference((omapi_object_t **)&h->outer, 
+			omapi_object_dereference((omapi_object_t **)&h->outer,
 						 MDL);
 		}
 		if (obj->inner == h) {
@@ -205,7 +205,7 @@
 	if (h -> type != omapi_type_listener)
 		return -1;
 	l = (omapi_listener_object_t *)h;
-	
+
 	return l -> socket;
 }
 
@@ -287,7 +287,7 @@
 #ifdef DEBUG_PROTOCOL
 	log_debug ("omapi_accept()");
 #endif
-	
+
 	/* Get the handle. */
 	status = omapi_connection_allocate (obj, MDL);
 	if (status != ISC_R_SUCCESS)
@@ -417,7 +417,7 @@
 {
 	if (h -> type != omapi_type_listener)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> set_value)
 		return (*(h -> inner -> type -> set_value))
 			(h -> inner, id, name, value);
@@ -431,7 +431,7 @@
 {
 	if (h -> type != omapi_type_listener)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
 			(h -> inner, id, name, value);
@@ -450,7 +450,7 @@
 #ifdef DEBUG_PROTOCOL
 	log_debug ("omapi_listener_destroy()");
 #endif
-	
+
 	if (l -> socket != -1) {
 		close (l -> socket);
 		l -> socket = -1;
@@ -463,7 +463,7 @@
 {
 	if (h -> type != omapi_type_listener)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> signal_handler)
 		return (*(h -> inner -> type -> signal_handler)) (h -> inner,
 								 name, ap);
@@ -485,4 +485,3 @@
 								l -> inner);
 	return ISC_R_SUCCESS;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/message.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/message.c Changed

@@ -3,7 +3,7 @@
 Subroutines for dealing with message objects. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -158,7 +158,7 @@
 		if (status == ISC_R_SUCCESS)
 			return status;
 	}
-			 
+
 	return ISC_R_NOTFOUND;
 }
 
@@ -232,7 +232,7 @@
 	if (h -> type != omapi_type_message)
 		return DHCP_R_INVALIDARG;
 	m = (omapi_message_object_t *)h;
-	
+
 	if (!strcmp (name, "status")) {
 		if (m -> notify_object &&
 		 m -> notify_object -> type -> signal_handler)
@@ -271,7 +271,7 @@
 	if (mo -> type != omapi_type_message)
 		return DHCP_R_INVALIDARG;
 	m = (omapi_message_object_t *)mo;
-	
+
 	/* Already registered? */
 	if (m -> prev || m -> next || omapi_registered_messages == m)
 		return DHCP_R_INVALIDARG;
@@ -300,7 +300,7 @@
 	if (mo -> type != omapi_type_message)
 		return DHCP_R_INVALIDARG;
 	m = (omapi_message_object_t *)mo;
-	
+
 	/* Not registered? */
 	if (!m -> prev && omapi_registered_messages != m)
 		return DHCP_R_INVALIDARG;
@@ -550,7 +550,7 @@
 				(po, message -> id_object,
 				 ISC_R_NOTFOUND, message -> id,
 				 "no object matches specification");
-		}			
+		}
 
 		/* If we found an object, we're supposed to be creating an
 		 object, and we're not supposed to have found an object,
@@ -622,7 +622,7 @@
 					 "can't select authenticator");
 			}
 		}
-		
+
 		/* Now send the new contents of the object back in
 		 response. */
 		goto send;
@@ -636,7 +636,7 @@
 				 status, message -> id,
 				 "no matching handle");
 		}
-	 send:		
+	 send:
 		status = omapi_protocol_send_update (po, message -> id_object,
 						 message -> id, object);
 		omapi_object_dereference (&object, MDL);
@@ -666,7 +666,7 @@
 					 status, message -> id,
 					 "cannot update authenticator");
 			}
-			
+
 			status = omapi_protocol_add_auth (po, object,
 							 message -> h);
 		} else {

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/omapi.3 -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/omapi.3 Changed

@@ -1,7 +1,6 @@
 .\"	omapi.3
 .\"
-.\" Copyright (c) 2009-2010,2014 by Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 2000-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -17,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -49,7 +48,7 @@
 client will create a handle for a lease object, and will request the
 server to fill the lease handle's state. The client application can
 then pull details such as the lease expiration time from the lease
-handle. 
+handle.
 .PP
 Modifications can be made to the server state by creating handles to
 new objects, or by modifying attributes of handles to existing
@@ -58,8 +57,8 @@
 .SH USAGE
 .PP
 The client application must always call dhcpctl_initialize() before
-making calls to any other dhcpctl functions. This initializes 
-various internal data structures. 
+making calls to any other dhcpctl functions. This initializes
+various internal data structures.
 .PP
 To create the connection to the server the client must use
 dhcpctl_connect() function. As well as making the physical connection
@@ -194,7 +193,7 @@
 will expire.
 .PP
 .nf
-	
+
 			memcpy(&thetime, value->value, value->len);
 			dhcpctl_data_string_dereference(&value, MDL);
 
@@ -213,7 +212,7 @@
 		const char *algorithm = "hmac-md5";
 		const char *secret = "a-shared-secret";
 
-		dhcpctl_new_authenticator (&authenticator, 
+		dhcpctl_new_authenticator (&authenticator,
 keyname,
 algorithm,
 secret,
@@ -246,4 +245,3 @@
 is maintained by ISC. To learn more about Internet Systems Consortium,
 see
 .B https://www.isc.org
-

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/protocol.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/protocol.c Changed

@@ -3,7 +3,7 @@
 Functions supporting the object management protocol... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -338,7 +338,7 @@
 	}
 	return ISC_R_SUCCESS;
 }
-					 
+
 
 isc_result_t omapi_protocol_signal_handler (omapi_object_t *h,
 					 const char *name, va_list ap)
@@ -439,7 +439,7 @@
 		 byte order. */
 		omapi_connection_get_uint32 (c, &p -> protocol_version);
 		omapi_connection_get_uint32 (c, &p -> header_size);
-	
+
 		/* We currently only support the current protocol version. */
 		if (p -> protocol_version != OMAPI_PROTOCOL_VERSION) {
 			omapi_disconnect (c, 1);
@@ -538,7 +538,7 @@
 				(0, c, (p -> header_size -
 					sizeof (omapi_protocol_header_t)));
 		}
-						 
+
 		/* XXX must compute partial signature across the
 XXX preceding bytes. Also, if authenticator
 		 specifies encryption as well as signing, we may
@@ -602,7 +602,7 @@
 		if (omapi_connection_require (c, nlen) != ISC_R_SUCCESS)
 			break;
 		/* If it's already here, fall through. */
-					 
+
 	 case omapi_protocol_name_wait:
 		omapi_connection_copyout (p -> name -> value, c,
 					 p -> name -> len);
@@ -633,7 +633,7 @@
 		if (omapi_connection_require (c, vlen) != ISC_R_SUCCESS)
 			break;
 		/* If it's already here, fall through. */
-					 
+
 	 case omapi_protocol_value_wait:
 		omapi_connection_copyout (p -> value -> u.buffer.value, c,
 					 p -> value -> u.buffer.len);
@@ -697,7 +697,7 @@
 					 &p -> message -> authenticator,
 					 omapi_datatype_data,
 					 p -> message -> authlen);
-			
+
 		if (status != ISC_R_SUCCESS) {
 			if (signature != NULL) {
 				omapi_value_dereference (&signature, MDL);
@@ -756,7 +756,7 @@
 		previous_outstanding = 0xDEADBEEF;
 #endif
 		/* Now wait for the next message. */
-		goto to_header_wait;		
+		goto to_header_wait;
 
 	 default:
 		/* XXX should never get here. Assertion? */
@@ -899,7 +899,7 @@
 		return omapi_make_object_value (value, name,
 						p -> default_auth -> a, MDL);
 	}
-	
+
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
 			(h -> inner, id, name, value);
@@ -989,7 +989,7 @@
 		return DHCP_R_INVALIDARG;
 	}
 }
-					 
+
 
 /* Set up a listener for the omapi protocol. The handle stored points to
 a listener object, not a protocol object. */
@@ -1092,7 +1092,7 @@
 {
 	if (h -> type != omapi_type_protocol_listener)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> set_value)
 		return (*(h -> inner -> type -> set_value))
 			(h -> inner, id, name, value);
@@ -1106,7 +1106,7 @@
 {
 	if (h -> type != omapi_type_protocol_listener)
 		return DHCP_R_INVALIDARG;
-	
+
 	if (h -> inner && h -> inner -> type -> get_value)
 		return (*(h -> inner -> type -> get_value))
 			(h -> inner, id, name, value);
@@ -1298,8 +1298,8 @@
 			omapi_message_dereference (&message, MDL);
 			return status;
 		}
-	}		
-		
+	}
+
 	status = omapi_set_object_value (mo, (omapi_object_t *)0,
 					 "object", object);
 	if (status != ISC_R_SUCCESS) {

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/result.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/result.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/support.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/support.c Changed

@@ -3,7 +3,7 @@
 Subroutines providing general support for objects. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -308,7 +308,7 @@
 	omapi_object_t *outer;
 	isc_result_t status;
 
-#if defined (DEBUG)
+#if defined (DEBUG_PROTOCOL)
 	if (!value) {
 		log_info ("omapi_set_value (%.*s, NULL)",
 			 (int)name -> len, name -> value);
@@ -343,7 +343,7 @@
 							 id, name, value);
 	else
 		status = ISC_R_NOTFOUND;
-#if defined (DEBUG)
+#if defined (DEBUG_PROTOCOL)
 	log_info (" ==> %s", isc_result_totext (status));
 #endif
 	return status;
@@ -745,18 +745,18 @@
 				 const char *file, int line)
 {
 	isc_result_t status;
-	
+
 	status = omapi_value_new (vp, file, line);
 	if (status != ISC_R_SUCCESS)
 		return status;
-	
+
 	status = omapi_data_string_reference (&(*vp) -> name,
 name, file, line);
 	if (status != ISC_R_SUCCESS) {
 		omapi_value_dereference (vp, file, line);
 		return status;
 	}
-	
+
 	if (value) {
 		status = omapi_typed_data_new (file, line, &(*vp) -> value,
 					 omapi_datatype_object, value);
@@ -765,7 +765,7 @@
 			return status;
 		}
 	}
-	
+
 	return ISC_R_SUCCESS;
 }

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/test.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/test.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/toisc.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/toisc.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/omapip/trace.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/omapip/trace.c Changed

@@ -5,7 +5,7 @@
 transactions... */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 2001-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -21,8 +21,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -157,7 +157,7 @@
 	tfh.version = htonl (TRACEFILE_VERSION);
 	tfh.hlen = htonl (sizeof (tracefile_header_t));
 	tfh.phlen = htonl (sizeof (tracepacket_t));
-	
+
 	status = write (traceoutfile, &tfh, sizeof tfh);
 	if (status < 0) {
 		log_error ("%s(%d): trace_begin write failed: %m", file, line);
@@ -184,7 +184,7 @@
 			}
 		}
 	}
-	
+
 	return ISC_R_SUCCESS;
 }
 
@@ -222,7 +222,7 @@
 			 file ? file : "<unknown file>", line);
 		return DHCP_R_INVALIDARG;
 	}
-	
+
 	/* Compute the total length of the iov. */
 	length = 0;
 	for (i = 0; i < count; i++)
@@ -266,7 +266,7 @@
 	if (length % 8) {
 	 static char zero = { 0, 0, 0, 0, 0, 0, 0 };
 	 unsigned padl = 8 - (length % 8);
-		
+
 	 status = write (traceoutfile, zero, padl);
 	 if (status < 0) {
 		log_error ("%s(%d): trace_write_packet write failed: %m",
@@ -330,7 +330,7 @@
 	strcpy (ttmp -> name, name);
 	ttmp -> have_packet = have_packet;
 	ttmp -> stop_tracing = stop_tracing;
-	
+
 	if (traceoutfile) {
 		status = trace_type_record (ttmp, slen, file, line);
 		if (status != ISC_R_SUCCESS) {
@@ -345,7 +345,7 @@
 
 	return ttmp;
 }
-						 
+
 static isc_result_t trace_type_record (trace_type_t *ttmp, unsigned slen,
 				 const char *file, int line)
 {
@@ -403,7 +403,7 @@
 		}
 		prev = &tptr -> next;
 	}
-	
+
 	log_error ("No registered trace type for type name %.*s",
 		 (int)length - TRACE_INDEX_MAPPING_SIZE, tmap -> name);
 	return;
@@ -544,7 +544,7 @@
 		tpkt->type_index = ntohl(tpkt -> type_index);
 		tpkt->length = ntohl(tpkt -> length);
 		tpkt->when = ntohl(tpkt -> when);
-	
+
 		/* See if there's a handler for this packet type. */
 		if (tpkt->type_index < trace_type_count &&
 		 trace_typestpkt->type_index)
@@ -575,7 +575,7 @@
 					 "tracefile");
 				return DHCP_R_PROTOCOLERROR;
 			}
-				
+
 			status = fsetpos(traceinfile, &curpos);
 			if (status < 0) {
 				log_error("fsetpos in tracefile failed: %m");

_service:tar_scm:dhcp-4.4.2.tar.gz/relay/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/relay/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -203,8 +203,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -260,6 +258,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -271,6 +271,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -616,7 +617,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/relay/dhcrelay.8 -> _service:tar_scm:dhcp-4.4.3.tar.gz/relay/dhcrelay.8 Changed

@@ -1,6 +1,6 @@
 .\"	dhcrelay.8
 .\"
-.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 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
@@ -16,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -78,7 +78,7 @@
 
 .B ...
 .B -i
-.I interfaceN 
+.I interfaceN
 
 
 
@@ -103,6 +103,10 @@
 .B -U
 .I interface
 
+
+.B -g
+.I ipaddr
+
 .I server0
 
 .I ...serverN
@@ -142,7 +146,7 @@
 .I lowerN
 
 .B -u
-.I upper0 
+.I upper0
 
 .B ...
 .B -u
@@ -234,6 +238,12 @@
 a query that came via a different relay agent. If this option is not
 specified, such packets will be relayed anyway.
 .TP
+-g \fIipaddr\fR
+When a package gets sent back to the client, replace the gateway's IP
+address (giaddr) with the given \fIipaddr\fR. This can be used as a
+workaround for bogus clients like Solaris 11 grub, which use the giaddr
+instead of the announced router (3) to setup its default route.
+.TP
 -i \fIifname\fR
 Listen for DHCPv4/BOOTP traffic on interface \fIifname\fR. Multiple
 interfaces may be specified by using more than one \fB-i\fR option. If

_service:tar_scm:dhcp-4.4.2.tar.gz/relay/dhcrelay.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/relay/dhcrelay.c Changed

@@ -3,7 +3,7 @@
 DHCP/BOOTP Relay Agent. */
 
 /*
- * Copyright(c) 2004-2020 by Internet Systems Consortium, Inc.("ISC")
+ * Copyright(c) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -95,8 +95,8 @@
 forward_untouched,	/* Forward without changes. */
 discard } agent_relay_mode = forward_and_replace;
 
-u_int16_t local_port;
-u_int16_t remote_port;
+extern u_int16_t local_port;
+extern u_int16_t remote_port;
 
 /* Relay agent server list. */
 struct server_list {
@@ -105,6 +105,8 @@
 } *servers;
 
 struct interface_info *uplink = NULL;
+isc_boolean_t use_fake_gw = ISC_FALSE;
+struct in_addr gw = {0};
 
 #ifdef DHCPv6
 struct stream_list {
@@ -149,7 +151,7 @@
 static void request_v4_interface(const char* name, int flags);
 
 static const char copyright =
-"Copyright 2004-2020 Internet Systems Consortium.";
+"Copyright 2004-2022 Internet Systems Consortium.";
 static const char arr = "All rights reserved.";
 static const char message =
 "Internet Systems Consortium DHCP Relay Agent";
@@ -169,7 +171,7 @@
 " -i interface0 ... -i interfaceN\n" \
 " -iu interface0 ... -iu interfaceN\n" \
 " -id interface0 ... -id interfaceN\n" \
-" -U interface\n" \
+" -U interface -g <ip-address>\n" \
 " server0 ... serverN\n\n" \
 " %s -6 -d -q -I -c <hops>\n" \
 " -p <port> | -rp <relay-port>\n" \
@@ -189,7 +191,7 @@
 " -i interface0 ... -i interfaceN\n" \
 " -iu interface0 ... -iu interfaceN\n" \
 " -id interface0 ... -id interfaceN\n" \
-" -U interface\n" \
+" -U interface -g <ip-address>\n" \
 " server0 ... serverN\n\n" \
 " %s -6 -d -q -I -c <hops> -p <port>\n" \
 " -pf <pid-file> --no-pid\n" \
@@ -210,7 +212,7 @@
 " -i interface0 ... -i interfaceN\n" \
 " -iu interface0 ... -iu interfaceN\n" \
 " -id interface0 ... -id interfaceN\n" \
-" -U interface\n" \
+" -U interface -g <ip-address>\n" \
 " server0 ... serverN\n\n" \
 " %s {--version|--help|-h}"
 #else
@@ -221,7 +223,7 @@
 " -i interface0 ... -i interfaceN\n" \
 " -iu interface0 ... -iu interfaceN\n" \
 " -id interface0 ... -id interfaceN\n" \
-" -U interface\n" \
+" -U interface -g <ip-address>\n" \
 " server0 ... serverN\n\n" \
 " %s {--version|--help|-h}"
 #endif
@@ -235,10 +237,10 @@
 * 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.
+ * command 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.
+ * \param sarg - Generally the offending argument from the command line.
 *
 * \return Nothing
 */
@@ -547,6 +549,21 @@
 			/* Turn on -a, in case they don't do so explicitly */
 			add_agent_options = 1;
 			add_rfc3527_suboption = 1;
+		} else if (!strcmp(argvi, "-g")) {
+			if (++i == argc)
+				usage(use_noarg, argvi-1);
+#ifdef DHCPv6
+			if (local_family_set && (local_family == AF_INET6)) {
+				usage(use_v4command, argvi);
+			}
+			local_family_set = 1;
+			local_family = AF_INET;
+#endif
+			if (inet_pton(AF_INET, argvi, &gw) <= 0) {
+				usage("Invalid gateway address '%s'", argvi);
+			} else {
+				use_fake_gw = ISC_TRUE;
+			}
 		} else if (!strcmp(argvi, "-D")) {
 #ifdef DHCPv6
 			if (local_family_set && (local_family == AF_INET6)) {
@@ -878,6 +895,7 @@
 			return;
 		}
 
+		log_debug("BOOTREPLY giaddr: %s\n", inet_ntoa(packet->giaddr));
 		if (!(packet->flags & htons(BOOTP_BROADCAST)) &&
 			can_unicast_without_arp(out)) {
 			to.sin_addr = packet->yiaddr;
@@ -916,6 +934,10 @@
 			return;
 		}
 
+		if (use_fake_gw) {
+			packet->giaddr = gw;
+		}
+
 		if (send_packet(out, NULL, packet, length, out->addresses0,
 				&to, htop) < 0) {
 			++server_packet_errors;

_service:tar_scm:dhcp-4.4.2.tar.gz/relay/tests/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/relay/tests/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -185,8 +185,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -242,6 +240,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -253,6 +253,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -535,7 +536,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/relay/tests/relay_unittests.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/relay/tests/relay_unittests.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2019-2022 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
@@ -14,8 +14,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -400,9 +400,32 @@
 }
 }
 
+ATF_TC(gwaddr_override_test);
+
+ATF_TC_HEAD(gwaddr_override_test, tc) {
+ atf_tc_set_md_var(tc, "descr", "tests that gateway addr (giaddr) field can be overridden");
+}
+
+extern isc_boolean_t use_fake_gw;
+extern struct in_addr gw;
+
+/* This basic test checks if the new gwaddr override (-g) option is disabled by default */
+ATF_TC_BODY(gwaddr_override_test, tc) {
+
+ if (use_fake_gw == ISC_TRUE) {
+ atf_tc_fail("the gwaddr override should be disabled by default");
+ }
+ char txt16 = {0};
+ inet_ntop(AF_INET, &gw, txt, sizeof(txt));
+ if (strncmp(txt, "0.0.0.0", 8) != 0) {
+ atf_tc_fail("the default gwaddr override value should be 0.0.0.0, but is %s", txt);
+ }
+}
+
 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);
+ ATF_TP_ADD_TC(tp, gwaddr_override_test);
 
 return (atf_no_error());
 }

_service:tar_scm:dhcp-4.4.2.tar.gz/server/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -237,8 +237,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -294,6 +292,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -305,6 +305,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -1009,7 +1010,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/server/bootp.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/bootp.c Changed

@@ -3,7 +3,7 @@
 BOOTP Protocol support. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -174,7 +174,7 @@
 					 &lease->scope, hp->group,
 					 lease->subnet->group, NULL);
 	}
-	
+
 	/* Drop the request if it's not allowed for this client. */
 	if ((oc = lookup_option (&server_universe, options, SV_ALLOW_BOOTP)) &&
 	 !evaluate_boolean_option_cache(&ignorep, packet, lease,
@@ -184,7 +184,7 @@
 		if (!ignorep)
 			log_info ("%s: bootp disallowed", msgbuf);
 		goto out;
-	} 
+	}
 
 	if ((oc = lookup_option(&server_universe,
 				 options, SV_ALLOW_BOOTING)) &&

_service:tar_scm:dhcp-4.4.2.tar.gz/server/class.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/class.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/confpars.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/confpars.c Changed

@@ -3,7 +3,7 @@
 Parser for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -142,7 +142,7 @@
 	if (lseek (file, (off_t)0, SEEK_SET) < 0)
 		goto boom;
 	/* Can't handle files greater than 2^31-1. */
-	if (flen > 0x7FFFFFFFUL)
+	if ((sizeof(void*) < 8) && flen > 0x7FFFFFFFUL)
 		log_fatal ("%s: file is too long to buffer.", filename);
 	ulen = flen;
 
@@ -198,7 +198,7 @@
 	static int postconf_initialized;
 	static int leaseconf_initialized;
 	isc_result_t status;
-	
+
 	/* Do what's done above, except that we don't have to read in the
 	 data, because it's already been read for us. */
 	tflen = strlen (data);
@@ -389,7 +389,7 @@
 			parse_semi (cfile);
 		}
 		return 1;
-		
+
 	 case HOST:
 		skip_token(&val, (unsigned *)0, cfile);
 		if (type != HOST_DECL && type != CLASS_DECL) {
@@ -612,7 +612,7 @@
 		} else if (type != SUBNET_DECL && type != SHARED_NET_DECL) {
 			parse_warn (cfile, "pool declared outside of network");
 			skip_to_semi(cfile);
-		} else 
+		} else
 			parse_pool_statement (cfile, group, type);
 
 		return declaration;
@@ -672,7 +672,7 @@
 		} else if (type != SUBNET_DECL) {
 			parse_warn (cfile, "pool6 declared outside of network");
 			skip_to_semi(cfile);
-		} else 
+		} else
 			parse_pool6_statement (cfile, group, type);
 
 		return declaration;
@@ -697,7 +697,7 @@
 		group -> authoritative = 1;
 	 authoritative:
 		if (type == HOST_DECL)
-			parse_warn (cfile, "authority makes no sense here."); 
+			parse_warn (cfile, "authority makes no sense here.");
 		parse_semi (cfile);
 		break;
 
@@ -803,8 +803,8 @@
 		skip_to_semi (cfile);
 #endif
 		break;
-			
-#ifdef DHCPv6 
+
+#ifdef DHCPv6
 	 case SERVER_DUID:
 		parse_server_duid_conf(cfile);
 		break;
@@ -1116,7 +1116,7 @@
 				goto make_hba;
 			}
 			break;
-			
+
 		 case LOAD:
 			token = next_token (&val, (unsigned *)0, cfile);
 			if (token != BALANCE) {
@@ -1142,7 +1142,7 @@
 			}
 			peer -> load_balance_max_secs = atoi (val);
 			break;
-			
+
 		 default:
 			parse_warn (cfile,
 				 "invalid statement in peer declaration");
@@ -1300,11 +1300,11 @@
 			state -> mclt = atoi (val);
 			parse_semi (cfile);
 			break;
-			
+
 		 default:
 			parse_warn (cfile, "expecting state setting.");
 		 bogus:
-			skip_to_rbrace (cfile, 1);	
+			skip_to_rbrace (cfile, 1);
 			dhcp_failover_state_dereference (&state, MDL);
 			return;
 		}
@@ -1355,23 +1355,23 @@
 	 case RECOVER:
 		state_in = recover;
 		break;
-		
+
 	 case RECOVER_WAIT:
 		state_in = recover_wait;
 		break;
-		
+
 	 case RECOVER_DONE:
 		state_in = recover_done;
 		break;
-		
+
 	 case SHUTDOWN:
 		state_in = shut_down;
 		break;
-		
+
 	 case PAUSED:
 		state_in = paused;
 		break;
-		
+
 	 case STARTUP:
 		state_in = startup;
 		break;
@@ -1391,7 +1391,7 @@
 			skip_to_semi (cfile);
 			return;
 		}
-		
+
 		stos_in = parse_date (cfile);
 		if (!stos_in)
 			return;
@@ -1405,7 +1405,7 @@
 }
 #endif /* defined (FAILOVER_PROTOCOL) */
 
-/*! 
+/*!
 * \brief Parses an authoring-byte-order statement
 *
 * A valid statement looks like this:
@@ -1516,14 +1516,14 @@
 }
 
 /*!
- * 
+ *
 * \brief Parse allow and deny statements
 *
 * This function handles the common processing code for permit and deny
 * statements in the parse_pool_statement and parse_pool6_statement functions.
 * It reads in the configuration and constructs a new permit structure that it
 * attachs to the permit_head passed in from the caller.
- * 
+ *
 * The allow or deny token should already be consumed, this function expects
 * one of the following:
 * known-clients;
@@ -1569,7 +1569,7 @@
 	 case UNKNOWN:
 		permit->type = permit_unknown_clients;
 		break;
-				
+
 	 case KNOWN_CLIENTS:
 		need_clients = 0;
 		permit->type = permit_known_clients;
@@ -1583,11 +1583,11 @@
 	 case KNOWN:
 		permit->type = permit_known_clients;
 		break;
-				
+
 	 case AUTHENTICATED:
 		permit->type = permit_authenticated_clients;
 		break;
-				
+
 	 case UNAUTHENTICATED:
 		permit->type = permit_unauthenticated_clients;
 		break;
@@ -1595,7 +1595,7 @@
 	 case ALL:
 		permit->type = permit_all_clients;
 		break;
-				
+
 	 case DYNAMIC:
 		permit->type = permit_dynamic_bootp_clients;
 		if (next_token (&val, NULL, cfile) != TOKEN_BOOTP) {
@@ -1762,7 +1762,7 @@
 	/* Inherit the failover peer from the shared network. */
 	if (pool->shared_network->failover_peer)
 	 dhcp_failover_state_reference
-		 (&pool->failover_peer, 
+		 (&pool->failover_peer,
 		 pool->shared_network->failover_peer, MDL);
 #endif
 
@@ -1790,7 +1790,7 @@
 					(&pool->failover_peer, MDL);
 #endif
 			break;
-				
+
 #if defined (FAILOVER_PROTOCOL)
 		 case FAILOVER:
 			skip_token(&val, NULL, cfile);
@@ -1837,7 +1837,7 @@
 			get_permit(cfile, &pool->prohibit_list, 0,
 				 &pool->valid_from, &pool->valid_until);
 			break;
-			
+
 		 case RBRACE:
 			skip_token(&val, NULL, cfile);
 			done = 1;
@@ -2110,7 +2110,7 @@
 	 		skip_token(&val, NULL, cfile);
 			token = next_token(&val, NULL, cfile);
 			if (token == V6RELOPT) {
-				token = next_token(&val, NULL, cfile);				
+				token = next_token(&val, NULL, cfile);
 				if (token != NUMBER) {
 					parse_warn(cfile,
 						 "host-identifier v6relopt "
@@ -2127,7 +2127,7 @@
 					break;
 				}
 			} else if (token != OPTION) {
-				parse_warn(cfile, 
+				parse_warn(cfile,
 					 "host-identifier must be an option"
 					 " or v6relopt");
 				skip_to_rbrace(cfile, 1);
@@ -2141,7 +2141,7 @@
 			}
 			if (!known) {
 				parse_warn(cfile, "unknown option %s.%s",
-					 option->universe->name, 
+					 option->universe->name,
 					 option->name);
 				skip_to_rbrace(cfile, 1);
 				break;
@@ -2152,7 +2152,7 @@
 		 	option_dereference(&option, MDL);
 		 	break;
 }
- 
+
 			if (!parse_semi(cfile)) {
 				skip_to_rbrace(cfile, 1);
 				expression_dereference(&expr, MDL);
@@ -2162,7 +2162,7 @@
 
 			option_reference(&host->host_id_option, option, MDL);
 			option_dereference(&option, MDL);
-			data_string_copy(&host->host_id, 
+			data_string_copy(&host->host_id,
 					 &expr->data.const_data, MDL);
 			expression_dereference(&expr, MDL);
 			continue;
@@ -2198,7 +2198,7 @@
 						 MDL);
 			}
 		}
-				
+
 		if (dynamicp)
 			host -> flags |= HOST_DECL_DYNAMIC;
 		else
@@ -2303,7 +2303,7 @@
 					 data.len + 1, MDL)) {
 				if (pc)
 					class_dereference (&pc, MDL);
-				
+
 				return 0;
 			}
 			data.terminated = 1;
@@ -2561,7 +2561,7 @@
 	if (class->flags & CLASS_DECL_DELETED) {
 		if (type == CLASS_TYPE_CLASS) {
 			struct class *theclass = NULL;
-		
+
 			status = find_class(&theclass, class->name, MDL);
 			if (status == ISC_R_SUCCESS) {
 				delete_class(theclass, 0);
@@ -2681,7 +2681,7 @@
 
 
 static int
-common_subnet_parsing(struct parse *cfile, 
+common_subnet_parsing(struct parse *cfile,
 		 struct shared_network *share,
 		 struct subnet *subnet) {
 	enum dhcp_token token;
@@ -2852,7 +2852,7 @@
 	const char *val;
 	char *endp;
 	int ofs;
-	const static int mask = { 0x00, 0x80, 0xC0, 0xE0, 
+	const static int mask = { 0x00, 0x80, 0xC0, 0xE0,
 				 0xF0, 0xF8, 0xFC, 0xFE };
 	struct iaddr iaddr;
 
@@ -2919,8 +2919,8 @@
 	}
 
 	subnet->prefix_len = strtol(val, &endp, 10);
-	if ((subnet->prefix_len < 0) || 
-	 (subnet->prefix_len > 128) || 
+	if ((subnet->prefix_len < 0) ||
+	 (subnet->prefix_len > 128) ||
 	 (*endp != '\0')) {
 	 	parse_warn(cfile, "Expecting a number between 0 and 128.");
 		subnet_dereference(&subnet, MDL);
@@ -2935,8 +2935,8 @@
 		return;
 	}
 
-	/* 
-	 * Create a netmask. 
+	/*
+	 * Create a netmask.
 	 */
 	subnet->netmask.len = 16;
 	ofs = subnet->prefix_len / 8;
@@ -2988,12 +2988,12 @@
 	token = peek_token(&val, NULL, cfile);
 	if (is_identifier (token) || token == STRING) {
 		skip_token(&val, NULL, cfile);
-		
+
 		name = dmalloc(strlen(val) + 1, MDL);
 		if (!name)
 			log_fatal("no memory for group decl name %s", val);
 		strcpy(name, val);
-	}		
+	}
 
 	if (!parse_lbrace(cfile)) {
 		group_dereference(&g, MDL);
@@ -3059,8 +3059,8 @@
 			 | ip-addrs-or-hostnames ip-addr-or-hostname */
 
 int
-parse_fixed_addr_param(struct option_cache **oc, 
-		 struct parse *cfile, 
+parse_fixed_addr_param(struct option_cache **oc,
+		 struct parse *cfile,
 		 enum dhcp_token type) {
 	int parse_ok;
 	const char *val;
@@ -3197,17 +3197,17 @@
 				seenbit = 1;
 				lease -> starts = t;
 				break;
-			
+
 			 case ENDS:
 				seenbit = 2;
 				lease -> ends = t;
 				break;
-				
+
 			 case TSTP:
 				seenbit = 65536;
 				lease -> tstp = t;
 				break;
-				
+
 			 case TSFP:
 				seenbit = 131072;
 				lease -> tsfp = t;
@@ -3217,12 +3217,12 @@
 				seenbit = 262144;
 				lease->atsfp = t;
 				break;
-				
+
 			 case CLTT:
 				seenbit = 524288;
 				lease -> cltt = t;
 				break;
-				
+
 			 default: /* for gcc, we'll never get here. */
 				log_fatal ("Impossible error at %s:%d.", MDL);
 				return 0;
@@ -3442,7 +3442,7 @@
 				}
 			}
 			break;
-			
+
 		 case BILLING:
 			seenbit = 2048;
 			class = (struct class *)0;
@@ -3540,7 +3540,7 @@
 
 		 case TOKEN_SET:
 			noequal = 0;
-			
+
 			token = next_token (&val, (unsigned *)0, cfile);
 			if (token != NAME && token != NUMBER_OR_NAME) {
 				parse_warn (cfile,
@@ -3551,7 +3551,7 @@
 				lease_dereference (&lease, MDL);
 				return 0;
 			}
-			
+
 			seenbit = 0;
 		 special_set:
 			if (lease -> scope)
@@ -3852,7 +3852,7 @@
 		 then look for a pool with an empty prohibit list and
 		 a permit list with one entry that permits all clients. */
 		for (pool = share -> pools; pool; pool = pool -> next) {
-			if ((!dynamic && !pool -> permit_list && 
+			if ((!dynamic && !pool -> permit_list &&
 			 pool -> prohibit_list &&
 			 !pool -> prohibit_list -> next &&
 			 (pool -> prohibit_list -> type ==
@@ -3980,7 +3980,7 @@
 	pool->ipv6_pond = NULL;
 	ipv6_pond_reference(&pool->ipv6_pond, pond, MDL);
 
-	/* 
+	/*
 	 * Increase our array size for ipv6_pools in the pond
 	 */
 	if (pond->ipv6_pools == NULL) {
@@ -3996,7 +3996,7 @@
 		log_fatal("Out of memory");
 	}
 	if (num_pools > 0) {
-		memcpy(tmp, pond->ipv6_pools, 
+		memcpy(tmp, pond->ipv6_pools,
 		 sizeof(struct ipv6_pool *) * num_pools);
 	}
 	if (pond->ipv6_pools != NULL) {
@@ -4004,7 +4004,7 @@
 	}
 	pond->ipv6_pools = tmp;
 
-	/* 
+	/*
 	 * Record this pool in our array of pools for this shared network.
 	 */
 	ipv6_pool_reference(&pond->ipv6_poolsnum_pools, pool, MDL);
@@ -4055,11 +4055,11 @@
 * with a single entry that permits all clients. If the shared
 * network doesn't have one of them create it and attach it to
 * the shared network and the return argument.
- * 
+ *
 * This function is used when we have a range6 or prefix6 statement
 * inside a subnet6 statement but outside of a pool6 statement.
 * This routine constructs the missing ipv6_pond structure so
- * we always have 
+ * we always have
 * shared_network -> ipv6_pond -> ipv6_pool
 *
 * \paramin group = a pointer to the group structure from which
@@ -4094,7 +4094,7 @@
 
 	/* no pond available, make one */
 	status = ipv6_pond_allocate(&pond, MDL);
-	if (status != ISC_R_SUCCESS) 
+	if (status != ISC_R_SUCCESS)
 		log_fatal ("no memory for ad-hoc ipv6 pond: %s",
 			 isc_result_totext (status));
 	p = new_permit (MDL);
@@ -4110,7 +4110,7 @@
 
 	if (shared->ipv6_pond)
 		ipv6_pond_reference(&last->next, pond, MDL);
-	else 
+	else
 		ipv6_pond_reference(&shared->ipv6_pond, pond, MDL);
 
 	shared_network_reference(&pond->shared_network, shared, MDL);
@@ -4126,7 +4126,7 @@
 			 | ip-address6 SLASH number SEMI
 			 | ip-address6 SLASH number TEMPORARY SEMI */
 
-void 
+void
 parse_address_range6(struct parse *cfile,
 		 struct group *group,
 		 struct ipv6_pond *inpond) {
@@ -4171,7 +4171,7 @@
 	memset(&net, 0, sizeof(net));
 	net.cidrnet.lo_addr = lo;
 
-	/* 
+	/*
 	 * See if we we're using range or CIDR notation or TEMPORARY
 	 */
 	token = peek_token(&val, NULL, cfile);
@@ -4181,7 +4181,7 @@
 		 */
 		skip_token(NULL, NULL, cfile);
 		token = next_token(&val, NULL, cfile);
-		if (token != NUMBER) { 
+		if (token != NUMBER) {
 			parse_warn(cfile, "expecting number");
 			skip_to_semi(cfile);
 			return;
@@ -4237,7 +4237,7 @@
 
 	} else {
 		/*
-		 * No '/', so we are looking for the end address of 
+		 * No '/', so we are looking for the end address of
 		 * the IPv6 pool.
 		 */
 		if (!parse_ip6_addr(cfile, &hi)) {
@@ -4278,12 +4278,12 @@
 	/* Now that we have a pond add the nets we have parsed */
 	for (p=nets; p != NULL; p=p->next) {
 		add_ipv6_pool_to_subnet(group->subnet, type,
-					&p->cidrnet.lo_addr, 
+					&p->cidrnet.lo_addr,
 					p->cidrnet.bits, 128, pond);
 	}
 
 	/* if we allocated a list free it now */
-	if (nets != &net) 
+	if (nets != &net)
 		free_iaddrcidrnetlist(&nets);
 
 	ipv6_pond_dereference(&pond, MDL);
@@ -4298,7 +4298,7 @@
 
 /* prefix6-declaration :== ip-address6 ip-address6 SLASH number SEMI */
 
-void 
+void
 parse_prefix6(struct parse *cfile,
 	 struct group *group,
 	 struct ipv6_pond *inpond) {
@@ -4432,7 +4432,7 @@
 	} else {
 		add_ipv6_pond_to_network(group, &pond);
 	}
-		
+
 	for (p = nets; p != NULL; p = p->next) {
 		/* Normalize and check. */
 		if (p->cidrnet.bits == 128) {
@@ -4612,7 +4612,7 @@
 			get_permit(cfile, &pond->prohibit_list, 0,
 				 &pond->valid_from, &pond->valid_until);
 			break;
-			
+
 		 case RBRACE:
 			skip_token(&val, NULL, cfile);
 			done = 1;
@@ -4641,7 +4641,7 @@
 	 * to repoint the leases to the other pond which is annoying. SAR
 	 */
 
-	/* 
+	/*
 	 * Add this pond to the list (will need updating if we add the
 	 * optimization).
 	 */
@@ -4891,7 +4891,7 @@
 				prefer = atoi (val);
 
 				/*
-				 * Currently we peek for the semi-colon to 
+				 * Currently we peek for the semi-colon to
 				 * allow processing of older lease files that
 				 * don't have the semi-colon. Eventually we
 				 * should remove the peeking code.
@@ -4919,7 +4919,7 @@
 				valid = atoi (val);
 
 				/*
-				 * Currently we peek for the semi-colon to 
+				 * Currently we peek for the semi-colon to
 				 * allow processing of older lease files that
 				 * don't have the semi-colon. Eventually we
 				 * should remove the peeking code.
@@ -5054,7 +5054,7 @@
 				}
 
 				break;
-			 
+
 			 default:
 				parse_warn(cfile, "corrupt lease file; "
 						 "expecting ia_na contents, "
@@ -5115,7 +5115,7 @@
 			}
 			executable_statement_dereference (&on_stari, MDL);
 		}
-			
+
 		/* find the pool this address is in */
 		pool = NULL;
 		if (find_ipv6_pool(&pool, D6O_IA_NA,
@@ -5170,7 +5170,7 @@
 	if (ia_hash_lookup(&old_ia, ia_na_active,
 			 (unsigned char *)ia->iaid_duid.data,
 			 ia->iaid_duid.len, MDL)) {
-		ia_hash_delete(ia_na_active, 
+		ia_hash_delete(ia_na_active,
 			 (unsigned char *)ia->iaid_duid.data,
 			 ia->iaid_duid.len, MDL);
 		ia_dereference(&old_ia, MDL);
@@ -5180,7 +5180,7 @@
 	 * If we have addresses, add this, otherwise don't bother.
 	 */
 	if (ia->num_iasubopt > 0) {
-		ia_hash_add(ia_na_active, 
+		ia_hash_add(ia_na_active,
 			 (unsigned char *)ia->iaid_duid.data,
 			 ia->iaid_duid.len, ia, MDL);
 	}
@@ -5339,7 +5339,7 @@
 				prefer = atoi (val);
 
 				/*
-				 * Currently we peek for the semi-colon to 
+				 * Currently we peek for the semi-colon to
 				 * allow processing of older lease files that
 				 * don't have the semi-colon. Eventually we
 				 * should remove the peeking code.
@@ -5367,7 +5367,7 @@
 				valid = atoi (val);
 
 				/*
-				 * Currently we peek for the semi-colon to 
+				 * Currently we peek for the semi-colon to
 				 * allow processing of older lease files that
 				 * don't have the semi-colon. Eventually we
 				 * should remove the peeking code.
@@ -5500,9 +5500,9 @@
 						return;
 					}
 				}
-					
+
 				break;
-			 
+
 			 default:
 				parse_warn(cfile, "corrupt lease file; "
 						 "expecting ia_ta contents, "
@@ -5563,7 +5563,7 @@
 			}
 			executable_statement_dereference (&on_stari, MDL);
 		}
-			
+
 		/* find the pool this address is in */
 		pool = NULL;
 		if (find_ipv6_pool(&pool, D6O_IA_TA,
@@ -5607,7 +5607,7 @@
 	if (ia_hash_lookup(&old_ia, ia_ta_active,
 			 (unsigned char *)ia->iaid_duid.data,
 			 ia->iaid_duid.len, MDL)) {
-		ia_hash_delete(ia_ta_active, 
+		ia_hash_delete(ia_ta_active,
 			 (unsigned char *)ia->iaid_duid.data,
 			 ia->iaid_duid.len, MDL);
 		ia_dereference(&old_ia, MDL);
@@ -5617,7 +5617,7 @@
 	 * If we have addresses, add this, otherwise don't bother.
 	 */
 	if (ia->num_iasubopt > 0) {
-		ia_hash_add(ia_ta_active, 
+		ia_hash_add(ia_ta_active,
 			 (unsigned char *)ia->iaid_duid.data,
 			 ia->iaid_duid.len, ia, MDL);
 	}
@@ -5777,7 +5777,7 @@
 				prefer = atoi (val);
 
 				/*
-				 * Currently we peek for the semi-colon to 
+				 * Currently we peek for the semi-colon to
 				 * allow processing of older lease files that
 				 * don't have the semi-colon. Eventually we
 				 * should remove the peeking code.
@@ -5805,7 +5805,7 @@
 				valid = atoi (val);
 
 				/*
-				 * Currently we peek for the semi-colon to 
+				 * Currently we peek for the semi-colon to
 				 * allow processing of older lease files that
 				 * don't have the semi-colon. Eventually we
 				 * should remove the peeking code.
@@ -5940,7 +5940,7 @@
 				}
 
 				break;
-			 
+
 			 default:
 				parse_warn(cfile, "corrupt lease file; "
 						 "expecting ia_pd contents, "
@@ -6001,7 +6001,7 @@
 			}
 			executable_statement_dereference (&on_stari, MDL);
 		}
-			
+
 		/* Find the pool this address is in. We need to check prefix
 		 * lengths too in case the pool has been reconfigured. */
 		pool = NULL;
@@ -6057,7 +6057,7 @@
 	 * If we have prefixes, add this, otherwise don't bother.
 	 */
 	if (ia->num_iasubopt > 0) {
-		ia_hash_add(ia_pd_active, 
+		ia_hash_add(ia_pd_active,
 			 (unsigned char *)ia->iaid_duid.data,
 			 ia->iaid_duid.len, ia, MDL);
 	}
@@ -6065,9 +6065,9 @@
 #endif /* defined(DHCPv6) */
 }
 
-#ifdef DHCPv6 
+#ifdef DHCPv6
 /*
- * When we parse a server-duid statement in a lease file, we are 
+ * When we parse a server-duid statement in a lease file, we are
 * looking at the saved server DUID from a previous run. In this case
 * we expect it to be followed by the binary representation of the
 * DUID stored in a string:
@@ -6078,7 +6078,7 @@
 *
 * server-duid 00:01:00:01:1e:68:b3:db:0a:00:27:00:00:02;
 */
-void 
+void
 parse_server_duid(struct parse *cfile) {
 	struct data_string duid;
 	unsigned char bytes128; /* Maximum valid DUID is 128 */
@@ -6117,7 +6117,7 @@
 * server-duid ll ethernet|ieee802|fddi 00:16:6F:49:7D:9B;
 * server-duid en 2495 "enterprise-specific-identifier-1234";
 */
-void 
+void
 parse_server_duid_conf(struct parse *cfile) {
 	enum dhcp_token token;
 	const char *val;
@@ -6139,7 +6139,7 @@
 	 */
 	token = next_token(&val, NULL, cfile);
 
-	/* 
+	/*
 	 * Enterprise is the easiest - enterprise number and raw data
 	 * are required.
 	 */
@@ -6179,7 +6179,7 @@
 		data_string_forget(&duid, MDL);
 	}
 
-	/* 
+	/*
 	 * Next easiest is the link-layer DUID. It consists only of
 	 * the LL directive, or optionally the specific value to use.
 	 *
@@ -6208,7 +6208,7 @@
 				parse_warn(cfile, "hardware type expected");
 				skip_to_semi(cfile);
 				return;
-			} 
+			}
 			memset(&ll_addr, 0, sizeof(ll_addr));
 			if (!parse_cshl(&ll_addr, cfile)) {
 				return;
@@ -6225,7 +6225,7 @@
 			duid.data = (unsigned char *)duid.buffer->data;
 			putUShort(duid.buffer->data, DUID_LL);
 			putUShort(duid.buffer->data + 2, ll_type);
-			memcpy(duid.buffer->data + 4, 
+			memcpy(duid.buffer->data + 4,
 			 ll_addr.data, ll_addr.len);
 
 			set_server_duid(&duid);
@@ -6234,7 +6234,7 @@
 		}
 	}
 
-	/* 
+	/*
 	 * Finally the link-layer DUID plus time. It consists only of
 	 * the LLT directive, or optionally the specific value to use.
 	 *
@@ -6263,8 +6263,8 @@
 				parse_warn(cfile, "hardware type expected");
 				skip_to_semi(cfile);
 				return;
-			} 
-			
+			}
+
 			token = next_token(&val, NULL, cfile);
 			if (token != NUMBER) {
 				parse_warn(cfile, "timestamp expected");
@@ -6290,7 +6290,7 @@
 			putUShort(duid.buffer->data, DUID_LLT);
 			putUShort(duid.buffer->data + 2, ll_type);
 			putULong(duid.buffer->data + 4, llt_time);
-			memcpy(duid.buffer->data + 8, 
+			memcpy(duid.buffer->data + 8,
 			 ll_addr.data, ll_addr.len);
 
 			set_server_duid(&duid);
@@ -6306,7 +6306,7 @@
 	 *
 	 * In this case, they have to put in the complete value.
 	 *
-	 * This also works for existing DUID types of course. 
+	 * This also works for existing DUID types of course.
 	 */
 	else if (token == NUMBER) {
 		duid_type_num = atoi(val);
@@ -6353,7 +6353,7 @@
 	}
 }
 
-/*! 
+/*!
 * \brief Creates a byte-order corrected uint32 from a buffer
 *
 * This function creates an integer value from a buffer, converting from
@@ -6437,4 +6437,3 @@
 }
 
 #endif /* DHCPv6 */
-

_service:tar_scm:dhcp-4.4.2.tar.gz/server/db.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/db.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/ddns.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/ddns.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/dhcp.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/dhcp.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/dhcpd.8 -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/dhcpd.8 Changed

@@ -1,6 +1,6 @@
 .\"	dhcpd.8
 .\"
-.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 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
@@ -16,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -54,7 +54,7 @@
 
 
 .B -4
-| 
+|
 .B -6
 
 
@@ -127,7 +127,7 @@
 There are two versions of the DHCP protocol DHCPv4 and DHCPv6. At
 startup the server may be started for one or the other via the
 .B -4
-or 
+or
 .B -6
 arguments.
 .PP
@@ -220,7 +220,7 @@
 be launched using the same \fIport\fR argument.
 .TP
 .BI \-p \ port
-The UDP port number on which 
+The UDP port number on which
 .B dhcpd
 should listen. If unspecified
 .B dhcpd
@@ -228,7 +228,7 @@
 purposes.
 .TP
 .BI \-s \ address
-Specify an address or host name to which 
+Specify an address or host name to which
 .B dhcpd
 should send replies rather than the broadcast address (255.255.255.255).
 This option is only supported in IPv4.
@@ -237,8 +237,8 @@
 Force
 .B dhcpd
 to run as a foreground process instead of as a daemon in the background.
-This is useful when running 
-.B dhcpd 
+This is useful when running
+.B dhcpd
 under a debugger, or when running it
 out of inittab on System V systems.
 .TP
@@ -246,14 +246,14 @@
 Send log messages to the standard error descriptor.
 This can be useful for debugging, and also at sites where a
 complete log of all dhcp activity must be kept but syslogd is not
-reliable or otherwise cannot be used. Normally, 
+reliable or otherwise cannot be used. Normally,
 .B dhcpd
 will log all
 output using the \fBsyslog(3)\fR function with the log facility set to
 LOG_DAEMON. Note that \fB\-d\fR implies \fB\-f\fR (the daemon will
 not fork itself into the background).
 .TP
-.BI \-q 
+.BI \-q
 Be quiet at startup. This suppresses the printing of the entire
 copyright message during startup. This might be desirable when
 starting
@@ -319,7 +319,7 @@
 Print version number and exit.
 .PP
 .I Modifying default file locations:
-The following options can be used to modify the locations 
+The following options can be used to modify the locations
 .B dhcpd
 uses for its files. Because of the importance of using the same
 lease database at all times when running dhcpd in production, these
@@ -690,7 +690,7 @@
 .PP
 Named groups currently can only be associated with
 hosts - this allows one set of statements to be efficiently attached
-to more than one host declaration. 
+to more than one host declaration.
 .PP
 Groups have the following attributes:
 .PP

_service:tar_scm:dhcp-4.4.2.tar.gz/server/dhcpd.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/dhcpd.c Changed

@@ -3,7 +3,7 @@
 DHCP Server Daemon. */
 
 /*
- * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2022 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
@@ -19,15 +19,15 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
 */
 
 static const char copyright =
-"Copyright 2004-2020 Internet Systems Consortium.";
+"Copyright 2004-2022 Internet Systems Consortium.";
 static const char arr = "All rights reserved.";
 static const char message = "Internet Systems Consortium DHCP Server";
 static const char url =
@@ -195,10 +195,10 @@
 * 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.
+ * command 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.
+ * \param sarg - Generally the offending argument from the command line.
 *
 * \return Nothing
 */

_service:tar_scm:dhcp-4.4.2.tar.gz/server/dhcpd.conf.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/dhcpd.conf.5 Changed

@@ -1,6 +1,6 @@
 .\"	dhcpd.conf.5
 .\"
-.\" Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2022 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
@@ -16,8 +16,8 @@
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" Internet Systems Consortium, Inc.
-.\" 950 Charter Street
-.\" Redwood City, CA 94063
+.\" PO Box 360
+.\" Newmarket, NH 03857 USA
 .\" <info@isc.org>
 .\" https://www.isc.org/
 .\"
@@ -322,7 +322,7 @@
 may not be included directly in a shared network declaration.
 In addition to the \fBrange6\fR statement it allows the \fBprefix6\fR
 statement to be included. You may include \fBrange6\fR statements
-for both NA and TA and \fBprefixy6\fR statements in a single
+for both NA and TA and \fBprefix6\fR statements in a single
 \fBpool6\fR statement.
 .SH DYNAMIC ADDRESS ALLOCATION
 Address allocation is actually only done when a client is in the INIT
@@ -3102,7 +3102,7 @@
 .I seconds\fR\fB;\fR
 .PP
 IPv6 addresses have \'valid\' and \'preferred\' lifetimes. The valid lifetime
-determines at what point at lease might be said to have expired, and is no
+determines at what point a lease might be said to have expired, and is no
 longer useable. A preferred lifetime is an advisory condition to help
 applications move off of the address and onto currently valid addresses
 (should there still be any open TCP sockets or similar).

_service:tar_scm:dhcp-4.4.2.tar.gz/server/dhcpd.leases.5 -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/dhcpd.leases.5 Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/failover.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/failover.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/ldap.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/ldap.c Changed

@@ -3,7 +3,7 @@
    Routines for reading the configuration from LDAP */
 
 /*
- * Copyright (c) 2010-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2010-2022 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 2003-2006 Ntelos, Inc.
  * All rights reserved.
  *
@@ -1375,13 +1375,13 @@
                                                              SV_LDAP_GSSAPI_PRINCIPAL);
 
       if (ldap_gssapi_principal == NULL) {
-          log_error("ldap_gssapi_principal is not set,"
+          log_info("ldap-gssapi-principal is not set,"
                    "GSSAPI Authentication for LDAP will not be used");
       } else {        
         ldap_gssapi_keytab = _do_lookup_dhcp_string_option (options,
                                                           SV_LDAP_GSSAPI_KEYTAB);
         if (ldap_gssapi_keytab == NULL) {
-          log_fatal("ldap_gssapi_keytab must be specified");
+          log_fatal("ldap-gssapi-keytab must be specified");
         } 
 
       	running = strdup(ldap_gssapi_principal);

_service:tar_scm:dhcp-4.4.2.tar.gz/server/ldap_casa.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/ldap_casa.c Changed

@@ -1,38 +1,38 @@
 /* ldap_casa.c
- 
+
 CASA routines for DHCPD... */
 
 /* Copyright (c) 2006 Novell, Inc.
 
 * All rights reserved.
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- * 1.Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * 2.Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 3.Neither the name of ISC, ISC DHCP, nor the names of its contributors 
- * may be used to endorse or promote products derived from this software 
- * without specific prior written permission. 
-
- * THIS SOFTWARE IS PROVIDED BY INTERNET SYSTEMS CONSORTIUM AND CONTRIBUTORS 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1.Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2.Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3.Neither the name of ISC, ISC DHCP, nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY INTERNET SYSTEMS CONSORTIUM AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ISC OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ISC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 
 * This file was written by S Kalyanasundaram <skalyanasundaram@novell.com>
 */
 
 /*
- * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1995-2003 by Internet Software Consortium
 *
 * Permission to use, copy, modify, and distribute this software for any
@@ -48,8 +48,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 */
@@ -158,4 +158,3 @@
 }
 
 #endif /* LDAP_CASA_AUTH */
-

_service:tar_scm:dhcp-4.4.2.tar.gz/server/leasechain.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/leasechain.c Changed

@@ -3,7 +3,7 @@
 Additional support for in-memory database support */
 
 /*
- * Copyright (c) 2015-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2022 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
@@ -18,8 +18,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -30,7 +30,7 @@
 * \page leasechain structures overview
 *
 * A brief description of the leasechain structures
- * 
+ *
 * This file provides additional data structures for a leasecain to
 * provide faster access to leases on the queues associated with a pool
 * than a linear walk. Each pool has a set of queues: active, free, backup,
@@ -55,11 +55,11 @@
 * | next |->| next |->NULL
 * NULL<- | prev |<-| prev |
 * +-------+ +-------+
- * 
+ *
 * The linked list is maintained in an ordered state. Inserting an entry is
 * accomplished by doing a binary search on the array to find the proper place
 * in the list and then updating the pointers in the linked list to include the
- * new entry. The entry is added into the array by copying the remainder of 
+ * new entry. The entry is added into the array by copying the remainder of
 * the array to provide space for the new entry.
 * Removing an entry is the reverse.
 * The arrays for the queues will be pre-allocated but not all of them will be
@@ -142,7 +142,7 @@
 * Given a potential range of the array to insert the lease into this routine
 * will recursively examine the range to find the proper place in which to
 * insert the lease.
- * 
+ *
 * \param lc The leasechain to add the lease to
 * \param lp The lease to insert
 * \param min The minium index of the potential range for insertion
@@ -150,7 +150,7 @@
 *
 * \return The index of the array entry to insert the lease
 */
-size_t 
+size_t
 lc_binary_search_insert_point(struct leasechain *lc,
 			 struct lease *lp,
 			 size_t min, size_t max)
@@ -168,7 +168,7 @@
 		return (lc_binary_search_insert_point(lc, lp,
 						 min, mid_index - 1));
 	} else if ((lc->listmid_index->sort_time < lp->sort_time) ||
-		 ((lc->listmid_index->sort_time == lp->sort_time) && 
+		 ((lc->listmid_index->sort_time == lp->sort_time) &&
 		 (lc->listmid_index->sort_tiebreaker < lp->sort_tiebreaker))) {
 		if (mid_index == max) {
 			/* insert in mid_index + 1 as sort_time is smaller */
@@ -189,7 +189,7 @@
 *
 * Given a potential range of the array to search this routine
 * will recursively examine the range to find the proper lease
- * 
+ *
 * \param lc The leasechain to check
 * \param lp The lease to find
 * \param min The minium index of the search range
@@ -220,13 +220,13 @@
 		if (mid_index == min) {
 			/* lease not found */
 			return (SIZE_MAX);
-		} 
+		}
 		/* try the lower half of the list */
 		return (lc_binary_search_lease(lc, lp, min, mid_index - 1));
 	} else if ((lc->listmid_index->sort_time < lp->sort_time) ||
 		 ((lc->listmid_index->sort_time == lp->sort_time) &&
 		 (lc->listmid_index->sort_tiebreaker < lp->sort_tiebreaker))) {
-		/* try the upper half of the list */	 
+		/* try the upper half of the list */
 		return (lc_binary_search_lease(lc, lp, mid_index + 1, max));
 	}
 
@@ -253,7 +253,7 @@
 
 			/* Are we done with this range? */
 			if ((i == min) ||
-			 ((lc->listi->sort_time != lp->sort_time) || 
+			 ((lc->listi->sort_time != lp->sort_time) ||
 			 ((lc->listi->sort_time == lp->sort_time) &&
 			 (lc->listi->sort_tiebreaker != lp->sort_tiebreaker)))) {
 				break;
@@ -263,7 +263,7 @@
 
 	/* Check out entries above the mid_index */
 	if (mid_index < max) {
-		/* We will break out of the loop if we either go past the 
+		/* We will break out of the loop if we either go past the
 	 * canddiates or hit the end of the range when i == max.
 		 */
 		for (i = mid_index + 1; i <= max; i++) {
@@ -304,7 +304,7 @@
 	void *p;
 	size_t temp_size;
 
-	if (lc->growth == 0) 
+	if (lc->growth == 0)
 		temp_size = lc->total + LC_GROWTH_DELTA;
 	else
 		temp_size = lc->total + lc->growth;
@@ -366,7 +366,7 @@
 			sizeof(struct lease *) * (lc->nelem-n));
 	}
 
-	/* clean any stale pointer info from this position before calling 
+	/* clean any stale pointer info from this position before calling
 	 * lease_reference as it won't work if pointer is not NULL
 	 */
 	lc->listn = NULL;
@@ -380,7 +380,7 @@
 }
 
 /*!
- * 
+ *
 * \brief Insert the lease at the specified position in both the lease chain
 * and the linked list
 *
@@ -452,7 +452,7 @@
 	log_debug("LC check sort %s:%d", MDL);
 	for (i = 0; i < lc->nelem; i++ ) {
 		if ((lc->listi->sort_time < t) ||
-		 ((lc->listi->sort_time == t) && 
+		 ((lc->listi->sort_time == t) &&
 		 (lc->listi->tiebreaker < tiebreaker))) {
 			if (i > 0) {
 				print_lease(lc->listi-1);
@@ -476,7 +476,7 @@
 * The sort_time is set by the caller while the sort_tiebreaker is set here
 * The value doesn't much matter as long as it prvoides a way to have different
 * values in most of the leases.
- * 
+ *
 * When choosing a value for tiebreak we choose:
 * 0 for the first lease in the queue
 * 0 if the lease is going to the end of the queue with a sort_time greater
@@ -488,7 +488,7 @@
 * During startup when we can take advantage of the fact that leases may already
 * be sorted and so check the end of the list to see if we can simply add the
 * lease to the end.
- * 
+ *
 * \param lc The leasechain in which to insert the lease
 * \param lp The lease to insert
 *

_service:tar_scm:dhcp-4.4.2.tar.gz/server/mdb.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/mdb.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/mdb6.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/mdb6.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/omapi.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/omapi.c Changed

@@ -3,7 +3,7 @@
 OMAPI object interfaces for the DHCP server. */
 
 /*
- * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 Internet Systems Consortium, Inc. ("ISC")
 * Copyright (c) 1999-2003 by Internet Software Consortium
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -1301,7 +1301,7 @@
 
 		status = omapi_connection_copyin (c,
 						 ip_addrs.data, ip_addrs.len);
-		if (status != ISC_R_SUCCESS) { 
+		if (status != ISC_R_SUCCESS) {
 			data_string_forget (&ip_addrs, MDL);
 			return status;
 		}
@@ -1744,7 +1744,7 @@
 	if (status != ISC_R_SUCCESS)
 		return (status);
 
-	status = omapi_connection_put_named_uint32(c, "backup-leases", 
+	status = omapi_connection_put_named_uint32(c, "backup-leases",
 						 ((u_int32_t)
 						 pool->backup_leases));
 	if (status != ISC_R_SUCCESS)

_service:tar_scm:dhcp-4.4.2.tar.gz/server/salloc.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/salloc.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/server/stables.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/stables.c Changed

@@ -3,7 +3,7 @@
 Tables of information only used by server... */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2022 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
@@ -19,8 +19,8 @@
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 * Internet Systems Consortium, Inc.
- * 950 Charter Street
- * Redwood City, CA 94063
+ * PO Box 360
+ * Newmarket, NH 03857 USA
 * <info@isc.org>
 * https://www.isc.org/
 *
@@ -66,7 +66,7 @@
 	 FM_OFFSET(ip_flags), FTB_IP_FLAGS },
 	{ FTO_LEASE_EXPIRY, "lease-expiration-time", FT_UINT32, 1,
 	 FM_OFFSET(expiry), FTB_LEASE_EXPIRY },
-	{ FTO_MAX_UNACKED, "max-unacked-bndupd", FT_UINT32, 1, 
+	{ FTO_MAX_UNACKED, "max-unacked-bndupd", FT_UINT32, 1,
 	 FM_OFFSET(max_unacked), FTB_MAX_UNACKED },
 	{ FTO_MCLT, "MCLT", FT_UINT32, 1, FM_OFFSET(mclt), FTB_MCLT },
 	{ FTO_MESSAGE, "message", FT_TEXT, 0,

_service:tar_scm:dhcp-4.4.2.tar.gz/server/tests/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/tests/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -253,8 +253,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -310,6 +308,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -321,6 +321,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -894,7 +895,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

_service:tar_scm:dhcp-4.4.2.tar.gz/server/tests/hash_unittest.c -> _service:tar_scm:dhcp-4.4.3.tar.gz/server/tests/hash_unittest.c Changed

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/000-badmsgtype.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/000-badmsgtype.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -80,10 +80,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -104,7 +104,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -119,11 +119,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -137,16 +137,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -161,4 +161,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/010-solicit-noclientid.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/010-solicit-noclientid.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -91,7 +91,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -126,10 +126,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -150,7 +150,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -167,11 +167,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -185,16 +185,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -209,4 +209,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/011-solicit-serverid.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/011-solicit-serverid.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -94,7 +94,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -129,10 +129,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -153,7 +153,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -170,11 +170,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -188,16 +188,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -212,4 +212,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/020-advertise-mcast.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/020-advertise-mcast.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -80,10 +80,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -104,7 +104,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -119,11 +119,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -137,16 +137,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -161,4 +161,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/030-request-noclientid.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/030-request-noclientid.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -91,7 +91,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -126,10 +126,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -150,7 +150,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -167,11 +167,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -185,16 +185,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -209,4 +209,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/031-request-noserverid.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/031-request-noserverid.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -91,7 +91,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -126,10 +126,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -150,7 +150,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -167,11 +167,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -185,16 +185,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -209,4 +209,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/032-request-badduid.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/032-request-badduid.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -95,7 +95,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -130,10 +130,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -154,7 +154,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -171,11 +171,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -189,16 +189,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -213,4 +213,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/110-information-request-ia_na.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/110-information-request-ia_na.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -91,7 +91,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -126,10 +126,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -150,7 +150,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -167,11 +167,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -185,16 +185,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -209,4 +209,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/111-information-request-ia_ta.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/111-information-request-ia_ta.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -91,7 +91,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -126,10 +126,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -150,7 +150,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -167,11 +167,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -185,16 +185,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -209,4 +209,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/112-badduid.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/112-badduid.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -87,7 +87,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -122,10 +122,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -146,7 +146,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -163,11 +163,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -181,16 +181,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -205,4 +205,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/210-solicit-nohost.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/210-solicit-nohost.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -91,7 +91,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -126,10 +126,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -150,7 +150,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -167,11 +167,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -185,16 +185,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -209,4 +209,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/211-solicit-opt-in-na.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/211-solicit-opt-in-na.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -97,7 +97,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -132,10 +132,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -156,7 +156,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -173,11 +173,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -191,16 +191,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -215,4 +215,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -97,7 +97,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -132,10 +132,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -156,7 +156,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -173,11 +173,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -191,16 +191,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -215,4 +215,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/280-release-nohost.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/280-release-nohost.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -89,10 +89,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -113,7 +113,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -130,11 +130,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -148,16 +148,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -172,4 +172,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/281-release-bad-address.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/281-release-bad-address.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -101,10 +101,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -125,7 +125,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -142,11 +142,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -160,16 +160,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -184,4 +184,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/282-release-no-address.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/282-release-no-address.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -97,10 +97,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -121,7 +121,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -138,11 +138,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -156,16 +156,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -180,4 +180,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/283-release.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/283-release.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -103,10 +103,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -127,7 +127,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -144,11 +144,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -162,16 +162,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -186,4 +186,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/290-decline-nohost.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/290-decline-nohost.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -89,10 +89,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -113,7 +113,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -130,11 +130,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -148,16 +148,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -172,4 +172,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/291-decline-bad-address.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/291-decline-bad-address.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -101,10 +101,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -125,7 +125,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -142,11 +142,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -160,16 +160,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -184,4 +184,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/292-decline-no-address.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/292-decline-no-address.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -97,10 +97,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -121,7 +121,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -138,11 +138,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -156,16 +156,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -180,4 +180,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/293-decline.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/293-decline.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -103,10 +103,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -127,7 +127,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -144,11 +144,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -162,16 +162,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -186,4 +186,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/dhcp_client.pm -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/dhcp_client.pm Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -90,12 +90,12 @@
 @EXPORT = qw( $MSG_SOLICIT $MSG_ADVERTISE $MSG_REQUEST $MSG_CONFIRM
 	 $MSG_RENEW $MSG_REBIND $MSG_REPLY $MSG_RELEASE $MSG_DECLINE
 	 $MSG_RECONFIGURE $MSG_INFORMATION_REQUEST $MSG_RELAY_FORW
-	 $MSG_RELAY_REPL 
+	 $MSG_RELAY_REPL
 	 $OPT_CLIENTID $OPT_SERVERID $OPT_IA_NA $OPT_IA_TA $OPT_IAADDR
 	 $OPT_ORO $OPT_PREFERENCE $OPT_ELAPSED_TIME $OPT_RELAY_MSG
 	 $OPT_AUTH $OPT_UNICAST $OPT_STATUS_CODE $OPT_RAPID_COMMIT
-	 $OPT_USER_CLASS $OPT_VENDOR_CLASS $OPT_VENDOR_OPTS 
-	 $OPT_INTERFACE_ID $OPT_RECONF_MSG $OPT_RECONF_ACCEPT 
+	 $OPT_USER_CLASS $OPT_VENDOR_CLASS $OPT_VENDOR_OPTS
+	 $OPT_INTERFACE_ID $OPT_RECONF_MSG $OPT_RECONF_ACCEPT
 	 $SOL_MAX_DELAY $SOL_TIMEOUT $SOL_MAX_RT $REQ_TIMEOUT
 	 $REQ_MAX_RT $REQ_MAX_RC $CNF_MAX_DELAY $CNF_MAX_RT
 	 $CNF_MAX_RD $REN_TIMEOUT $REN_MAX_RT $REB_TIMEOUT $REB_MAX_RT
@@ -164,7 +164,7 @@
 	CL_OPTION_DOCSIS_VERS => 38,
 );
 my %docsis_num_type = reverse(%docsis_type_num);
-	
+
 use strict;
 use English;
 use POSIX;
@@ -188,7 +188,7 @@
 		}
 	}
 	my @mac_addrs;
-	foreach my $line (split(/\n/, `arp -an 2>/dev/null`)) { 
+	foreach my $line (split(/\n/, `arp -an 2>/dev/null`)) {
 		my @parts = split(/\s+/, $line);
 		my $ip = $parts1;
 		my $mac = $parts-1;
@@ -225,7 +225,7 @@
 
 	if (($type == 1) || ($type == 3)) {
 		my $mac_addr = mac_addr_binary();
-		if ($type == 1) { 
+		if ($type == 1) {
 			my $time = pack("N", dhcpv6_time());
 			return "\x00\x01\x00\x01${time}${mac_addr}";
 		} else {
@@ -251,7 +251,7 @@
 	if (defined $trans_id) {
 		$this->{trans_id} = $trans_id;
 	} else {
-		$this->{trans_id} = chr(rand(256)) . 
+		$this->{trans_id} = chr(rand(256)) .
 			chr(rand(256)) . chr(rand(256));
 	}
 	$this->{options} = ;
@@ -336,7 +336,7 @@
 		my $num_servers = length($data) / 16;
 		for (my $i=0; $i<$num_servers; $i++) {
 			my $srv = inet_ntop(AF_INET6, substr($data, $i*16, 16));
-			print "$indent TFTP server ", ($i+1), ": "; 
+			print "$indent TFTP server ", ($i+1), ": ";
 			print uc($srv), "\n";
 		}
 	} elsif ($docsis_num_type{$num} eq "CL_OPTION_CONFIG_FILE_NAME") {
@@ -345,7 +345,7 @@
 		my $num_servers = length($data) / 16;
 		for (my $i=0; $i<$num_servers; $i++) {
 			my $srv = inet_ntop(AF_INET6, substr($data, $i*16, 16));
-			print "$indent syslog server ", ($i+1), ": "; 
+			print "$indent syslog server ", ($i+1), ": ";
 			print uc($srv), "\n";
 		}
 	}
@@ -369,7 +369,7 @@
 			}
 			print "\n";
 		}
-	} elsif (($num == $dhcp_client::OPT_CLIENTID) || 
+	} elsif (($num == $dhcp_client::OPT_CLIENTID) ||
 		 ($num == $dhcp_client::OPT_SERVERID)) {
 		print $indent, " ";
 		if (length($data) > 0) {
@@ -380,7 +380,7 @@
 		}
 		print "\n";
 	} elsif ($num == $dhcp_client::OPT_IA_NA) {
-		printf "${indent} IAID: 0x\%08X\n", 
+		printf "${indent} IAID: 0x\%08X\n",
 			unpack("N", substr($data, 0, 4));
 		printf "${indent} T1: \%d\n", unpack("N", substr($data, 4, 4));
 		printf "${indent} T2: \%d\n", unpack("N", substr($data, 8, 4));
@@ -391,7 +391,7 @@
 			}
 		}
 	} elsif ($num == $dhcp_client::OPT_IAADDR) {
-		printf "${indent} IPv6 address: \%s\n", 
+		printf "${indent} IPv6 address: \%s\n",
 			uc(inet_ntop(AF_INET6, substr($data, 0, 16)));
 		printf "${indent} Preferred lifetime: \%d\n",
 			unpack("N", substr($data, 16, 4));
@@ -422,10 +422,10 @@
 		}
 		print "\n";
 		print "${indent} Message: \"$msg\"\n";
-	} 
+	}
 }
 
-# XXX: we aren't careful about packet boundaries and values... 
+# XXX: we aren't careful about packet boundaries and values...
 # DO NOT RUN ON PRODUCTION SYSTEMS!!!
 sub decode {
 	my ($packet, $print) = @_;
@@ -451,4 +451,3 @@
 
 	return $msg;
 }
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/stubcli-opt-in-na.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/stubcli-opt-in-na.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -96,7 +96,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -131,10 +131,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -155,7 +155,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -172,11 +172,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -190,16 +190,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -214,4 +214,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/DHCPv6/stubcli.pl -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/DHCPv6/stubcli.pl Changed

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,8 +15,8 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 # Internet Systems Consortium, Inc.
-# 950 Charter Street
-# Redwood City, CA 94063
+# PO Box 360
+# Newmarket, NH 03857 USA
 # <info@isc.org>
 # https://www.isc.org/
 
@@ -91,7 +91,7 @@
 $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro);
 
 # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS)
-my $tlv5_data = "\x01\x02\x03\x0"; 
+my $tlv5_data = "\x01\x02\x03\x0";
 $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data;
 
 # DOCSIS Device (required by DOCSIS)
@@ -126,10 +126,10 @@
 	socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die;
 	my $addr = inet_pton(AF_INET6, $All_DHCP_Servers);
 	my $packet = $msg->packet();
-	my $send_ret = send(SOCK, $packet, 0, 
+	my $send_ret = send(SOCK, $packet, 0,
 			 pack_sockaddr_in6($server_port, $addr));
 	if (not defined($send_ret)) {
-		printf STDERR 
+		printf STDERR
 			"Error \%d sending DHCPv6 Solicit message;\n\%s\n",
 			0+$ERRNO, $ERRNO;
 		exit(1);
@@ -150,7 +150,7 @@
 	}
 
 	my $rt_end_time = time() + $RT;
-	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { 
+	if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) {
 		$rt_end_time = $mrd_end_time;
 	}
 
@@ -167,11 +167,11 @@
 		if (@ready) {
 			my $reply;
 			my $recv_ret;
-	
+
 			$recv_ret = recv(SOCK, $reply, 1500, 0);
 			if (not defined $recv_ret) {
-				printf STDERR 
-					"Error \%d receiving DHCPv6 " . 
+				printf STDERR
+					"Error \%d receiving DHCPv6 " .
 						"message;\n\%s\n",
 					0+$ERRNO, $ERRNO;
 				exit(1);
@@ -185,16 +185,16 @@
 		}
 	}
 
-} until ($reply_msg || 
+} until ($reply_msg ||
 	 (($MRC != 0) && ($count > $MRC)) ||
 	 (defined($mrd_end_time) && ($mrd_end_time > time())));
 
 unless ($reply_msg) {
 	if (($MRC != 0) && ($count >= $MRC)) {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission count.\n";
 	} else {
-		print STDERR 
+		print STDERR
 			"No reply after maximum retransmission duration.\n";
 	}
 }
@@ -209,4 +209,3 @@
 #print Dumper($msg->packet()), "\n";
 #
 #print "packet length: ", length($msg->packet()), "\n";
-

_service:tar_scm:dhcp-4.4.2.tar.gz/tests/Makefile.in -> _service:tar_scm:dhcp-4.4.3.tar.gz/tests/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -159,8 +159,6 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.am.in $(srcdir)/Makefile.in \
 	$(srcdir)/unittest.sh.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -191,6 +189,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -202,6 +202,7 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
 INSTALL = @INSTALL@
@@ -444,7 +445,6 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am

Changes of Revision 2