mirror of
git://git.gnupg.org/gnupg.git
synced 2025-03-24 22:09:57 +01:00
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.
This commit is contained in:
parent
54c54e2824
commit
e24e92d7e2
@ -139,8 +139,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…
x
Reference in New Issue
Block a user