From 219a65eb6e4eee3809cfde2151e863665579a44c Mon Sep 17 00:00:00 2001 From: David Hankins Date: Wed, 16 Jan 2008 22:57:01 +0000 Subject: [PATCH] - Fixed a compilation problems on platforms that define a value for FDDI, which conflicts with a dhcp configuration syntax token by the same name. [ISC-Bugs #16898] --- RELNOTES | 3 +++ common/conflex.c | 2 +- common/parse.c | 4 ++-- includes/dhctoken.h | 2 +- server/confpars.c | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/RELNOTES b/RELNOTES index 3f4225d1..ec681ac8 100644 --- a/RELNOTES +++ b/RELNOTES @@ -118,6 +118,9 @@ suggested fixes to . every time the option was overridden, which could create a lot of unnecessary logging. +- Fixed a compilation problems on platforms that define a value for FDDI, + which conflicts with a dhcp configuration syntax token by the same name. + Changes since 4.0.0b3 - The reverse dns name for PTR updates on IPv6 addresses has been fixed to diff --git a/common/conflex.c b/common/conflex.c index 2c3621fe..9a82fb27 100644 --- a/common/conflex.c +++ b/common/conflex.c @@ -912,7 +912,7 @@ intern(char *atom, enum dhcp_token dfv) { if (!strcasecmp (atom + 1, "ixed-address6")) return FIXED_ADDR6; if (!strcasecmp (atom + 1, "ddi")) - return FDDI; + return TOKEN_FDDI; if (!strcasecmp (atom + 1, "ormerr")) return NS_FORMERR; if (!strcasecmp (atom + 1, "unction")) diff --git a/common/parse.c b/common/parse.c index c1c66425..984eab78 100644 --- a/common/parse.c +++ b/common/parse.c @@ -569,7 +569,7 @@ parse_ip_addr_with_subnet(cfile, match) /* * hardware-parameter :== HARDWARE hardware-type colon-separated-hex-list SEMI - * hardware-type :== ETHERNET | TOKEN_RING | FDDI + * hardware-type :== ETHERNET | TOKEN_RING | TOKEN_FDDI */ void parse_hardware_param (cfile, hardware) @@ -589,7 +589,7 @@ void parse_hardware_param (cfile, hardware) case TOKEN_RING: hardware -> hbuf [0] = HTYPE_IEEE802; break; - case FDDI: + case TOKEN_FDDI: hardware -> hbuf [0] = HTYPE_FDDI; break; default: diff --git a/includes/dhctoken.h b/includes/dhctoken.h index dd39a3e6..568d4112 100644 --- a/includes/dhctoken.h +++ b/includes/dhctoken.h @@ -175,7 +175,7 @@ enum dhcp_token { COMMUNICATIONS_INTERRUPTED = 376, POTENTIAL_CONFLICT = 377, RECOVER = 378, - FDDI = 379, + TOKEN_FDDI = 379, AUTHORITATIVE = 380, TOKEN_NOT = 381, AUTHENTICATION = 383, diff --git a/server/confpars.c b/server/confpars.c index 21322ef8..ad97ffef 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -4821,7 +4821,7 @@ parse_server_duid_conf(struct parse *cfile) { case TOKEN_RING: ll_type = HTYPE_IEEE802; break; - case FDDI: + case TOKEN_FDDI: ll_type = HTYPE_FDDI; break; default: @@ -4876,7 +4876,7 @@ parse_server_duid_conf(struct parse *cfile) { case TOKEN_RING: ll_type = HTYPE_IEEE802; break; - case FDDI: + case TOKEN_FDDI: ll_type = HTYPE_FDDI; break; default: