pullup:

 787.   [bug]           The DNSSEC tools failed to downcase domain
                        names when mapping them into file names.

diff --git a/CHANGES b/CHANGES
index 8cdd2fdd11c83e06dd92e64f766f3ea882eda2a0..18ea7e078f98b46c640add3c7c6f5ee07365dfbf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 787.  [bug]           The DNSSEC tools failed to downcase domain
+                       names when mapping them into file names.
+
        --- 9.1.1rc6 released ---
 
  785.  [bug]           A race condition in the resolver could cause

diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c
index 2a885c9e36b5ff8ac5a1977685e004e92318a6c3..e4ce8e0ed6ec1c33a6cbc3e9a1c5256eaf3a799d 100644 (file)
--- a/bin/dnssec/dnssec-makekeyset.c
+++ b/bin/dnssec/dnssec-makekeyset.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-makekeyset.c,v 1.45.4.1 2001/01/09 22:31:32 bwelling Exp $ */
+/* $Id: dnssec-makekeyset.c,v 1.45.4.2 2001/03/26 19:11:53 gson Exp $ */
 
 #include <config.h>
 
@@ -220,6 +220,7 @@ main(int argc, char *argv[]) {
 
        for (i = 0; i < argc; i++) {
                char namestr[DNS_NAME_FORMATSIZE];
+               dns_fixedname_t fname;
                isc_buffer_t namebuf;
 
                key = NULL;
@@ -231,7 +232,12 @@ main(int argc, char *argv[]) {
                        rdatalist.rdclass = dst_key_class(key);
 
                isc_buffer_init(&namebuf, namestr, sizeof namestr);
-               result = dns_name_totext(dst_key_name(key), ISC_FALSE,
+               dns_fixedname_init(&fname);
+               dns_name_downcase(dst_key_name(key),
+                                 dns_fixedname_name(&fname),
+                                 NULL);
+               result = dns_name_totext(dns_fixedname_name(&fname),
+                                        ISC_FALSE,
                                         &namebuf);
                check_result(result, "dns_name_totext");
                isc_buffer_putuint8(&namebuf, 0);

diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c
index 2eab0edd2a3dc62915f8b17e78d42b270ba905a6..53a8e692ae78080c97558369cac054af716d0d27 100644 (file)
--- a/bin/dnssec/dnssec-signkey.c
+++ b/bin/dnssec/dnssec-signkey.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signkey.c,v 1.45.2.1 2001/01/09 22:31:33 bwelling Exp $ */
+/* $Id: dnssec-signkey.c,v 1.45.2.2 2001/03/26 19:11:55 gson Exp $ */
 
 #include <config.h>
 
@@ -262,7 +262,7 @@ main(int argc, char *argv[]) {
        isc_buffer_init(&b, argv[0] + strlen("keyset-"),
                        strlen(argv[0]) - strlen("keyset-"));
        isc_buffer_add(&b, strlen(argv[0]) - strlen("keyset-"));
-       result = dns_name_fromtext(domain, &b, dns_rootname, ISC_FALSE, NULL);
+       result = dns_name_fromtext(domain, &b, dns_rootname, ISC_TRUE, NULL);
        if (result != ISC_R_SUCCESS)
                fatal("'%s' does not contain a valid domain name", argv[0]);
        isc_buffer_init(&b, tdomain, sizeof(tdomain) - 1);

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 148117b21edb782cbda7f861cc4afcf5fd320cc5..ab34bf739e54601bdffd0b0b564b6028a3d5f6dc 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.126.2.2 2001/01/12 23:44:02 gson Exp $ */
+/* $Id: dnssec-signzone.c,v 1.126.2.3 2001/03/26 19:11:56 gson Exp $ */
 
 #include <config.h>
 
@@ -505,6 +505,7 @@ static void
 opendb(const char *prefix, dns_name_t *name, dns_rdataclass_t rdclass,
        dns_db_t **dbp)
 {
+       dns_fixedname_t fname;
        char filename[256];
        isc_buffer_t b;
        isc_result_t result;
@@ -516,7 +517,9 @@ opendb(const char *prefix, dns_name_t *name, dns_rdataclass_t rdclass,
                        isc_buffer_putstr(&b, "/");
        }
        isc_buffer_putstr(&b, prefix);
-       result = dns_name_totext(name, ISC_FALSE, &b);
+       dns_fixedname_init(&fname);
+       (void)dns_name_downcase(name, dns_fixedname_name(&fname), NULL);
+       result = dns_name_totext(dns_fixedname_name(&fname), ISC_FALSE, &b);
        check_result(result, "dns_name_totext()");
        if (isc_buffer_availablelength(&b) == 0) {
                char namestr[DNS_NAME_FORMATSIZE];