diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/keyedit.c | 36 |
2 files changed, 25 insertions, 17 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 74142c937..a27c70901 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2005-07-22 David Shaw <[email protected]> + + * keyedit.c (sign_uids): Don't prompt for setting signature expiry + to match key expiry unless --ask-cert-expire is set. Suggested by + Peter Palfrader. + 2005-07-22 Werner Koch <[email protected]> * g10.c, options.h: New option --exit-on-status-write-error. diff --git a/g10/keyedit.c b/g10/keyedit.c index c0587473c..c62e2e378 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -835,28 +835,30 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified, } else { - char *answer; - tty_printf(_("This key is due to expire on %s.\n"), expirestr_from_pk(primary_pk)); - answer=cpr_get("sign_uid.expire", - _("Do you want your signature to " - "expire at the same time? (Y/n) ")); - if(answer_is_yes_no_default(answer,1)) + if(opt.ask_cert_expire) { - /* This fixes the signature timestamp we're going - to make as now. This is so the expiration date - is exactly correct, and not a few seconds off - (due to the time it takes to answer the - questions, enter the passphrase, etc). */ - timestamp=now; - duration=primary_pk->expiredate-now; - force_v4=1; - } + char *answer=cpr_get("sign_uid.expire", + _("Do you want your signature to " + "expire at the same time? (Y/n) ")); + if(answer_is_yes_no_default(answer,1)) + { + /* This fixes the signature timestamp we're + going to make as now. This is so the + expiration date is exactly correct, and not + a few seconds off (due to the time it takes + to answer the questions, enter the + passphrase, etc). */ + timestamp=now; + duration=primary_pk->expiredate-now; + force_v4=1; + } - cpr_kill_prompt(); - m_free(answer); + cpr_kill_prompt(); + m_free(answer); + } } } |