pullup:

1038.   [bug]           TKEY queries with an owner name other than the root
                        could cause an assertion failure. [RT #1866, #1869]

diff --git a/CHANGES b/CHANGES
index e1ad7e41c4b9dd8404e8c2a5e567f2956c111c57..159fb74c58a8328b280c19a6ee1cfcc714908b9f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+1038.  [bug]           TKEY queries with an owner name other than the root
+                       could cause an assertion failure. [RT #1866, #1869]
+
        --- 9.2.0rc6 released ---
 
 1031.  [bug]           libbind.a: isc__gettimeofday() infinite recursion.

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index a5b756d2ff4a6113fa6cf238b91aaa0e0eeb28f1..7e485489224c389882268c26523de4b9be4288f3 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.71 2001/08/08 22:54:43 gson Exp $
+ * $Id: tkey.c,v 1.71.2.1 2001/10/09 23:06:57 gson Exp $
  */
 
 #include <config.h>
@@ -643,7 +643,8 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx,
 
                if (!dns_name_equal(qname, dns_rootname)) {
                        unsigned int n = dns_name_countlabels(qname);
-                       dns_name_getlabelsequence(qname, 0, n - 1, keyname);
+                       dns_name_copy(qname, keyname, NULL);
+                       dns_name_getlabelsequence(keyname, 0, n - 1, keyname);
                }
                else {
                        static char hexdigits[16] = {