aboutsummaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog5
-rw-r--r--sm/gpgsm.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index a364e3b48..c4d1eec6d 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-31 Werner Koch <[email protected]>
+
+ * gpgsm.c (main): Let --gen-key print a more informative error
+ message.
+
2007-01-25 Werner Koch <[email protected]>
* Makefile.am (gpgsm_LDADD): Add LIBICONV. Noted by Billy Halsey.
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 35dc921e7..9557ffbb9 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -253,7 +253,7 @@ static ARGPARSE_OPTS opts[] = {
{ aListSecretKeys, "list-secret-keys", 256, N_("list secret keys")},
{ aListChain, "list-chain", 256, N_("list certificate chain")},
{ oFingerprint, "fingerprint", 256, N_("list keys and fingerprints")},
- { aKeygen, "gen-key", 256, N_("generate a new key pair")},
+ { aKeygen, "gen-key", 256, "@" },
{ aDeleteKey, "delete-key",256, N_("remove key from the public keyring")},
{ aSendKeys, "send-keys" , 256, N_("export keys to a key server") },
{ aRecvKeys, "recv-keys" , 256, N_("import keys from a key server") },
@@ -1596,8 +1596,11 @@ main ( int argc, char **argv)
break;
- case aKeygen: /* generate a key */
- log_error ("this function is not yet available from the commandline\n");
+ case aKeygen: /* Generate a key; well kind of. */
+ log_error
+ (_("key generation is not available from the commandline\n"));
+ log_info (_("please use the script \"%s\" to generate a new key\n"),
+ "gpgsm-gencert.sh");
break;
case aImport: