From 5d98f7afe503b10ad2d4d4d11d510b58fb001268 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sun, 8 Aug 2004 13:28:04 +0000 Subject: * plaintext.c (handle_plaintext): Bigger buffer for extra safety. * g10.c (main): New alias --throw-keyid for --throw-keyids, so that it continues to work in old configuration files. Noted by Jens Adam. * pkclist.c (algo_available): --pgp8 now allows blowfish, zlib, and bzip2. * status.c (do_get_from_fd): Flush stdout if status isn't flushing it for us. This guarantees that any menus that were displayed before the prompt don't get stuck in a buffer. Noted by Peter Palfrader. This is Debian bug #254072. * sign.c (update_keysig_packet): Revert change of 2004-05-18. It is not appropriate to strip policy and notations when remaking a sig. That should only happen when specifically requested by the user. --- g10/g10.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'g10/g10.c') diff --git a/g10/g10.c b/g10/g10.c index 4248a8514..6e3608851 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -242,8 +242,8 @@ enum cmd_and_opt_values oComment, oDefaultComment, oNoComments, - oThrowKeyid, - oNoThrowKeyid, + oThrowKeyids, + oNoThrowKeyids, oShowPhotos, oNoShowPhotos, oPhotoViewer, @@ -517,8 +517,10 @@ static ARGPARSE_OPTS opts[] = { { oDigestAlgo, "digest-algo", 2, "@"}, { oCertDigestAlgo, "cert-digest-algo", 2 , "@" }, { oCompressAlgo,"compress-algo", 2, "@"}, - { oThrowKeyid, "throw-keyids", 0, "@"}, - { oNoThrowKeyid, "no-throw-keyids", 0, "@" }, + { oThrowKeyids, "throw-keyid", 0, "@"}, + { oThrowKeyids, "throw-keyids", 0, "@"}, + { oNoThrowKeyids, "no-throw-keyid", 0, "@" }, + { oNoThrowKeyids, "no-throw-keyids", 0, "@" }, { oShowPhotos, "show-photos", 0, "@" }, { oNoShowPhotos, "no-show-photos", 0, "@" }, { oPhotoViewer, "photo-viewer", 2, "@" }, @@ -1977,8 +1979,8 @@ main( int argc, char **argv ) free_strlist(opt.comments); opt.comments=NULL; break; - case oThrowKeyid: opt.throw_keyid = 1; break; - case oNoThrowKeyid: opt.throw_keyid = 0; break; + case oThrowKeyids: opt.throw_keyid = 1; break; + case oNoThrowKeyids: opt.throw_keyid = 0; break; case oShowPhotos: deprecated_warning(configname,configlineno,"--show-photos", "--list-options ","show-photos"); -- cgit v1.2.3