From c7d63ae5a4e9bef9dbd2f11809b4e4ecdf3083cc Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Fri, 11 Aug 2000 19:39:10 +0000
Subject: [PATCH] Remove support for the zone status bit, since the proposal no
 longer exists.

---
 bin/dnssec/dnssec-signzone.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 2d247f9e2a..1f02eb4f50 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.90 2000/08/10 22:08:23 bwelling Exp $ */
+/* $Id: dnssec-signzone.c,v 1.91 2000/08/11 19:39:10 bwelling Exp $ */
 
 #include <config.h>
 
@@ -57,8 +57,6 @@
 const char *program = "dnssec-signzone";
 int verbose;
 
-/*#define USE_ZONESTATUS*/
-
 #define BUFSIZE 2048
 
 typedef struct signer_key_struct signer_key_t;
@@ -478,7 +476,6 @@ signset(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
 	}
 }
 
-#ifndef USE_ZONESTATUS
 /* Determine if a KEY set contains a null key */
 static isc_boolean_t
 hasnullkey(dns_rdataset_t *rdataset) {
@@ -506,7 +503,6 @@ hasnullkey(dns_rdataset_t *rdataset) {
                 fatal("failure looking for null keys");
         return (ISC_FALSE);
 }
-#endif
 
 /*
  * Looks for signatures of the zone keys by the parent, and imports them
@@ -744,12 +740,10 @@ signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
 			case dns_rdatatype_nxt:
 				childkey = haschildkey(db, name);
 				break;
-#ifndef USE_ZONESTATUS
 			case dns_rdatatype_key:
 				if (hasnullkey(&rdataset))
 					break;
 				goto skip;
-#endif
 			default:
 				goto skip;
 			}
@@ -779,14 +773,6 @@ signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
 			dns_name_toregion(&nxtname, &r2);
 			nxt_bits = r.base + r2.length;
 			set_bit(nxt_bits, dns_rdatatype_sig, 1);
-#ifdef USE_ZONESTATUS
-			if (isdelegation && childkey) {
-				set_bit(nxt_bits, dns_rdatatype_key, 1);
-				vbprintf(2, "found a child key for %s, "
-					 "setting KEY bit in NXT\n",
-					 nametostr(name));
-			}
-#else
 			if (isdelegation && !childkey) {
 				dns_rdataset_t keyset;
 				dns_rdatalist_t keyrdatalist;
@@ -855,7 +841,6 @@ signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
 					 nametostr(name));
 
 			}
-#endif
 		}
 
 		signset(db, version, node, name, &rdataset);