From b03c1bf72f6df000e7c5f7ee83c6874ab5ccfb01 Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Fri, 23 Mar 2001 03:59:00 +0000
Subject: [PATCH] Make sure to create all keyset- and signedkey- files with
 downcased names; downcase names before looking for signedkey- files in
 dnssec-signzone.

---
 bin/dnssec/dnssec-makekeyset.c | 10 ++++++++--
 bin/dnssec/dnssec-signkey.c    |  4 ++--
 bin/dnssec/dnssec-signzone.c   |  7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c
index 1c7b5acfcb..5bc28797dd 100644
--- 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.47 2001/03/22 19:28:23 bwelling Exp $ */
+/* $Id: dnssec-makekeyset.c,v 1.48 2001/03/23 03:58:58 bwelling Exp $ */
 
 #include <config.h>
 
@@ -246,6 +246,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;
@@ -257,7 +258,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 9bb9aa7b68..7f8698d5b6 100644
--- 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.46 2001/01/09 21:39:24 bwelling Exp $ */
+/* $Id: dnssec-signkey.c,v 1.47 2001/03/23 03:58:59 bwelling 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 0126f86a1b..3fcf52f7ce 100644
--- 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.129 2001/01/12 23:36:03 bwelling Exp $ */
+/* $Id: dnssec-signzone.c,v 1.130 2001/03/23 03:59:00 bwelling 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];