2236. [bug] dnssec-signzone failed to preserve the case of

                        of wildcard owner names. [RT #17085]

diff --git a/CHANGES b/CHANGES
index c10a4274233cbe3dfafdb677cf64561e1634a180..704a339da4b3bb23baa9ed81124c43f1b436efbd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2236.  [bug]           dnssec-signzone failed to preserve the case of
+                       of wildcard owner names. [RT #17085]
+
 2235.  [bug]           <isc/atomic.h> was not being installed. [RT #17135]
 
 2234.   [port]          Correct some compiler warnings on SCO OSr5 [RT #17134]

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 5e5ce2e0ae6777df48d0875e4fc8e2db86dcc795..75ca44045359677dab07ae4414654597a6bdd09f 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.81.18.9 2007/08/28 07:20:04 tbox Exp $
+ * $Id: dnssec.c,v 1.81.18.10 2007/09/14 04:35:42 marka Exp $
  */
 
 /*! \file */
@@ -406,16 +406,11 @@ dns_dnssec_verify2(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
         */
        dns_fixedname_init(&fnewname);
        labels = dns_name_countlabels(name) - 1;
-       if (labels - sig.labels > 0) {
-               dns_name_split(name, sig.labels + 1, NULL,
-                              dns_fixedname_name(&fnewname));
-               RUNTIME_CHECK(dns_name_downcase(dns_fixedname_name(&fnewname),
-                                               dns_fixedname_name(&fnewname),
-                                               NULL)
-                             == ISC_R_SUCCESS);
-       }
-       else
-               dns_name_downcase(name, dns_fixedname_name(&fnewname), NULL);
+       RUNTIME_CHECK(dns_name_downcase(name, dns_fixedname_name(&fnewname),
+                                       NULL) == ISC_R_SUCCESS);
+       if (labels - sig.labels > 0)
+               dns_name_split(dns_fixedname_name(&fnewname), sig.labels + 1,
+                              NULL, dns_fixedname_name(&fnewname));
 
        dns_name_toregion(dns_fixedname_name(&fnewname), &r);