Home GnuPG
Diffusion GnuPG c76117f8b016

gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
c76117f8b016Unpublished

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

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.

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

Details

Provenance
dkgAuthored on Sep 25 2014, 8:45 PM
wernerCommitted on Sep 25 2014, 10:28 PM
Parents
rG07006c9916ea: gpg: Need to init the trustdb for import.
Branches
Unknown
Tags
Unknown

Event Timeline

Werner Koch <wk@gnupg.org> committed rGc76117f8b016: gpg: Warn about (but don't fail) on scdaemon options in gpg.conf. (authored by Daniel Kahn Gillmor <dkg@fifthhorseman.net>).Sep 25 2014, 10:28 PM