security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-22 21:49:59 +01:00
Code Activity

Fix bug#1044.

Browse Source
This commit is contained in:
Werner Koch 2009-05-20 10:25:58 +00:00
parent 4694c1a8eb
commit d72349bde0
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2009-05-20 Werner Koch <wk@g10code.com>
* gpg.c (main): Fix --fingerprint/--with-fingerprint command
detection. Fixes bug#1044.
2009-05-11 Werner Koch <wk@g10code.com> 2009-05-11 Werner Koch <wk@g10code.com>
* apdu.c (send_le): Replace log_error by log_info. Fixes bug#1043. * apdu.c (send_le): Replace log_error by log_info. Fixes bug#1043.

20
g10/gpg.c
View File

@ -1859,7 +1859,7 @@ main (int argc, char **argv )
int eyes_only=0; int eyes_only=0;
int multifile=0; int multifile=0;
int pwfd = -1; int pwfd = -1;
int with_fpr = 0; /* make an option out of --fingerprint */ int fpr_maybe_cmd = 0; /* --fingerprint maybe a command. */
int any_explicit_recipient = 0; int any_explicit_recipient = 0;
int require_secmem=0,got_secmem=0; int require_secmem=0,got_secmem=0;
#ifdef USE_SHM_COPROCESSING #ifdef USE_SHM_COPROCESSING
@ -2228,8 +2228,13 @@ main (int argc, char **argv )
case oWithFingerprint: case oWithFingerprint:
opt.with_fingerprint = 1; opt.with_fingerprint = 1;
with_fpr=1; /*fall thru*/ opt.fingerprint++;
case oFingerprint: opt.fingerprint++; break; break;
case oFingerprint:
opt.fingerprint++;
fpr_maybe_cmd = 1;
break;
case oSecretKeyring: case oSecretKeyring:
append_to_strlist( &sec_nrings, pargs.r.ret_str); append_to_strlist( &sec_nrings, pargs.r.ret_str);
break; break;
@ -3268,9 +3273,12 @@ main (int argc, char **argv )
xfree(p); xfree(p);
} }
if( !cmd && opt.fingerprint && !with_fpr ) { /* If there is no command but the --fingerprint is given, default
set_cmd( &cmd, aListKeys); to the --list-keys command. */
} if (!cmd && fpr_maybe_cmd)
{
set_cmd (&cmd, aListKeys);
}
if( cmd == aKMode || cmd == aKModeC ) { /* kludge to be compatible to pgp */ if( cmd == aKMode || cmd == aKModeC ) { /* kludge to be compatible to pgp */
if( cmd == aKModeC ) { if( cmd == aKModeC ) {