aboutsummaryrefslogtreecommitdiff
path: root/common/conflex.c
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2011-10-20 18:39:38 +0200
committerBjørn Mork <bjorn@mork.no>2011-10-20 18:39:38 +0200
commit87d654840a8e3708d6540037fe95359c073ed021 (patch)
tree6261441b7e3d4a1f6fefd73cadd8a1881ac7550c /common/conflex.c
parent8f7a623a2ce25cdd5f4f075562d6336044f3ad1f (diff)
v4.2.3 imported from ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.3/dhcp-4.2.3.tar.gzv4.2.3
From: Shawn Routhier <sar@isc.org> Subject: ISC DHCP 4.2.3 is now available for download To: df-announce@isc.org, dhcp-announce@isc.org, dhcp-workers@lists.isc.org, Users of ISC DHCP <dhcp-users@lists.isc.org> Date: Wed, 19 Oct 2011 16:18:28 -0700 Organization: ISC Reply-To: Users of ISC DHCP <dhcp-users@lists.isc.org> ISC DHCP 4.2.3 is now available for download. This is the public release of ISC DHCP 4.2.3, a maintenance release which contains a small number of bug fixes. A list of the changes in this release has been appended to the end of this message. For a complete list of changes from any previous release, please consult the RELNOTES file within the source distribution, or on our website: http://www.isc.org/software/dhcp/423 This release, and its OpenPGP-signatures are available now from: ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.3/dhcp-4.2.3.tar.gz ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.3/dhcp-4.2.3.tar.gz.sha512.asc ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.3/dhcp-4.2.3.tar.gz.sha256.asc ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.3/dhcp-4.2.3.tar.gz.sha1.asc ISC's Release Signing Key can be obtained at: http://www.isc.org/about/openpgp/ Changes since 4.2.3rc1 - None. Changes since 4.2.2 - Fix the code that checks for an existing DDNS transaction to cancel when removing DDNS information, so that we will continue with the processing if we have a lease even if it doesn't have an outstanding transaction. [ISC-Bugs #24682] - Add AM_MAINTAINER_MODE to configure.ac to avoid rebuilding configuration files. [ISC-Bugs #24107] - Add support for passing DDNS information to a DNS server over an IPv6 address. [ISC-Bugs #22647] - Enhanced patch for 23595 to handle IPv4 fixed addresses more cleanly. [ISC-Bugs #23595] Signed-off-by: Bjørn Mork <bjorn@mork.no>
Diffstat (limited to 'common/conflex.c')
-rw-r--r--common/conflex.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/conflex.c b/common/conflex.c
index 1ec2328..9c9ed66 100644
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -1228,6 +1228,8 @@ intern(char *atom, enum dhcp_token dfv) {
return PEER;
if (!strcasecmp (atom + 1, "rimary"))
return PRIMARY;
+ if (!strcasecmp (atom + 1, "rimary6"))
+ return PRIMARY6;
if (!strncasecmp (atom + 1, "artner", 6)) {
if (!atom [7])
return PARTNER;
@@ -1317,7 +1319,9 @@ intern(char *atom, enum dhcp_token dfv) {
tolower((unsigned char)atom[2]) == 'c') {
if (!strncasecmp(atom + 3, "ond", 3)) {
if (!strcasecmp(atom + 6, "ary"))
- return SECONDARY;
+ return SECONDARY;
+ if (!strcasecmp(atom + 6, "ary6"))
+ return SECONDARY6;
if (!strcasecmp(atom + 6, "s"))
return SECONDS;
break;