From: Willem Toorop <willem@NLnetLabs.nl>
Date: Tue, 25 Sep 2012 12:46:17 +0000 (+0000)
Subject: Adapt manpage for TSIG key generation
X-Git-Tag: release-1.6.14rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61114702544197ff16caffcdf7f3e443e81d1e0f;p=thirdparty%2Fldns.git

Adapt manpage for TSIG key generation
---

diff --git a/drill/drill_util.c b/drill/drill_util.c
index 950cffbc..8326f133 100644
--- 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 36124d52..734ad6d1 100644
--- 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 373d4701..9a8e13f9 100644
--- 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);