aboutsummaryrefslogtreecommitdiffstats
path: root/g10/g10.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-08-26 04:07:52 +0000
committerDavid Shaw <[email protected]>2003-08-26 04:07:52 +0000
commit2d682ddc0055910fff49a2ba10f445d8cdf4e86f (patch)
tree82a960657656a09662e344378c8b606137283fb8 /g10/g10.c
parent* mainproc.c (check_sig_and_print): Use two different preferred keyserver (diff)
downloadgnupg-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 'g10/g10.c')
-rw-r--r--g10/g10.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/g10.c b/g10/g10.c
index 7b5cfbc9b..01dc86fb6 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -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}
};