1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-26 20:31:06 +01:00
Daniel Kahn Gillmor c76117f8b0 gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
* g10/gpg.c: Add config options that should belong in scdaemon.conf
* g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.

--

In gpg2, the following options are only relevant for scdaemon:

 reader-port
 ctapi-driver
 pcsc-driver
 disable-ccid

but in gpg1, they are options for gpg itself.

Some users of gpg1 might have these options in their
~/.gnupg/gpg.conf, which causes gpg2 to fail hard if it reads that
config file.

gpg2 should not fail hard, though giving a warning (and suggesting a
move to scdaemon.conf) seems OK.

This patch does *not* reintroduce any documentation for these options
in gpg.texi, even to indicate that they are "dummy" options, since
scdaemon.texi contains the appropriate documentation.

Debian-bug-id: 762844

Program names factored out from obsolete_scdaemon_option to make
reuse without new translations easier. -wk

This is a backport of commit 371c2b14b0347209efd23b4e54e1981a12d7aeab
with parts of 20c6da50d4f6264d26d113d7de606971f719a0ca but without those
which would change existing translated strings. -wk
2014-09-25 22:28:36 +02:00
..
2009-12-21 16:19:09 +00:00
2009-09-03 11:29:25 +00:00
2007-07-04 19:49:40 +00:00
2007-07-04 19:49:40 +00:00
2007-07-04 19:49:40 +00:00
2007-07-04 19:49:40 +00:00
2009-12-21 16:19:09 +00:00
2011-07-01 10:33:43 +02:00
2009-07-20 11:02:20 +00:00
2007-07-04 19:49:40 +00:00
2014-06-02 17:33:18 +02:00
2009-09-03 20:51:55 +00:00
2007-07-04 19:49:40 +00:00
2010-05-12 10:53:02 +00:00
2007-07-04 19:49:40 +00:00
2009-06-05 14:11:03 +00:00
2008-12-12 12:01:20 +00:00
2008-12-12 08:54:50 +00:00
2009-06-05 14:11:03 +00:00
2009-05-26 09:29:02 +00:00