diff options
| author | Werner Koch <[email protected]> | 2013-04-18 12:40:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-04-22 13:19:38 +0000 |
| commit | e24e92d7e244edd578c0c1f0fba6e0070cb5f104 (patch) | |
| tree | 5dadaed10a4db11668cd225c5a9456b2381286bb | |
| parent | Allow marking options as ignored. (diff) | |
| download | gnupg-e24e92d7e244edd578c0c1f0fba6e0070cb5f104.tar.gz gnupg-e24e92d7e244edd578c0c1f0fba6e0070cb5f104.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.
| -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 c0dd97537..5f6452114 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -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")), |