Bug 841788 - nss-tools certutil -H does not list all options, misses -F, r=kaie

1 files changed, 21 insertions, 0 deletions

diff --git a/cmd/certutil/certutil.c b/cmd/certutil/certutil.c
index eb557034c..05ca7eb82 100644
--- a/cmd/certutil/certutil.c
+++ b/cmd/certutil/certutil.c
@@ -962,6 +962,8 @@ PrintSyntax(char *progName)
     FPS "\t%s -D -n cert-name [-d certdir] [-P dbprefix]\n", progName);
     FPS "\t%s -E -n cert-name -t trustargs [-d certdir] [-P dbprefix] [-a] [-i input]\n", 
 	progName);
+    FPS "\t%s -F -n nickname [-d certdir] [-P dbprefix]\n", 
+	progName);
     FPS "\t%s -G -n key-name [-h token-name] [-k rsa] [-g key-size] [-y exp]\n" 
 	"\t\t [-f pwfile] [-z noisefile] [-d certdir] [-P dbprefix]\n", progName);
     FPS "\t%s -G [-h token-name] -k dsa [-q pqgfile -g key-size] [-f pwfile]\n"
@@ -1221,6 +1223,24 @@ static void luD(enum usage_level ul, const char *command)
 
 }
 
+static void luF(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "F"));
+    if (ul == usage_all || !command || is_my_command)
+    FPS "%-15s Delete a key from the database\n",
+        "-F");
+    if (ul == usage_selected && !is_my_command)
+        return;
+    FPS "%-20s The nickname of the key to delete\n",
+        "   -n cert-name");
+    FPS "%-20s Cert database directory (default is ~/.netscape)\n",
+        "   -d certdir");
+    FPS "%-20s Cert & Key database prefix\n",
+        "   -P dbprefix");
+    FPS "\n");
+
+}
+
 static void luU(enum usage_level ul, const char *command)
 {
     int is_my_command = (command && 0 == strcmp(command, "U"));
@@ -1608,6 +1628,7 @@ static void LongUsage(char *progName, enum usage_level ul, const char *command)
     luC(ul, command);
     luG(ul, command);
     luD(ul, command);
+    luF(ul, command);
     luU(ul, command);
     luK(ul, command);
     luL(ul, command);