aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-21 12:12:55 +0000
committerWerner Koch <[email protected]>2017-07-21 16:15:01 +0000
commitb55b72bb815ad5870456b89c3a011fa00991b4a8 (patch)
tree4655cfb4494e32382ddec9558bb43f22c2257190 /g10/gpg.c
parentgpg: Fix possible double free of the card serialno. (diff)
downloadgnupg-b55b72bb815ad5870456b89c3a011fa00991b4a8.tar.gz
gnupg-b55b72bb815ad5870456b89c3a011fa00991b4a8.zip
gpg: Extend --quick-set-expire to allow subkey expiration setting.
* g10/keyedit.c (keyedit_quick_set_expire): Add new arg subkeyfprs. (menu_expire): Rename arg force_mainkey to unattended and allow unattended changing of subkey expiration. * g10/gpg.c (main): Extend --quick-set-expire. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/gpg.c')
-rw-r--r--g10/gpg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 70b8011a5..e32e14a9d 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4491,11 +4491,11 @@ main (int argc, char **argv)
{
const char *x_fpr, *x_expire;
- if (argc != 2)
- wrong_args ("--quick-set-exipre FINGERPRINT EXPIRE");
+ if (argc < 2)
+ wrong_args ("--quick-set-exipre FINGERPRINT EXPIRE [SUBKEY-FPRS]");
x_fpr = *argv++; argc--;
x_expire = *argv++; argc--;
- keyedit_quick_set_expire (ctrl, x_fpr, x_expire);
+ keyedit_quick_set_expire (ctrl, x_fpr, x_expire, argv);
}
break;