reverted previous pullup until issues with the

dst_region_computeid() changes it depends on have been resolved

diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 887ce75d1fb9280e1191c3fc6a8f23872ddf1d5b..8459d0fbf1f0d8bb64202c764aeaabedfa6a61dd 100644 (file)
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.26.2.1 2000/08/07 16:46:38 gson Exp $ */
+/* $Id: key_25.c,v 1.26.2.2 2000/08/07 19:25:27 gson Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -26,8 +26,6 @@
 #ifndef RDATA_GENERIC_KEY_25_C
 #define RDATA_GENERIC_KEY_25_C
 
-#include <dst/dst.h>
-
 #define RRTYPE_KEY_ATTRIBUTES (DNS_RDATATYPEATTR_DNSSEC)
 
 static inline isc_result_t
@@ -71,6 +69,8 @@ totext_key(ARGS_TOTEXT) {
        char buf[sizeof "64000"];
        unsigned int flags;
 
+       UNUSED(tctx);
+
        REQUIRE(rdata->type == 25);
 
        dns_rdata_toregion(rdata, &sr);
@@ -106,15 +106,7 @@ totext_key(ARGS_TOTEXT) {
        if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
                RETERR(str_totext(" )", target));
 
-       if ((tctx->flags & DNS_STYLEFLAG_COMMENT) != 0) {
-               isc_region_t tmpr;
-
-               RETERR(str_totext(" ; key id = ", target));
-               dns_rdata_toregion(rdata, &tmpr);
-               sprintf(buf, "%u", dst_region_computeid(&tmpr));
-               RETERR(str_totext(buf, target));
-       }
-       return (ISC_R_SUCCESS);
+       return ISC_R_SUCCESS;
 }
 
 static inline isc_result_t