mirror of git://git.gnupg.org/gnupg.git
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 e24e92d7e2
)
This commit is contained in:
parent
8fc9de8d6b
commit
d2a6be24af
|
@ -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")),
|
||||
|
|
Loading…
Reference in New Issue