diff options
| author | Werner Koch <wk@gnupg.org> | 2013-04-18 14:40:43 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-03-07 08:53:11 +0100 |
| commit | d2a6be24af0bf220bb448fdd50c0196faddee0f4 (patch) | |
| tree | 82d2c681eb8e753c96c2fb1aa9ff37dd23f3709b /scd | |
| parent | Allow marking options as ignored. (diff) | |
| download | gnupg2-d2a6be24af0bf220bb448fdd50c0196faddee0f4.tar.xz gnupg2-d2a6be24af0bf220bb448fdd50c0196faddee0f4.zip | |
Ignore obsolete option --disable-keypad.
* scd/scdaemon.c (opts): Ignore --disable-keypad.
--
The renaming of --disable-keypad to --disable-pinpad might mess up
configuration files managed with a GUI. The GUI does not not anymore
know about the old option and would allow the user to switch
"disable-pinpad" on. However, a "disable-keypad" might still linger
in the conf file with gpgconf not knowing about it. Thus the conf
file would always be rejected and manual intervention would be
required. Ignoring the old option nicely solves the problem.
(cherry picked from commit e24e92d7e244edd578c0c1f0fba6e0070cb5f104)
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/scdaemon.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c index daa4eeab3..982c52fec 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -144,8 +144,11 @@ static ARGPARSE_OPTS opts[] = { /* end --disable-ccid */), ARGPARSE_s_u (oCardTimeout, "card-timeout", N_("|N|disconnect the card after N seconds of inactivity")), + ARGPARSE_s_n (oDisablePinpad, "disable-pinpad", N_("do not use a reader's pinpad")), + ARGPARSE_ignore (300, "disable-keypad"), + ARGPARSE_s_n (oAllowAdmin, "allow-admin", "@"), ARGPARSE_s_n (oDenyAdmin, "deny-admin", N_("deny the use of admin card commands")), |