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

Ignore some GnuPG-2 only options.

Browse Source
This commit is contained in:
Werner Koch 2010-06-01 12:13:31 +00:00
parent 198c5c5587
commit 9017b84423
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -3,6 +3,7 @@ Noteworthy changes in version 1.4.11
* Bug fixes. * Bug fixes.
Noteworthy changes in version 1.4.10 (2009-09-02) Noteworthy changes in version 1.4.10 (2009-09-02)
------------------------------------------------- -------------------------------------------------

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-01 Werner Koch <wk@g10code.com>
* gpg.c (main): Add dummy option --debug-level and ignore
--log-file if a socket prefix is given.
2010-05-12 Werner Koch <wk@g10code.com> 2010-05-12 Werner Koch <wk@g10code.com>
* armor.c (radix64_read): Change fix 2006-04-08 to fix bug#1179. * armor.c (radix64_read): Change fix 2006-04-08 to fix bug#1179.

9
g10/gpg.c
View File

@ -188,6 +188,7 @@ enum cmd_and_opt_values
oOptions, oOptions,
oDebug, oDebug,
oDebugAll, oDebugAll,
oDebugLevel,
oDebugCCIDDriver, oDebugCCIDDriver,
oStatusFD, oStatusFD,
oStatusFile, oStatusFile,
@ -513,6 +514,7 @@ static ARGPARSE_OPTS opts[] = {
{ oOptions, "options", 2, "@"}, { oOptions, "options", 2, "@"},
{ oDebug, "debug" ,4|16, "@"}, { oDebug, "debug" ,4|16, "@"},
{ oDebugAll, "debug-all" ,0, "@"}, { oDebugAll, "debug-all" ,0, "@"},
{ oDebugLevel, "debug-level" ,0, "@"},
{ oStatusFD, "status-fd" ,1, "@"}, { oStatusFD, "status-fd" ,1, "@"},
{ oStatusFile, "status-file" ,2, "@"}, { oStatusFile, "status-file" ,2, "@"},
{ oAttributeFD, "attribute-fd" ,1, "@" }, { oAttributeFD, "attribute-fd" ,1, "@" },
@ -2202,6 +2204,7 @@ main (int argc, char **argv )
break; break;
case oDebug: opt.debug |= pargs.r.ret_ulong; break; case oDebug: opt.debug |= pargs.r.ret_ulong; break;
case oDebugAll: opt.debug = ~0; break; case oDebugAll: opt.debug = ~0; break;
case oDebugLevel: break; /* Not supported. */
case oDebugCCIDDriver: case oDebugCCIDDriver:
#if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB) #if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
ccid_set_debug_level (ccid_set_debug_level (1)+1); ccid_set_debug_level (ccid_set_debug_level (1)+1);
@ -2224,7 +2227,11 @@ main (int argc, char **argv )
iobuf_translate_file_handle (pargs.r.ret_int, 1)); iobuf_translate_file_handle (pargs.r.ret_int, 1));
break; break;
case oLoggerFile: case oLoggerFile:
log_set_logfile( NULL, open_info_file (pargs.r.ret_str, 1) ); /* Our log code does not support the socket feature. Thus
we ignore such log files to avoid problems with
gpg.conf files which are also used by gpg2. */
if (strncmp (pargs.r.ret_str, "socket://", 9))
log_set_logfile( NULL, open_info_file (pargs.r.ret_str, 1) );
break; break;
case oWithFingerprint: case oWithFingerprint: