diff options
| author | David Shaw <[email protected]> | 2003-08-26 04:07:52 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-26 04:07:52 +0000 |
| commit | 2d682ddc0055910fff49a2ba10f445d8cdf4e86f (patch) | |
| tree | 82a960657656a09662e344378c8b606137283fb8 | |
| parent | * mainproc.c (check_sig_and_print): Use two different preferred keyserver (diff) | |
| download | gnupg-2d682ddc0055910fff49a2ba10f445d8cdf4e86f.tar.gz gnupg-2d682ddc0055910fff49a2ba10f445d8cdf4e86f.zip | |
* options.h, g10.c (main): Add list-option list-preferred-keyserver.
* keyedit.c (change_passphrase): When responding 'no' to the blank
passphrase question, re-prompt for a new passphrase. This is bug #202.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/g10.c | 3 | ||||
| -rw-r--r-- | g10/keyedit.c | 4 | ||||
| -rw-r--r-- | g10/options.h | 15 |
4 files changed, 20 insertions, 9 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 8a6a15e21..293379620 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,12 @@ 2003-08-25 David Shaw <[email protected]> + * options.h, g10.c (main): Add list-option + list-preferred-keyserver. + + * keyedit.c (change_passphrase): When responding 'no' to the blank + passphrase question, re-prompt for a new passphrase. This is bug + #202. + * mainproc.c (check_sig_and_print): Use two different preferred keyserver displays - one if the key is not present (to tell the user where to get the key), the other if it is present (to tell @@ -1761,9 +1761,10 @@ main( int argc, char **argv ) {"show-photos",LIST_SHOW_PHOTOS}, {"show-policy-url",LIST_SHOW_POLICY}, {"show-notation",LIST_SHOW_NOTATION}, - {"show-keyring",LIST_SHOW_KEYRING}, + {"show-preferred-keyserver",LIST_SHOW_KEYSERVER}, {"show-validity",LIST_SHOW_VALIDITY}, {"show-long-keyid",LIST_SHOW_LONG_KEYID}, + {"show-keyring",LIST_SHOW_KEYRING}, {"show-sig-expire",LIST_SHOW_SIG_EXPIRE}, {NULL,0} }; diff --git a/g10/keyedit.c b/g10/keyedit.c index 42ece5496..7b696c53b 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1003,8 +1003,10 @@ change_passphrase( KBNODE keyblock ) " this is probably a *bad* idea!\n\n")); if( cpr_get_answer_is_yes("change_passwd.empty.okay", _("Do you really want to do this? "))) + { changed++; - break; + break; + } } else { /* okay */ rc = 0; diff --git a/g10/options.h b/g10/options.h index e24337117..91855bab6 100644 --- a/g10/options.h +++ b/g10/options.h @@ -228,13 +228,14 @@ struct { #define EXPORT_INCLUDE_ATTRIBUTES 4 #define EXPORT_INCLUDE_SENSITIVE_REVKEYS 8 -#define LIST_SHOW_PHOTOS 1 -#define LIST_SHOW_POLICY 2 -#define LIST_SHOW_NOTATION 4 -#define LIST_SHOW_KEYRING 8 -#define LIST_SHOW_VALIDITY 16 -#define LIST_SHOW_LONG_KEYID 32 -#define LIST_SHOW_SIG_EXPIRE 64 +#define LIST_SHOW_PHOTOS 1 +#define LIST_SHOW_POLICY 2 +#define LIST_SHOW_NOTATION 4 +#define LIST_SHOW_KEYSERVER 8 +#define LIST_SHOW_VALIDITY 16 +#define LIST_SHOW_LONG_KEYID 32 +#define LIST_SHOW_KEYRING 64 +#define LIST_SHOW_SIG_EXPIRE 128 #define VERIFY_SHOW_PHOTOS 1 #define VERIFY_SHOW_POLICY 2 |