mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

- Fixed a compilation problems on platforms that define a value for FDDI,

Browse Source 
which conflicts with a dhcp configuration syntax token by the same name.
  [ISC-Bugs #16898]
This commit is contained in:
David Hankins 2008-01-16 22:57:01 +00:00
parent 57fcb8d97a
commit 219a65eb6e
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELNOTES
View File

@ -118,6 +118,9 @@ suggested fixes to <dhcp-users@isc.org>.
every time the option was overridden, which could create a lot of every time the option was overridden, which could create a lot of
unnecessary logging. 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 Changes since 4.0.0b3
- The reverse dns name for PTR updates on IPv6 addresses has been fixed to - The reverse dns name for PTR updates on IPv6 addresses has been fixed to

2
common/conflex.c
View File

@ -912,7 +912,7 @@ intern(char *atom, enum dhcp_token dfv) {
if (!strcasecmp (atom + 1, "ixed-address6")) if (!strcasecmp (atom + 1, "ixed-address6"))
return FIXED_ADDR6; return FIXED_ADDR6;
if (!strcasecmp (atom + 1, "ddi")) if (!strcasecmp (atom + 1, "ddi"))
return FDDI; return TOKEN_FDDI;
if (!strcasecmp (atom + 1, "ormerr")) if (!strcasecmp (atom + 1, "ormerr"))
return NS_FORMERR; return NS_FORMERR;
if (!strcasecmp (atom + 1, "unction")) if (!strcasecmp (atom + 1, "unction"))

4
common/parse.c
View File

@ -569,7 +569,7 @@ parse_ip_addr_with_subnet(cfile, match)
/* /*
* hardware-parameter :== HARDWARE hardware-type colon-separated-hex-list SEMI * 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) void parse_hardware_param (cfile, hardware)
@ -589,7 +589,7 @@ void parse_hardware_param (cfile, hardware)
case TOKEN_RING: case TOKEN_RING:
hardware -> hbuf [0] = HTYPE_IEEE802; hardware -> hbuf [0] = HTYPE_IEEE802;
break; break;
case FDDI: case TOKEN_FDDI:
hardware -> hbuf [0] = HTYPE_FDDI; hardware -> hbuf [0] = HTYPE_FDDI;
break; break;
default: default:

2
includes/dhctoken.h
View File

@ -175,7 +175,7 @@ enum dhcp_token {
COMMUNICATIONS_INTERRUPTED = 376, COMMUNICATIONS_INTERRUPTED = 376,
POTENTIAL_CONFLICT = 377, POTENTIAL_CONFLICT = 377,
RECOVER = 378, RECOVER = 378,
FDDI = 379, TOKEN_FDDI = 379,
AUTHORITATIVE = 380, AUTHORITATIVE = 380,
TOKEN_NOT = 381, TOKEN_NOT = 381,
AUTHENTICATION = 383, AUTHENTICATION = 383,

4
server/confpars.c
View File

@ -4821,7 +4821,7 @@ parse_server_duid_conf(struct parse *cfile) {
case TOKEN_RING: case TOKEN_RING:
ll_type = HTYPE_IEEE802; ll_type = HTYPE_IEEE802;
break; break;
case FDDI: case TOKEN_FDDI:
ll_type = HTYPE_FDDI; ll_type = HTYPE_FDDI;
break; break;
default: default:
@ -4876,7 +4876,7 @@ parse_server_duid_conf(struct parse *cfile) {
case TOKEN_RING: case TOKEN_RING:
ll_type = HTYPE_IEEE802; ll_type = HTYPE_IEEE802;
break; break;
case FDDI: case TOKEN_FDDI:
ll_type = HTYPE_FDDI; ll_type = HTYPE_FDDI;
break; break;
default: default: