- 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]

diff --git a/RELNOTES b/RELNOTES
index 3f4225d1f34316c9cd2a8085bc0cb511d34bbb10..ec681ac8d141a8039d76ed88d4776de9d26c3b28 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -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

diff --git a/common/conflex.c b/common/conflex.c
index 2c3621fee633c5527bce1d19a46f23922aacb25b..9a82fb270a64670d1f5ea26408aa909992296775 100644 (file)
--- 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 c1c66425b8e6673219f8506272bb47d235d3f2fc..984eab78975163d4aac1cd1e6d2734f15944641b 100644 (file)
--- 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 dd39a3e62d7845398be42e3ff5604c0b29c4c871..568d41123b35c210f5f4aea54337467a2ab9cb4c 100644 (file)
--- 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 21322ef852e1e0ad75b625be9061c7426080d287..ad97ffef97d57ac0028e2e7e85ce7c856a564f54 100644 (file)
--- 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: