Commit 219a65eb authored by David Hankins's avatar David Hankins

- 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]
parent 57fcb8d9
......@@ -118,6 +118,9 @@ suggested fixes to <dhcp-users@isc.org>.
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
......
......@@ -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"))
......
......@@ -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:
......
......@@ -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,
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment