security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* keyedit.c (sign_uids): Don't prompt for setting signature expiry to

Browse Source 
match key expiry unless --ask-cert-expire is set.  Suggested by Peter
Palfrader.
This commit is contained in:
David Shaw 2005-07-22 16:42:48 +00:00
parent 45bacc55da
commit 99c80f8c39
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2005-07-22 David Shaw <dshaw@jabberwocky.com>
* 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 <wk@g10code.com> 2005-07-22 Werner Koch <wk@g10code.com>
* g10.c, options.h: New option --exit-on-status-write-error. * g10.c, options.h: New option --exit-on-status-write-error.

18
g10/keyedit.c
View File

@ -835,21 +835,22 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
} }
else else
{ {
char *answer;
tty_printf(_("This key is due to expire on %s.\n"), tty_printf(_("This key is due to expire on %s.\n"),
expirestr_from_pk(primary_pk)); expirestr_from_pk(primary_pk));
answer=cpr_get("sign_uid.expire", if(opt.ask_cert_expire)
{
char *answer=cpr_get("sign_uid.expire",
_("Do you want your signature to " _("Do you want your signature to "
"expire at the same time? (Y/n) ")); "expire at the same time? (Y/n) "));
if(answer_is_yes_no_default(answer,1)) if(answer_is_yes_no_default(answer,1))
{ {
/* This fixes the signature timestamp we're going /* This fixes the signature timestamp we're
to make as now. This is so the expiration date going to make as now. This is so the
is exactly correct, and not a few seconds off expiration date is exactly correct, and not
(due to the time it takes to answer the a few seconds off (due to the time it takes
questions, enter the passphrase, etc). */ to answer the questions, enter the
passphrase, etc). */
timestamp=now; timestamp=now;
duration=primary_pk->expiredate-now; duration=primary_pk->expiredate-now;
force_v4=1; force_v4=1;
@ -859,6 +860,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
m_free(answer); m_free(answer);
} }
} }
}
/* Only ask for duration if we haven't already set it to match /* Only ask for duration if we haven't already set it to match
the expiration of the pk */ the expiration of the pk */