code review

diff --git a/dnssec.c b/dnssec.c
index 2e7e0bc1e0ad8669beedceca03a1d2d87300be3f..ccc1d3b954ace40548fdaa4a71f1301124088e33 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -781,8 +781,7 @@ ldns_dnssec_create_nsec(ldns_dnssec_name *from,
        ldns_dnssec_rrsets *cur_rrsets;
        int on_delegation_point;
 
-       if (!from || !to || (nsec_type != LDNS_RR_TYPE_NSEC &&
-                                        nsec_type != LDNS_RR_TYPE_NSEC3)) {
+       if (!from || !to || (nsec_type != LDNS_RR_TYPE_NSEC)) {
                return NULL;
        }
 

diff --git a/dnssec_verify.c b/dnssec_verify.c
index 427aae9f7f7066a404149a78e71570e737477e8d..4e51df74f7cc404ab3cc05c23c1648344721f1b9 100644 (file)
--- a/dnssec_verify.c
+++ b/dnssec_verify.c
@@ -1355,13 +1355,6 @@ ldns_verify_trusted(ldns_resolver *res,
                                        ldns_rr_list_deep_free(trusted_keys);
                                        return LDNS_STATUS_OK;
                                } 
-                               /* This was for debugging I guess!
-                                * else {
-                                       ldns_rr_list_print(stdout, rrset);
-                                       ldns_rr_print(stdout, cur_sig);
-                                       ldns_rr_print(stdout, cur_key);
-               
-                               } */
                        }
                }
        }

diff --git a/host2str.c b/host2str.c
index bf7fc555577e8402520fbde13bde5f5887d8eeae..262728bdbe4250ba67b4fed2b3e0031923c8d71e 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -1292,18 +1292,28 @@ ldns_rr2buffer_str_fmt(ldns_buffer *output,
                                        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_buffer_printf(output, " ;{%s}", babble);
                                        LDNS_FREE(babble);
                                }
                                break;
                        case LDNS_RR_TYPE_NSEC3:
-                               if ((fmt->flags & LDNS_COMMENT_FLAGS)
-                                               && ldns_nsec3_optout(rr)) {
-                                       ldns_buffer_printf(output,
-                                                       " ; flags: optout");
-                               } else if (fmt->flags 
-                                               & LDNS_COMMENT_NSEC3_CHAIN) {
-                                       ldns_buffer_printf(output, " ;");
+                               if (! (fmt->flags & LDNS_COMMENT_FLAGS) &&
+                                   ! (fmt->flags & LDNS_COMMENT_NSEC3_CHAIN)) {
+                                       break;
+                               }
+                               ldns_buffer_printf(output, " ;{");
+                               if ((fmt->flags & LDNS_COMMENT_FLAGS)) {
+                                       if (ldns_nsec3_optout(rr)) {
+                                               ldns_buffer_printf(output,
+                                                       " flags: optout");
+                                       } else {
+                                               ldns_buffer_printf(output,
+                                                       " flags: -");
+                                       }
+                                       if (fmt->flags & LDNS_COMMENT_NSEC3_CHAIN
+                                                       && fmt->data != NULL) {
+                                               ldns_buffer_printf(output, ", ");
+                                       }
                                }
                                if (fmt->flags & LDNS_COMMENT_NSEC3_CHAIN
                                                && fmt->data != NULL) {
@@ -1318,7 +1328,7 @@ ldns_rr2buffer_str_fmt(ldns_buffer *output,
                                                if (node->data) {
                                                        ldns_buffer_printf(
                                                                output,
-                                                               " from: ");
+                                                               "from: ");
                                                        (void)
                                                        ldns_rdf2buffer_str(
                                                                output, 
@@ -1347,7 +1357,7 @@ ldns_rr2buffer_str_fmt(ldns_buffer *output,
                                                ldns_rdf_free(key);
                                        }
                                }
-
+                               ldns_buffer_printf(output, "}");
                                break;
                        default:
                                break;