pullup:

 680.   [bug]           dns_rdata_fromstruct() mis-handles options bigger
                        than 255 octets.

diff --git a/CHANGES b/CHANGES
index cc682808e73827e5388c1b0c6f73594b1d0f550c..c1a971c9ba75cdfe216c69df7747986c723efba7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 680.  [bug]           dns_rdata_fromstruct() mishandled options bigger
+                       than 255 octets.
+
  681.  [bug]           $GENERATE specifying output format was broken. [RT#653]
 
        --- 9.1.0rc1 released ---

diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 9b31955ca178d6106498b5edb088b915722224bf..5569a8ced053691d7fa948111bf6b5d2977c4c86 100644 (file)
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.19.4.1 2001/01/09 22:47:23 bwelling Exp $ */
+/* $Id: opt_41.c,v 1.19.4.2 2001/01/16 17:45:27 gson Exp $ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 
@@ -158,7 +158,7 @@ static inline isc_result_t
 fromstruct_opt(ARGS_FROMSTRUCT) {
        dns_rdata_opt_t *opt = source;
        isc_region_t region;
-       isc_uint8_t length;
+       isc_uint16_t length;
 
        REQUIRE(type == 41);
        REQUIRE(source != NULL);