mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* 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.
This commit is contained in:
parent
84bd068355
commit
5d98f7afe5
6 changed files with 48 additions and 30 deletions
14
g10/g10.c
14
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");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue