dns_rdata_tostruct() should reject rdata with DNS_RDATA_UPDATE set

(cherry picked from commit e97249e01270ab43065e3a7d6ba3f5a36593a2c4)

diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 7794fb051d66f4297b5aa6f16bcaeeef118630c3..804cd5b76a750f6b6d6aa2c3863d223bdedba1c6 100644 (file)
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -509,7 +509,7 @@ dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx);
  *
  * Requires:
  *
- *\li  'rdata' is a valid, non-empty rdata.
+ *\li  'rdata' is a valid, non-empty, non-pseudo rdata.
  *
  *\li  'target' to point to a valid pointer for the type and class.
  *

diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 3bd7f54661a44a644826f94d976a6223b69d967b..a255967e46672a39818b051d5e325bea3ad9eb1a 100644 (file)
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1233,6 +1233,7 @@ dns_rdata_tostruct(const dns_rdata_t *rdata, void *target, isc_mem_t *mctx) {
 
        REQUIRE(rdata != NULL);
        REQUIRE(DNS_RDATA_VALIDFLAGS(rdata));
+       REQUIRE((rdata->flags & DNS_RDATA_UPDATE) == 0);
 
        TOSTRUCTSWITCH