From 17404b2fccbc74c4f0b2364cc08e9dcc64175cf8 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 23 Jul 2014 12:18:19 +0200 Subject: [PATCH] gpg: Make --quick-sign-key promote local key signatures. * g10/keyedit.c (sign_uids): Promote local sigs in quick mode. --- doc/gpg.texi | 4 +++- g10/keyedit.c | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/gpg.texi b/doc/gpg.texi index 5efc16e86..3370ff2c4 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -932,7 +932,9 @@ interaction. The @code{fpr} must be the verified primary fingerprint of a key in the local keyring. If no @code{names} are given, all useful user ids are signed; with given [@code{names}] only useful user ids matching one of theses names are signed. The command -@option{--quick-lsign-key} marks the signatures as non-exportable. +@option{--quick-lsign-key} marks the signatures as non-exportable. If +such a non-exportable signature already exists the +@option{--quick-sign-key} turns it into a exportable signature. This command uses reasonable defaults and thus does not provide the full flexibility of the "sign" subcommand from @option{--edit-key}. diff --git a/g10/keyedit.c b/g10/keyedit.c index a91beaf41..c5f02f7b6 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -767,9 +767,7 @@ sign_uids (estream_t fp, tty_fprintf (fp, _("Your current signature on \"%s\"\n" "is a local signature.\n"), user); - if (quick) - ; - else if (cpr_get_answer_is_yes + if (quick || cpr_get_answer_is_yes ("sign_uid.local_promote_okay", _("Do you want to promote " "it to a full exportable " "signature? (y/N) ")))