From: Willem Toorop <willem@NLnetLabs.nl>
Date: Thu, 22 Sep 2011 10:36:55 +0000 (+0000)
Subject: Reviewing the code review :)
X-Git-Tag: release-1.6.11rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45539284179a19d874a12ae1938201cda5da456b;p=thirdparty%2Fldns.git

Reviewing the code review :)
---

diff --git a/dnssec_zone.c b/dnssec_zone.c
index 9132321a..89bdf8dd 100644
--- a/dnssec_zone.c
+++ b/dnssec_zone.c
@@ -794,12 +794,12 @@ ldns_dnssec_zone_print_fmt(FILE *out, const ldns_output_format *fmt,
 {
 	if (zone) {
 		if (zone->soa) {
-			if ((fmt->flags & LDNS_COMMENT_LAYOUT))
+			if ((fmt->flags & LDNS_COMMENT_LAYOUT)) {
 				fprintf(out, ";; Zone: ");
-			ldns_rdf_print(out,
-					ldns_dnssec_name_name(zone->soa));
-			if ((fmt->flags & LDNS_COMMENT_LAYOUT))
+				ldns_rdf_print(out, ldns_dnssec_name_name(
+							zone->soa));
 				fprintf(out, "\n;\n");
+			}
 			ldns_dnssec_rrsets_print_fmt(out, fmt,
 					ldns_dnssec_name_find_rrset(
 						zone->soa, 
diff --git a/host2str.c b/host2str.c
index 262728bd..5679fe07 100644
--- a/host2str.c
+++ b/host2str.c
@@ -1246,7 +1246,8 @@ ldns_rr2buffer_str_fmt(ldns_buffer *output,
 				if (! (fmt->flags & LDNS_COMMENT_KEY)) {
 					break;
 				}
-				flags = ldns_rdf2native_int16(ldns_rr_rdf(rr, 0));
+				flags = ldns_rdf2native_int16(
+						ldns_rr_rdf(rr, 0));
 				ldns_buffer_printf(output, " ;{");
 				if (fmt->flags & LDNS_COMMENT_KEY_ID) {
 					ldns_buffer_printf(output, "id = %u",
@@ -1263,7 +1264,7 @@ ldns_rr2buffer_str_fmt(ldns_buffer *output,
 						ldns_buffer_printf(
 							output, " (zsk)");
 					}
-					if (fmt->flags & LDNS_COMMENT_KEY_SIZE) {
+					if (fmt->flags & LDNS_COMMENT_KEY_SIZE){
 						ldns_buffer_printf(
 							output, ", ");
 					}
@@ -1280,19 +1281,28 @@ ldns_rr2buffer_str_fmt(ldns_buffer *output,
 				break;
 			case LDNS_RR_TYPE_RRSIG:
 				if ((fmt->flags & LDNS_COMMENT_KEY)
+						&& (fmt->flags 
+							& LDNS_COMMENT_RRSIGS)
 						&& ldns_rr_rdf(rr, 6) != NULL) {
-					ldns_buffer_printf(output, " ;{id = %d}",
-							ldns_rdf2native_int16(ldns_rr_rdf(rr, 6)));
+					ldns_buffer_printf(output
+						, " ;{id = %d}"
+						, ldns_rdf2native_int16(
+							ldns_rr_rdf(rr, 6)));
 				}
 				break;
 			case LDNS_RR_TYPE_DS:
 				if ((fmt->flags & LDNS_COMMENT_BUBBLEBABBLE)
 						&& ldns_rr_rdf(rr, 3) != NULL) {
-					uint8_t *data = ldns_rdf_data(ldns_rr_rdf(rr, 3));
-					size_t len = ldns_rdf_size(ldns_rr_rdf(rr, 3));
-					char *babble = ldns_bubblebabble(data, len);
-					if(babble)
-					  ldns_buffer_printf(output, " ;{%s}", babble);
+					uint8_t *data = ldns_rdf_data(
+							ldns_rr_rdf(rr, 3));
+					size_t len = ldns_rdf_size(
+							ldns_rr_rdf(rr, 3));
+					char *babble = ldns_bubblebabble(
+							data, len);
+					if(babble) {
+						ldns_buffer_printf(output
+							, " ;{%s}", babble);
+					}
 					LDNS_FREE(babble);
 				}
 				break;
diff --git a/ldns/host2str.h b/ldns/host2str.h
index bfca985e..f0a14a43 100644
--- a/ldns/host2str.h
+++ b/ldns/host2str.h
@@ -43,25 +43,27 @@ extern "C" {
  * Represent a NULL pointer (in stead of a pointer to a ldns_rr as "; (null)" 
  * as opposed to outputting nothing at all in such a case.
  */
-#define LDNS_COMMENT_NULLS		0x01
+#define LDNS_COMMENT_NULLS		0x0001
 /** Show key id with DNSKEY RR's as comment */
-#define LDNS_COMMENT_KEY_ID		0x02
+#define LDNS_COMMENT_KEY_ID		0x0002
 /** Show if a DNSKEY is a ZSK or KSK as comment */
-#define LDNS_COMMENT_KEY_TYPE		0x04
+#define LDNS_COMMENT_KEY_TYPE		0x0004
 /** Show DNSKEY key size as comment */
-#define LDNS_COMMENT_KEY_SIZE		0x08
+#define LDNS_COMMENT_KEY_SIZE		0x0008
 /** Show key id, type and size as comment for DNSKEY RR's */
 #define LDNS_COMMENT_KEY		(LDNS_COMMENT_KEY_ID  \
 					|LDNS_COMMENT_KEY_TYPE\
 					|LDNS_COMMENT_KEY_SIZE)
 /** Provide bubblebabble representation for DS RR's as comment */
-#define LDNS_COMMENT_BUBBLEBABBLE	0x10
+#define LDNS_COMMENT_BUBBLEBABBLE	0x0010
 /** Show when a NSEC3 RR has the optout flag set as comment */
-#define LDNS_COMMENT_FLAGS		0x20
+#define LDNS_COMMENT_FLAGS		0x0020
 /** Show the unhashed owner and next owner names for NSEC3 RR's as comment */
-#define LDNS_COMMENT_NSEC3_CHAIN	0x40
+#define LDNS_COMMENT_NSEC3_CHAIN	0x0040
 /** Print mark up */
-#define LDNS_COMMENT_LAYOUT		0x80
+#define LDNS_COMMENT_LAYOUT		0x0080
+/** Also comment KEY_ID with RRSIGS **/
+#define LDNS_COMMENT_RRSIGS		0x0100
 
 /**
  * Output format specifier
diff --git a/test/08-zonereader.tpkg b/test/08-zonereader.tpkg
index 15cfeba8..47b8b3b6 100644
Binary files a/test/08-zonereader.tpkg and b/test/08-zonereader.tpkg differ