diff options
| author | Shawn Routhier <sar@isc.org> | 2014-04-29 11:31:22 -0700 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2014-04-29 11:31:22 -0700 |
| commit | 55c899b54aada7eac596333ca10fd0899c73dd8a (patch) | |
| tree | 7e82062a5d7c673e1205b566d0ab637fe4afd9e0 | |
| parent | 9f5dbfc4bd1a76902500ede57f8ef51d32e504cc (diff) | |
| download | isc-dhcp-55c899b54aada7eac596333ca10fd0899c73dd8a.tar.gz | |
[v4_2] Properly ifdef a variable used in the pre_errata code
| -rw-r--r-- | RELNOTES | 3 | ||||
| -rw-r--r-- | server/dhcpv6.c | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -82,6 +82,9 @@ by Eric Young (eay@cryptsoft.com). option in the list. [ISC-Bugs #24580] +- #ifdef variables used in RFC3315_PRE_ERRATA code. + [ISC-Bugs #28938] + Changes since 4.2.6rc1 - None diff --git a/server/dhcpv6.c b/server/dhcpv6.c index d1c18fa5..c496dd0d 100644 --- a/server/dhcpv6.c +++ b/server/dhcpv6.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2013 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2006-2014 by Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -677,12 +677,14 @@ static const int required_opts[] = { D6O_PREFERENCE, 0 }; +#if defined (RFC3315_PRE_ERRATA_2010_08) static const int required_opts_NAA[] = { D6O_CLIENTID, D6O_SERVERID, D6O_STATUS_CODE, 0 }; +#endif /* defined (RFC3315_PRE_ERRATA_2010_08) */ static const int required_opts_solicit[] = { D6O_CLIENTID, D6O_SERVERID, |