From 823afda92eaf2d0a0129cdf35a791a89b1af6382 Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Fri, 7 Feb 2014 11:12:25 +0100 Subject: [PATCH] more help for subject, and generate man page from detailed-help --- Makefile.am | 1 + cmdline.ggo | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index c9a89c7..ae07240 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ yubico-piv-tool.1: $(yubico_piv_tool_SOURCES) \ $(top_srcdir)/configure.ac $(HELP2MAN) --no-info \ --name="Yubico PIV tool" \ + --help-option="--detailed-help" \ --output=$@ $(top_builddir)/yubico-piv-tool$(EXEEXT) # Maintainer rules. diff --git a/cmdline.ggo b/cmdline.ggo index ccb1676..103bfe2 100644 --- a/cmdline.ggo +++ b/cmdline.ggo @@ -31,11 +31,12 @@ option "action" a "Action to take" values="version","generate","set-mgm-key","re option "slot" s "What key slot to operate on" values="9a","9c","9d","9e" enum optional option "algorithm" A "What algorithm to use" values="RSA1024","RSA2048","ECCP256" enum optional default="RSA2048" option "new-key" n "New authentication key to use" string optional -option "pin-retries" - "Number of retries before the pin code is blocked" int optional -option "puk-retries" - "Number of retries before the puk code is blocked" int optional +option "pin-retries" - "Number of retries before the pin code is blocked" int optional dependon="puk-retries" +option "puk-retries" - "Number of retries before the puk code is blocked" int optional dependon="pin-retries" option "input" i "Filename to use as input, - for stdin" string optional default="-" option "output" o "Filename to use as output, - for stdout" string optional default="-" option "key-format" K "Format of the key being read/written" values="PEM","PKCS12" enum optional default="PEM" option "password" p "Password for decryption of private key file" string optional option "subject" S "The subject to use for certificate request" string optional + details="The subject must be written as /CN=host.example.com/OU=test/O=example.com/\n" option "pin" P "Pin code for verification" string optional