summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Toorop <willem@nlnetlabs.nl>2013-11-21 14:46:07 +0100
committerWillem Toorop <willem@nlnetlabs.nl>2013-11-21 14:46:07 +0100
commita69cf0b660344d354f4c0de5151ac58a5dd96972 (patch)
tree1465f4e425fc4020d294bb207e8e086bc0dce7d1
parent5193f180f586e4a14cc3fa17270485421e950515 (diff)
downloadldns-a69cf0b660344d354f4c0de5151ac58a5dd96972.tar.gz
bugfix #505: Manpage and usage output fixes
(Thanks Tomas Hozza)
-rw-r--r--Changelog1
-rw-r--r--examples/ldns-compare-zones.c2
-rw-r--r--examples/ldns-key2ds.14
-rw-r--r--examples/ldns-keygen.c2
-rw-r--r--examples/ldns-read-zone.14
-rw-r--r--examples/ldns-read-zone.c2
-rw-r--r--examples/ldns-signzone.c2
-rw-r--r--examples/ldns-walk.112
-rw-r--r--examples/ldns-zcat.14
-rw-r--r--examples/ldns-zcat.c2
-rw-r--r--examples/ldns-zsplit.14
11 files changed, 35 insertions, 4 deletions
diff --git a/Changelog b/Changelog
index 68dba6a8..b201c9e2 100644
--- a/Changelog
+++ b/Changelog
@@ -53,6 +53,7 @@
--enable-rrtype-rkey, --enable-rrtype-cds, --enable-rrtype-uri and
--enable-rrtype-ta
* bugfix #530: Don't sign and verify duplicate RRs (Thanks Jelte Jansen)
+ * bugfix #505: Manpage and usage output fixes (Thanks Tomas Hozza)
1.6.16 2012-11-13
* Fix Makefile to build pyldns with BSD make
diff --git a/examples/ldns-compare-zones.c b/examples/ldns-compare-zones.c
index 663b744a..084b8011 100644
--- a/examples/ldns-compare-zones.c
+++ b/examples/ldns-compare-zones.c
@@ -33,6 +33,8 @@ usage(char *prog)
printf(" -a - print all differences (-i -d -c)\n");
printf(" -s - do not exclude SOA record from comparison\n");
printf(" -z - do not sort zones\n");
+ pritnf(" -h - show usage and exit\n");
+ printf(" -v - show the version and exit\n");
}
int
diff --git a/examples/ldns-key2ds.1 b/examples/ldns-key2ds.1
index 6fdbee5f..a20ab96f 100644
--- a/examples/ldns-key2ds.1
+++ b/examples/ldns-key2ds.1
@@ -17,6 +17,10 @@ SHA1 for RSASHA1, and so on.
.SH OPTIONS
.TP
+\fB-f\fR
+Ignore SEP flag (i.e. make DS records for any key)
+
+.TP
\fB-n\fR
Write the result DS Resource Record to stdout instead of a file
diff --git a/examples/ldns-keygen.c b/examples/ldns-keygen.c
index 767d7792..316d60d7 100644
--- a/examples/ldns-keygen.c
+++ b/examples/ldns-keygen.c
@@ -71,7 +71,7 @@ main(int argc, char *argv[])
random = NULL;
ksk = false; /* don't create a ksk per default */
- while ((c = getopt(argc, argv, "a:kb:r:v25")) != -1) {
+ while ((c = getopt(argc, argv, "a:kb:r:v")) != -1) {
switch (c) {
case 'a':
if (algorithm != 0) {
diff --git a/examples/ldns-read-zone.1 b/examples/ldns-read-zone.1
index 68d71708..8652fe9a 100644
--- a/examples/ldns-read-zone.1
+++ b/examples/ldns-read-zone.1
@@ -22,6 +22,10 @@ that is not of type NSEC, NSEC3, RRSIG or DNSKEY. DS records are not
printed.
.TP
+\fB-b\fR
+Include Bubble Babble encoding of DS's.
+
+.TP
\fB-0\fR
Print a (null) for the RRSIG inception, expiry and key data. This option
can be used when comparing different signing systems that use the same
diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c
index 2793a79a..512621d3 100644
--- a/examples/ldns-read-zone.c
+++ b/examples/ldns-read-zone.c
@@ -20,7 +20,7 @@ void print_usage(const char* progname)
printf("Usage: %s [OPTIONS] <zonefile>\n", progname);
printf("\tReads the zonefile and prints it.\n");
printf("\tThe RR count of the zone is printed to stderr.\n");
- printf("\t-b include bubblebabble of DS's.\n");
+ printf("\t-b include Bubble Babble encoding of DS's.\n");
printf("\t-0 zeroize timestamps and signature in RRSIG records.\n");
printf("\t-c canonicalize all rrs in the zone.\n");
printf("\t-d only show DNSSEC data from the zone\n");
diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c
index 349cdb9b..ffdd3c03 100644
--- a/examples/ldns-signzone.c
+++ b/examples/ldns-signzone.c
@@ -378,7 +378,7 @@ main(int argc, char *argv[])
OPENSSL_config(NULL);
- while ((c = getopt(argc, argv, "a:bde:f:i:k:lno:ps:t:vAE:K:")) != -1) {
+ while ((c = getopt(argc, argv, "a:bde:f:i:k:no:ps:t:vAE:K:")) != -1) {
switch (c) {
case 'a':
nsec3_algorithm = (uint8_t) atoi(optarg);
diff --git a/examples/ldns-walk.1 b/examples/ldns-walk.1
index c8ace40e..d4d1b6e7 100644
--- a/examples/ldns-walk.1
+++ b/examples/ldns-walk.1
@@ -22,6 +22,14 @@ Of course the nameserver that is used must be DNSSEC-aware.
.SH OPTIONS
.TP
+\fB-4\fR
+Use only IPv4.
+
+.TP
+\fB-6\fR
+Use only IPv6.
+
+.TP
\fB-f\fR
Do a 'full' zone walk; by default, ldns-walk will only show the names, and types present at those names. If this option is given, all resource records will be printed.
@@ -31,6 +39,10 @@ Start the walk with this owner name. Useful when continuing the walk for a
large zone.
.TP
+\fB-v\fR \fIverbosity\fR
+Verbosity level [1-5].
+
+.TP
\fB@\fR \fInameserver\fR
Send the queries to this nameserver.
diff --git a/examples/ldns-zcat.1 b/examples/ldns-zcat.1
index 9c4054df..4fd7ba6d 100644
--- a/examples/ldns-zcat.1
+++ b/examples/ldns-zcat.1
@@ -18,6 +18,10 @@ The resulted zone file is printed to standard output.
.B -o ORIGIN
use ORIGIN when reading in the zone
+.TP
+.B -v
+show the version number and exit
+
.SH AUTHOR
Written by the ldns team as an example for ldns usage.
diff --git a/examples/ldns-zcat.c b/examples/ldns-zcat.c
index 0f1b210a..017e632c 100644
--- a/examples/ldns-zcat.c
+++ b/examples/ldns-zcat.c
@@ -54,7 +54,7 @@ main(int argc, char **argv)
progname = strdup(argv[0]);
origin = NULL;
- while ((c = getopt(argc, argv, "n:o:v")) != -1) {
+ while ((c = getopt(argc, argv, "o:v")) != -1) {
switch(c) {
case 'o':
origin = ldns_dname_new_frm_str(strdup(optarg));
diff --git a/examples/ldns-zsplit.1 b/examples/ldns-zsplit.1
index 8e64668f..02dce404 100644
--- a/examples/ldns-zsplit.1
+++ b/examples/ldns-zsplit.1
@@ -27,6 +27,10 @@ use ORIGIN as origin when reading the zonefile.
.B -z
Sort the zone before splitting.
+.TP
+.B -v
+Show version number and exit.
+
.SH AUTHOR
Written by the ldns team as an example for ldns usage.