diff options
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | RELNOTES | 359 | ||||
| -rw-r--r-- | client/dhclient.8 | 12 | ||||
| -rw-r--r-- | client/dhclient.c | 8 | ||||
| -rw-r--r-- | client/tests/Kyuafile | 4 | ||||
| -rw-r--r-- | common/tests/Kyuafile | 7 | ||||
| -rwxr-xr-x | configure | 21 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | configure.ac+lt | 3 | ||||
| -rw-r--r-- | configure.ac-base | 3 | ||||
| -rw-r--r-- | configure.ac-lt | 3 | ||||
| -rw-r--r-- | relay/dhcrelay.c | 4 | ||||
| -rw-r--r-- | server/dhcpd.c | 4 | ||||
| -rw-r--r-- | server/tests/Kyuafile | 8 | ||||
| -rw-r--r-- | util/bind.sh | 1 |
16 files changed, 228 insertions, 224 deletions
@@ -1,4 +1,4 @@ -# Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (c) 2004-2018 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 @@ -1,6 +1,6 @@ Internet Systems Consortium DHCP Distribution - Version 4.4.0a1 - 11 December 2017 + Version 4.4.0b1 + 09 January 2018 README FILE @@ -142,12 +142,12 @@ information. On Digital Unix, type ``man pfilt''. 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.0a1.tar.gz - tar xvf dhcp-4.4.0a1.tar + gunzip dhcp-4.4.0b1.tar.gz + tar xvf dhcp-4.4.0b1.tar CONFIGURING IT -Now, cd to the dhcp-4.4.0a1 subdirectory that you've just created and +Now, cd to the dhcp-4.4.0b1 subdirectory that you've just created and configure the source tree by typing: ./configure @@ -1,14 +1,76 @@ Internet Systems Consortium DHCP Distribution - Version 4.4.0a1 - 11 December 2017 + Version 4.4.0b1 + 09 January 2018 Release Notes NEW FEATURES -The major "theme" for ISC DHCP 4.4.x .... +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. - <TBD PRIOR TO RELEASE OF 4.4.0> +The areas of focus for ISC DHCP 4.4.0 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 well as how to find documentation and report bugs, please consult the @@ -25,18 +87,93 @@ ISC DHCP is open source software maintained by Internet Systems Consortium. This product includes cryptographic software written by Eric Young (eay@cryptsoft.com). -Please note that as of version 4.4.0, 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. + Changes since 4.4.0a1 (New Features) + +- Added experimental support for relay port (draft-ietf-dhc-relay-port-10.txt) + feature for DHCPv4, DHCPv6 and DHCPv4-over-DHCPv6. Relay port has to be + enabled at compile time via --enable-relay-port and is fully backward + compatible (i.e. works with previous implementations of servers and relays + using the standard ports). A new --rp <relay-port> command line option + specifies to dhcrelay an alternate source port for upstream (i.e. toward + the server) messages. Thanks to Naiming Shen and Enke Chen of Cisco + systems for submitting these patches. + [ISC-Bugs #44535] + +- Added --release-on-roam to dhcpd server. When enabled and the server detects + that a DHCPv6 client (IAID+DUID) has roamed to a new network, it will release + the pre-existing leases on the old network and emit a log statement similar + to the following: + + "Client: <id> roamed to new network, releasing lease: <address>" + + The server will carry out all of the same steps that would normally occur + when a client explicitly releases a lease. This behavior is disabled by + default and may only be specified globally. Prior to this the server renders + the leases unavailable until they expire or the server is restarted. Clients + that need leases in multiple networks must supply a unique IAID in each IA. + When release-on-roam is disabled (the default) the server maintains the + prior behavior of making such leases unavailable until they expire or the + server is restarted. Clients that need leases in multiple networks must + supply a unique IAID in each IA. This parameter may only be specified at + the global level. Thanks to Fernando Soto from BlueCat Networks for + suggesting this change. + [ISC-Bugs #44576] + [ISC-Bugs #46849] + +- Support for delayed-ack is now compiled in by default. Prior to this + it had to be enabled at compile time via --enable-delayed-acks. The + default value for delayed-ack, however, has been changed from 28 to 0 + (i.e. disabled). This was done to minimize the impact on users not + currently using the feature. Please note that the delayed-ack feature + is not currently compatible with support for DHPCv4-over-DHCPv6 so + when a 4to6 port command line argument enables this in the server the + delayed-ack value is reset to 0. + [ISC-Bugs #42446] + +- The server (-6) now honors the parameter, update-static-leases, for static + (fixed-address6) DHCPv6 leases. It is worth noting that because stateful + data is not retained by the server for static leases, each time a client + requests or renews a static lease, the server will perform DDNS updates for + it. This may have significant performance implications for environments + with many clients that request or renew static leases often. Similarly, + the DNS entries will not be removed by server when a client issues a RELEASE + nor if the lease is deleted from the configuration. In such cases the DNS + entries must be removed manually. This feature is disabled by default. + Thanks to both Bill Shirley and dgutier-at-cern-dot-ch for requesting + this change. + [ISC-Bugs #34097] + [ISC-Bugs #41054] + [ISC-Bugs #41450] + +- Added to the server (-6) a new statement, local-address6, which specifies + the source address of packets sent by the server. An additional flag, + bind-local-address6, disabled by default, binds the service socket to + to local-address6. Note that bind-local-address does not work with direct + clients: a relay has to forward packets to the server using the + local-address6 destination. + [ISC-Bugs #46084] + + Changes since 4.4.0a1 (Bugs) + +- The server now recognizes environment variables PATH_DHCPD_DB and + PATH_DHCPD_PID. These had been incorrectly compiled out of the code + unless DHCPv6 support was disabled. Additionally, the server man + pages were corrected to accurately reflect how the server chooses + file names (see lease-file-name and pid-file-name statements). Thanks + to Fernando Soto at Bluecat Networks for bringing this matter to our + attention. + [ISC-Bugs #46859] + +- Removed an "Impossible condition" error upon exit in the dhcpd server that + has been shutdown via OMAPI. This condition was only apparent under Solaris + when building with --enable-use-sockets and --enable-ipv4-pktinfo. + [ISC-Bugs #36118] -Older versions already published under the ISC license will remain under the -ISC license. Those unsure whether or not the license change affects their use -of ISC DHCP, or who wish to discuss how to comply with the license may contact -ISC at info@isc.org or use https://www.isc.org/mission/contact/. +- Corrected some minor Coverity issues: CID 1426059, 1426058, and 1426057. + [ISC-Bugs #46836] -We welcome comments from DHCP users, about this or anything else we do. Email -Vicky Risk, Product Manager at vicky@isc.org or discuss on -dhcp-users@lists.isc.org. +- Added missing text to dhclient.8 and expanded release note coverage + for --address-prefix-len changes. Changes since 4.3.6 (New Features) @@ -61,58 +198,6 @@ dhcp-users@lists.isc.org. includes/site.h. This flag is undefined by default. [ISC-Bugs #43927] -- Added new compile time option --with-srv-conf-file which specifies a - default location of the server configuration file. - [ISC-Bugs #44765] - -- Added --dad-wait-time parameter to dhclient. It specifies the maximum time, - in seconds, that the client process should wait for the duplicate address - detection to complete before initiating DHCP requests. This value is - propagated to the dhclient script and the script is responsible for waiting - the specified amount of time or until DAD has completed. If the script does - not support it, specifying this parameter has no effect. The default value - is 0 which specifies that the script should not wait for DAD. With this - change the following scripts have been modified to support the new parameter: - freebsd, linux, macos, netbsd, openbsd. - [ISC-Bugs #36169] - -- Modified DDNS support initialization such that DNS related ports will only be - opened by the server (dhcpd) at startup if ddns-update-style is not "none"; - by dhclient only if and when the it first attempts an update; and never by - dhcrelay. Prior to this all three always did the initialization at startup - which causes them to always open on and listen for traffic on two random - ports. Thanks to Rodney Beede for reporting the issue. - [ISC-Bugs #45290] - [ISC-Bugs #33377] - -- Added error logging to two memory allocation failure checks. Thanks to Bill - Parker (wp02855 at gmail dot com) for reporting the issue. - [ISC-Bugs #41185] - -- Corrected a dhclient -6 issue that caused the client to crash with an - "Impossible condition" error after de-preferencing its only IA binding. - The crash occurred when server configuration changes rendered the existing - binding out-of-range and no other leases were available to offer. Thanks - to Pierre Clerissi for bringing this issue to our attention. - [ISC-Bugs #44373] - -- By defining CALL_SCRIPT_ON_ONETRY_FAIL in includes/site.h, dhclient will - now call the script with reason set to FAIL when run with -1 (one try) and - there are no server responses. This applies to IPv4 mode only. Thanks for a - patch by Martin Pitt which got to us via Andrew Pollock. - [ISC-bugs #18183] - -- Linux script updated. The script is now based on Debian version. It uses - ip tool from iproute2 package and ifconfig is no longer used. This also - addresses an issue of calling arping with inappropriate parameter. - [ISC-bugs #19430] - [ISC-bugs #18111] - -- The directory minires has been removed from the source tree. It has - long been obsolete for branches other than v4_1_esv. Additionally, - includes/minires.h was renamed includes/ns_name.h. - [ISC-bugs #45471] - - The directory includes/isc-dhcp and it's only occupant, dst.h, have been removed from the source tree. They are obsolete for branches other than v4_1_esv. @@ -131,12 +216,13 @@ dhcp-users@lists.isc.org. - Added a new dhclient command line parameter, --prefix-len-hint <length>. When used in conjunction with -P, it directs dhclient to use the given - length as the prefix length hint when requesting prefixes. Thanks to - H. Peter Anvin for suggesting this change. - [ISC-Bugs #43792] - [ISC-Bugs #35112] - [ISC-Bugs #32228] - [ISC-Bugs #29470] + length as the prefix length hint when requesting prefixes. Thanks to both + Indy, of the FireballISO open source project and H. Peter Anvin for + suggesting this change. + [ISC-Bugs #43792] + [ISC-Bugs #35112] + [ISC-Bugs #32228] + [ISC-Bugs #29470] - dhclient will now wait for 10 seconds after declining an IPv4 address before issuing a discover. This is in keeping with RFC 2131, section 3.1.5. @@ -144,12 +230,9 @@ dhcp-users@lists.isc.org. waits can be specified via a new command line parameter: --decline-wait-time <seconds>. A value of zero equates to no wait at all. Thanks to Pavel Kankovsky for bringing this matter to our attention. + **NOTE: THIS IS CHANGE IN DEFAULT BEHAVIOR. [ISC-Bugs #45457] -- Corrected dhclient command line parsing for --dad-wait-time that causes - even valid values to fail as invalid on some environments. - [ISC-Bugs #46535] - - dhclient will now include the lease address when logging DHCPOFFERs, DHCPREQUESTs, DHCPACKs, DHCPRELEASEs, and DHCPDECLINEs. Additionally, DHCPOFFERs will be logged before their corresponding DHCPREQUESTs are @@ -170,6 +253,7 @@ dhcp-users@lists.isc.org. Note, the client script must exit with a value of 3 to signify that the address failed DAD. Thanks to Jiri Popelka of Red Hat for submitting the patch that was the foundation for this change. + **NOTE: THIS IS CHANGE IN DEFAULT BEHAVIOR. [ISC-Bugs #21237] [ISC-Bugs #23357] [ISC-Bugs #36966] @@ -184,40 +268,13 @@ dhcp-users@lists.isc.org. doing load balancing within failover. [ISC-Bugs #45364] -- Added --release-on-roam to dhcpd server. When enabled and the server detects - that a DHCPv6 client (IAID+DUID) has roamed to a new network, it will release - the pre-existing leases on the old network and emit a log statement similar - to the following: - - "Client: <id> roamed to new network, releasing lease: <address>" - - The server will carry out all of the same steps that would normally occur - when a client explicitly releases a lease. This behavior is disabled by - default and may only be specified globally. Prior to this the server renders - the leases unavailable until they expire or the server is restarted. Clients - that need leases in multiple networks must supply a unique IAID in each IA. - When release-on-roam is disabled (the default) the server maintains the - prior behavior of making such leases unavailable until they expire or the - server is restarted. Clients that need leases in multiple networks must - supply a unique IAID in each IA. This parameter may only be specified at - the global level. Thanks to Fernando Soto from BlueCat Networks for - suggesting this change. - [ISC-Bugs #44576] - [ISC-Bugs #46849] - -- The ability of the server to send back dhcp6.vendor-opts values has been - restored. A change in 4.3.5 (see #29246) which enabled it to send back the - FQDN option unfortunately broke its ability send back dhcp6.vendor-opts. - Thanks to Sumant Gupta (sumantgupta at gmail dot com) of Landis+Gry for - bringing this issue to our attention. - [ISC-Bugs #46427] - - The default value for server (-6) parameter, prefix-length-mode, has been changed from "exact" to "prefer". In "prefer" mode the server will offer the first available prefix with the same length as that requested by the client. If none are found then it will offer the first available prefix of any length. This is more in line with with RFC 8168 and should improve the out-of-the-box user experience. + **NOTE: THIS IS CHANGE IN DEFAULT BEHAVIOR. [ISC-Bugs #45615] - Added support for 'dhcp-cache-threshold' to IPv6 operation: If a client @@ -257,74 +314,23 @@ dhcp-users@lists.isc.org. [ISC-Bugs #45046] - Changed the default value of the prefix length passed by dhclient into the - client script for each IPv6 address, from 64 to 128. In addition, dhclient - now supports a command line argument, --address-prefix-len <len>, which may - be used to override the default value. PLEASE NOTE: If your DHCPv6 clients - require a value other than 128, you MUST specify the value via this new - command line argument. Prior to this the only way to alter the value was at - compile time by changing DHCLIENT_DEFAULT_PREFIX_LEN in include/sites.h. + client script for each IPv6 address from 64 to 128. This was done to comply + with RFC3315bis draft (-09, page 64) and RFC5942, Section 4, point 1. + In addition, dhclient now supports a command line argument, + --address-prefix-len, which may be used to override the default value. + **WARNING**: This change 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 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. [ISC-Bugs #23252] [ISC-Bugs #37221] - Modified dhclient (-6) to bypass sending a confirm (INIT REBOOT) when it has - only expired address assocations. Thanks to Jiri Popelka at Red Hat for + only expired address associations. Thanks to Jiri Popelka at Red Hat for raising the issue and submitting the patch. [ISC-Bugs #22675] - -- Support for delayed-ack is now compiled in by default. Prior to this - it had to be enabled at compile time via --enable-delayed-acks. The - default value for delayed-ack, however, has been changed from 28 to 0 - (i.e. disabled). This was done to minimize the impact on users not - currently using the feature. Please note that the delayed-ack feature - is not currently compatible with support for DHPCv4-over-DHCPv6 so - when a 4to6 port command line argument enables this in the server the - delayed-ack value is reset to 0. - [ISC-Bugs #42446] - -- Corrected some minor coverity issues: CID 1426059, 1426058, and 1426057. - [ISC-Bugs #46836] - -- The server (-6) now honors the parameter, update-static-leases, for static - (fixed-address6) DHCPv6 leases. It is worth noting that because stateful - data is not retained by the server for static leases, each time a client - requests or renews a static lease, the server will perform DDNS updates for - it. This may have significant performance implications for environments - with many clients that request or renew static leases often. Similarly, - the DNS entries will not be removed by server when a client issues a RELEASE - nor if the lease is deleted from the configuration. In such cases the DNS - entries must be removed manually. This feature is disabled by default. - Thanks to both Bill Shirley and dgutier-at-cern-dot-ch for requesting - this change. - [ISC-Bugs #34097] - [ISC-Bugs #41054] - [ISC-Bugs #41450] - -- Added to the server (-6) a new statement, local-address6, which specifies - the source address of packets sent by the server. An additional flag, - bind-local-address6, disabled by default, binds the service socket to - to local-address6. Note that bind-local-address does not work with direct - clients: a relay has to forward packets to the server using the - local-address6 destination. - [ISC-Bugs #46084] - -- Removed an "Impossible condition" error upon exit in the dhcpd server that - has been shutdown via OMAPI. This condition was only apparent under Solaris - when building with --enable-use-sockets and --enable-ipv4-pktinfo. - [ISC-Bugs #36118] - -(to be finalized before code freeze next year) -- Added experimental support for relay port (draft-ietf-dhc-relay-port-10.txt) - feature for DHCPv4, DHCPv6 and DHCPv4-over-DHCPv6. As the code points - were not yet assigned by IANA temporary (next free) values are used. - Relay port had be enabled at compile time via --enable-relay-port and - is fully backward compatible, i.e. works with previous implementations - of servers and relays, of course in this case using legacy ports. - A new --rp <relay-port> command line option specifies to dhcrelay - an alternate source port for upstream (i.e. toward the server) messages. -(update this) - Thanks to Naiming Shen and Enke Chen for submitting patches. - [ISC-Bugs #44535] - Changes since 4.3.6 (Bugs): - Corrected an issue where the server would return a client's previously @@ -336,7 +342,7 @@ dhcp-users@lists.isc.org. for pointing out the error of our ways. [ISC-bugs #45780] -- Added explicit include of BIND9 isc/util.h to adapt to revisisions +- Added explicit include of BIND9 isc/util.h to adapt to revisions in BIND9 (see BIND9 ticket #46311). Prior to this the build was failing with implicit function declarations errors for POST() and INSIST(). [ISC-bugs #46332] @@ -347,9 +353,13 @@ dhcp-users@lists.isc.org. in the lease file causing issues with DDNS and so forth. [ISC-bugs #43786] +- Corrected dhclient command line parsing for --dad-wait-time that causes + even valid values to fail as invalid on some environments. + [ISC-Bugs #46535] + - Replaced iasubopt::heap_index with separate values for active and inactive heaps: iasubopt::active_index and iasubopt::inactive_index. This was done - to accomodate a change in behavior in BIND9 isc_heap_delete(). + to accommodate a change in behavior in BIND9 isc_heap_delete(). [ISC-bugs #46719] ! Plugged a socket descriptor leak in OMAPI, that can occur when there is @@ -359,13 +369,12 @@ dhcp-users@lists.isc.org. direction. [ISC-Bugs #46767] -- The server now recognizes environment variables PATH_DHCPD_DB and - PATH_DHCPD_PID. These had been incorrectly compiled out of the code - unless DHCPv6 support was disabled. Additionally, the server man - pages were corrected to accurately reflect how the server chooses - file names (see lease-file-name and pid-file-name statements). Thanks - to Fernando Soto at Bluecat for bringing this matter to our attention. - [ISC-Bugs #46859] +- The ability of the server to send back dhcp6.vendor-opts values has been + restored. A change in 4.3.5 (see #29246) which enabled it to send back the + FQDN option unfortunately broke its ability send back dhcp6.vendor-opts. + Thanks to Sumant Gupta (sumantgupta at gmail dot com) of Landis+Gry for + bringing this issue to our attention. + [ISC-Bugs #46427] Changes since 4.3.6b1 diff --git a/client/dhclient.8 b/client/dhclient.8 index 1fe1f801..ebc750f7 100644 --- a/client/dhclient.8 +++ b/client/dhclient.8 @@ -1,6 +1,6 @@ .\" $Id: dhclient.8,v 1.36 2011/04/15 21:58:12 sar Exp $ .\" -.\" Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (c) 2004-2018 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 @@ -363,7 +363,7 @@ Use a DUID with DHCPv4 clients. If no DUID is available in the lease file one will be constructed and saved. The DUID will be used to construct a RFC4361 style client id that will be included in the client's messages. This client id can be overridden by -setting a client id in the configuration file. Overridding the +setting a client id in the configuration file. Overriding the client id in this fashion is discouraged. .TP .BI \-I @@ -429,6 +429,14 @@ Restore normal address query for IPv6. This implies \fB-6\fR. It is used to restore normal operation after using \fB-T\fR or \fB-P\fR. Multiple addresses can be requested with multiple \fB\-N\fR flags. .TP +.BI \--address-prefix-len \ length +Specify the length of the prefix for IPv6 addresses. This value is passed by +dhclient into the client script via the environment variable, ip6_prefixlen, +when binding IPv6 addresses. The default value is 128. Alternatively you may +change the default at compile time by setting DHCLIENT_DEFAULT_PREFIX_LEN in +includes/site.h. +.PP +.TP .BI \--dad-wait-time \ seconds Specify maximum time (in seconds) that the client should wait for the duplicate address detection (DAD) to complete on an interface. This diff --git a/client/dhclient.c b/client/dhclient.c index 55e1c61c..ac3cdbf8 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -3,7 +3,7 @@ DHCP Client. */ /* - * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2018 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 @@ -75,7 +75,7 @@ int decline_wait_time = 10; /* Default to 10 secs per, RFC 2131, 3.1.5 */ #define ASSERT_STATE(state_is, state_shouldbe) {} #ifndef UNIT_TEST -static const char copyright[] = "Copyright 2004-2017 Internet Systems Consortium."; +static const char copyright[] = "Copyright 2004-2018 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/"; @@ -165,13 +165,13 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; "[-4|-6] [-SNTPRI1dvrxi] [-nw] -4o6 <port>] [-p <port>] [-D LL|LLT]\n" \ " [--dad-wait-time <seconds>] [--prefix-len-hint <length>]\n" \ " [--decline-wait-time <seconds>]\n" \ -" [--address-prefix-len length]\n" +" [--address-prefix-len <length>]\n" #else /* DHCP4o6 */ #define DHCLIENT_USAGE0 \ "[-4|-6] [-SNTPRI1dvrxi] [-nw] [-p <port>] [-D LL|LLT]\n" \ " [--dad-wait-time <seconds>] [--prefix-len-hint <length>]\n" \ " [--decline-wait-time <seconds>]\n" \ -" [--address-prefix-len length]\n" +" [--address-prefix-len <length>]\n" #endif #else /* DHCPv6 */ #define DHCLIENT_USAGE0 \ diff --git a/client/tests/Kyuafile b/client/tests/Kyuafile deleted file mode 100644 index 5bcdf214..00000000 --- a/client/tests/Kyuafile +++ /dev/null @@ -1,4 +0,0 @@ -syntax(2) -test_suite('isc-dhcp') - -atf_test_program{name='duid_unittests'} diff --git a/common/tests/Kyuafile b/common/tests/Kyuafile deleted file mode 100644 index cb1e2cf5..00000000 --- a/common/tests/Kyuafile +++ /dev/null @@ -1,7 +0,0 @@ -syntax(2) -test_suite('isc-dhcp') - -atf_test_program{name='alloc_unittest'} -atf_test_program{name='dns_unittest'} -atf_test_program{name='misc_unittest'} -atf_test_program{name='ns_name_unittest'} @@ -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.0a1. +# Generated by GNU Autoconf 2.69 for DHCP 4.4.0b1. # # Report bugs to <dhcp-users@isc.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='DHCP' PACKAGE_TARNAME='dhcp' -PACKAGE_VERSION='4.4.0a1' -PACKAGE_STRING='DHCP 4.4.0a1' +PACKAGE_VERSION='4.4.0b1' +PACKAGE_STRING='DHCP 4.4.0b1' PACKAGE_BUGREPORT='dhcp-users@isc.org' PACKAGE_URL='' @@ -1350,7 +1350,7 @@ if test "$ac_init_help" = "long"; then # 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.0a1 to adapt to many kinds of systems. +\`configure' configures DHCP 4.4.0b1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1420,7 +1420,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of DHCP 4.4.0a1:";; + short | recursive ) echo "Configuration of DHCP 4.4.0b1:";; esac cat <<\_ACEOF @@ -1591,7 +1591,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -DHCP configure 4.4.0a1 +DHCP configure 4.4.0b1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2384,7 +2384,7 @@ cat >config.log <<_ACEOF 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.0a1, which was +It was created by DHCP $as_me 4.4.0b1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3251,7 +3251,7 @@ fi # Define the identity of the package. PACKAGE='dhcp' - VERSION='4.4.0a1' + VERSION='4.4.0b1' cat >>confdefs.h <<_ACEOF @@ -5502,6 +5502,7 @@ if test "$enable_relay_port" = "yes"; then $as_echo "#define RELAY_PORT 1" >>confdefs.h else + # so we can report below enable_relay_port="no" fi @@ -8101,7 +8102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # 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.0a1, which was +This file was extended by DHCP $as_me 4.4.0b1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8167,7 +8168,7 @@ _ACEOF 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.0a1 +DHCP config.status 4.4.0b1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9507d48d..203cf57c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org]) +AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org]) # we specify "foreign" to avoid having to have the GNU mandated files, @@ -185,6 +185,7 @@ if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) else + # so we can report below enable_relay_port="no" fi diff --git a/configure.ac+lt b/configure.ac+lt index aad11c48..26b2383c 100644 --- a/configure.ac+lt +++ b/configure.ac+lt @@ -1,4 +1,4 @@ -AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org]) +AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org]) # for libtool AC_CONFIG_MACRO_DIR([m4]) @@ -186,6 +186,7 @@ if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) else + # so we can report below enable_relay_port="no" fi diff --git a/configure.ac-base b/configure.ac-base index 219d6050..7a512f84 100644 --- a/configure.ac-base +++ b/configure.ac-base @@ -1,4 +1,4 @@ -AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org]) +AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org]) @BEGIN WITH LIBTOOL # for libtool @@ -191,6 +191,7 @@ if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) else + # so we can report below enable_relay_port="no" fi diff --git a/configure.ac-lt b/configure.ac-lt index 9507d48d..203cf57c 100644 --- a/configure.ac-lt +++ b/configure.ac-lt @@ -1,4 +1,4 @@ -AC_INIT([DHCP],[4.4.0a1],[dhcp-users@isc.org]) +AC_INIT([DHCP],[4.4.0b1],[dhcp-users@isc.org]) # we specify "foreign" to avoid having to have the GNU mandated files, @@ -185,6 +185,7 @@ if test "$enable_relay_port" = "yes"; then AC_DEFINE([RELAY_PORT], [1], [Define to 1 to include relay port support.]) else + # so we can report below enable_relay_port="no" fi diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index aaedd8ff..d8caaaf6 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -3,7 +3,7 @@ DHCP/BOOTP Relay Agent. */ /* - * Copyright(c) 2004-2017 by Internet Systems Consortium, Inc.("ISC") + * Copyright(c) 2004-2018 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 @@ -142,7 +142,7 @@ static int strip_relay_agent_options(struct interface_info *, static void request_v4_interface(const char* name, int flags); static const char copyright[] = -"Copyright 2004-2017 Internet Systems Consortium."; +"Copyright 2004-2018 Internet Systems Consortium."; static const char arr[] = "All rights reserved."; static const char message[] = "Internet Systems Consortium DHCP Relay Agent"; diff --git a/server/dhcpd.c b/server/dhcpd.c index dfc617d0..4ac8bd75 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -3,7 +3,7 @@ DHCP Server Daemon. */ /* - * Copyright (c) 2004-2017 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2018 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 @@ -27,7 +27,7 @@ */ static const char copyright[] = -"Copyright 2004-2017 Internet Systems Consortium."; +"Copyright 2004-2018 Internet Systems Consortium."; static const char arr [] = "All rights reserved."; static const char message [] = "Internet Systems Consortium DHCP Server"; static const char url [] = diff --git a/server/tests/Kyuafile b/server/tests/Kyuafile deleted file mode 100644 index 5e9af041..00000000 --- a/server/tests/Kyuafile +++ /dev/null @@ -1,8 +0,0 @@ -syntax(2) -test_suite('isc-dhcp') - -atf_test_program{name='dhcpd_unittests'} -atf_test_program{name='hash_unittests'} -atf_test_program{name='leaseq_unittests'} -atf_test_program{name='legacy_unittests'} -atf_test_program{name='load_bal_unittests'} diff --git a/util/bind.sh b/util/bind.sh index 8fe5a25e..52b61da5 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -58,6 +58,7 @@ case $# in ### For ease of use, this records the sticky tag of versions ### released with each point release. ### + 4.4.0b1) noSNAP=snapshot BINDTAG=v9_11_2 ;; 4.4.0a1) noSNAP=snapshot BINDTAG=v9_11_2 ;; 4.3.4|4.3.4b1) BINDTAG=v9_9_8_P4 ;; 4.3.3) BINDTAG=v9_9_7_P3 ;; |