bugfix #505: Manpage and usage output fixes

(Thanks Tomas Hozza)

diff --git a/Changelog b/Changelog
index 68dba6a8d48c4a65d64ddd309d17e6a826f6d1ac..b201c9e2bbdd6092db55bf278ef62704fc063081 100644 (file)
--- 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 663b744acc57ffe407aae241f86e1e0da774552f..084b8011736d36a9ceea8060f58ff86e60391283 100644 (file)
--- 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 6fdbee5f1a3f613f5ec51e668fcca76fbc5bb955..a20ab96fb475d5fc067809ead1e0b69d86e2d865 100644 (file)
--- a/examples/ldns-key2ds.1
+++ b/examples/ldns-key2ds.1
@@ -16,6 +16,10 @@ By default it takes a pick of algorithm similar to the key algorithm,
 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 767d779250c5f3258c0b1ac089bc555c3fef59b8..316d60d77740d4ed1e6ce3d5d7220607b37a502b 100644 (file)
--- 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 68d717087abf13696e080f498c619f7007369eb1..8652fe9acd399c9d7d9d9c98c82d517526673627 100644 (file)
--- a/examples/ldns-read-zone.1
+++ b/examples/ldns-read-zone.1
@@ -21,6 +21,10 @@ Only print DNSSEC data from the zone. This option skips every record
 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

diff --git a/examples/ldns-read-zone.c b/examples/ldns-read-zone.c
index 2793a79aa88e61af0c96e53e92a528088e673953..512621d3fff60de0e66f58922b4d28a7f78524ae 100644 (file)
--- 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 349cdb9b61ff4bf4e37ddd085d451d678b3fbcdf..ffdd3c03cd24cb256ab6915a6836b1d858661631 100644 (file)
--- 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 c8ace40ec04bace359e2b0b61690973a6a931d9b..d4d1b6e79c17d155330ec99701982d96d0d8e0e3 100644 (file)
--- a/examples/ldns-walk.1
+++ b/examples/ldns-walk.1
@@ -21,6 +21,14 @@ authoritative nameserver directly (with the @ argument).
 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.
@@ -30,6 +38,10 @@ Do a 'full' zone walk; by default, ldns-walk will only show the names, and types
 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 9c4054df3cd3f5a7e8bf61e5d67bcc0f47b4ec15..4fd7ba6d7dbb2a79dc1e89b1460043e4e328c98c 100644 (file)
--- 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 0f1b210a6d011ad5cfdb78b2f1ef5210ea400da9..017e632ca077e740d08e59c1e89f500007444d97 100644 (file)
--- 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 8e64668fe2b6c3a6f3cf38f1eea7d59813957346..02dce404cfb89654cb467b287af4cc8739e3c4ab 100644 (file)
--- 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.