Adapt manpage for TSIG key generation

diff --git a/drill/drill_util.c b/drill/drill_util.c
index 950cffbc08a05336ac386ce1639ccbcb0cff553f..8326f13360264eed5fac654f3610952979b6dae9 100644 (file)
--- a/drill/drill_util.c
+++ b/drill/drill_util.c
@@ -20,7 +20,7 @@ read_line(FILE *input, char *line, size_t len)
        
        char c;
        for (i = 0; i < len-1; i++) {
-               c = (int)getc(input);
+               c = (char)getc(input);
                if (c == EOF) {
                        return -1;
                } else if (c != '\n') {

diff --git a/examples/ldns-keygen.1 b/examples/ldns-keygen.1
index 36124d52a47bcbb384bbbba0e036a3b860ec4815..734ad6d163600bbf9534c1d55cc263c29737fd5d 100644 (file)
--- a/examples/ldns-keygen.1
+++ b/examples/ldns-keygen.1
@@ -14,7 +14,13 @@ will create 3 files; a .key file with the public DNSKEY, a .private
 file with the private keydata and a .ds with the DS record of the
 DNSKEY record.
 
-It prints out the basename for these files: K<name>+<alg>+<id>
+\fBldns-keygen\fR can also be used to create symmetric keys (for TSIG) by
+selecting the appropriate algorithm: \%\fIhmac-md5.sig-alg.reg.int\fR,
+\%\fIhmac-sha1\fR or \%\fIhmac-sha256\fR.
+In that case no DS record will be created and no .ds file.
+
+\fBldns-keygen\fR prints the basename for the key files:
+K<name>+<alg>+<id>
 
 .SH OPTIONS
 .TP

diff --git a/examples/ldns-verify-zone.c b/examples/ldns-verify-zone.c
index 373d47010f30cb12b12e788217d4a4305e79d077..9a8e13f98433715440e3a3318a9e9c87ec712a03 100644 (file)
--- a/examples/ldns-verify-zone.c
+++ b/examples/ldns-verify-zone.c
@@ -309,9 +309,10 @@ verify_next_hashed_name(ldns_dnssec_zone* zone, ldns_dnssec_name *name)
        if (!cur_next_name) {
                cur_next_name = cur_first_name;
        }
-       assert(cur_next_name); /* Because this function is called on nsec
-                               * occurrence, it must be there!
-                               */
+       assert(cur_next_name != NULL);
+               /* Because this function is called on nsec occurrence,
+        * there must be a cur_next_name!
+        */
 
        next_owner_str = ldns_rdf2str(ldns_nsec3_next_owner(name->nsec));
        next_owner_dname = ldns_dname_new_frm_str(next_owner_str);