2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00

3843. [protocol] Check EDNS EXPIRE option in dns_rdata_fromwire.

[RT #35969]

Conflicts:
	CHANGES
This commit is contained in:
Mark Andrews 2014-05-13 12:46:24 +10:00
parent 1b513b6120
commit 0e338b60cd
2 changed files with 6 additions and 2 deletions

View File

@ -2,6 +2,9 @@
Redistributable when built for 64 bit Windows. Redistributable when built for 64 bit Windows.
(Thanks to Giovanni Paterno.) [RT #35973] (Thanks to Giovanni Paterno.) [RT #35973]
3843. [protocol] Check EDNS EXPIRE option in dns_rdata_fromwire.
[RT #35969]
3842. [bug] Adjust RRL log-only logging category. [RT #35945] 3842. [bug] Adjust RRL log-only logging category. [RT #35945]
3841. [cleanup] Refactor zone.c:add_opt to use dns_message_buildopt. 3841. [cleanup] Refactor zone.c:add_opt to use dns_message_buildopt.

View File

@ -151,13 +151,14 @@ fromwire_opt(ARGS_FROMWIRE) {
isc_region_consume(&sregion, addrbytes); isc_region_consume(&sregion, addrbytes);
break; break;
} }
#ifdef notyet
case DNS_OPT_EXPIRE: case DNS_OPT_EXPIRE:
/*
* Request has zero length. Response is 32 bits.
*/
if (length != 0 && length != 4) if (length != 0 && length != 4)
return (DNS_R_FORMERR); return (DNS_R_FORMERR);
isc_region_consume(&sregion, length); isc_region_consume(&sregion, length);
break; break;
#endif
default: default:
isc_region_consume(&sregion, length); isc_region_consume(&sregion, length);
break; break;