1661. [bug] Restore dns_name_concatenate() call in

                        adb.c:set_target().  [RT #11582]

diff --git a/CHANGES b/CHANGES
index 8b803e7effed270d8a69a63cc6782b50956e99b6..c30265012ac239c880342b7fa3e9bf58d8808318 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,8 @@
 1662.  [bug]           Change #1658 failed to change one use of 'type'
                        to 'keytype'.
 
-1661.  [placeholder]   rt11582
+1661.  [bug]           Restore dns_name_concatenate() call in
+                       adb.c:set_target().  [RT #11582]
 
 1660.  [bug]           win32: connection_reset_fix() was being called
                        unconditionally.  [RT #11595]

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index ae941cb374a9b2dfab14371b1e2a6270b1b60090..8ae10e0350bbb3555af0581261691deb56f5848b 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.215 2004/03/10 02:19:55 marka Exp $ */
+/* $Id: adb.c,v 1.216 2004/06/18 01:22:32 marka Exp $ */
 
 /*
  * Implementation notes
@@ -1007,6 +1007,8 @@ set_target(dns_adb_t *adb, dns_name_t *name, dns_name_t *fname,
                dns_fixedname_init(&fixed2);
                new_target = dns_fixedname_name(&fixed2);
                dns_name_split(name, nlabels, prefix, NULL);
+               result = dns_name_concatenate(prefix, &dname.dname, new_target,
+                                             NULL);
                dns_rdata_freestruct(&dname);
                if (result != ISC_R_SUCCESS)
                        return (result);