diff options
| author | NIIBE Yutaka <[email protected]> | 2019-06-04 00:45:31 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2019-06-04 00:47:14 +0000 |
| commit | 4262933ef6f7530b4ad55646250a6763de9bf103 (patch) | |
| tree | c5b430c949c2853b0e9f56c3a4f01cd26e7c5302 /scd/scdaemon.c | |
| parent | g10,agent: Support CONFIRM for --delete-key. (diff) | |
| download | gnupg-4262933ef6f7530b4ad55646250a6763de9bf103.tar.gz gnupg-4262933ef6f7530b4ad55646250a6763de9bf103.zip | |
scd: Remove unsupported --card-timeout option.
* doc/scdaemon.texi (card-timeout): Remove.
* scd/scdaemon.c (main): Remove oCardTimeout handling.
--
There was the card-timeout option in GnuPG 2.0, but it was never
implemented correctly. The intention of this option was to allow
sharing smartcard among multiple applications, but this didn't work
well as user's expectation (it only worked with DISCONNECT command).
This is because other parts of scdaemon assumes exclusive access. In
GnuPG 2.1, the support of the option was removed, improving
"DISCONNECT" command always works well without this option.
GnuPG-bug-id: 3383
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/scdaemon.c')
| -rw-r--r-- | scd/scdaemon.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 42efb4c37..12eff755b 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -89,7 +89,6 @@ enum cmd_and_opt_values oDaemon, oBatch, oReaderPort, - oCardTimeout, octapiDriver, opcscDriver, oDisableCCID, @@ -144,8 +143,6 @@ static ARGPARSE_OPTS opts[] = { "@" #endif /* 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")), @@ -614,8 +611,6 @@ main (int argc, char **argv ) break; case oDenyAdmin: opt.allow_admin = 0; break; - case oCardTimeout: opt.card_timeout = pargs.r.ret_ulong; break; - case oDisableApplication: add_to_strlist (&opt.disabled_applications, pargs.r.ret_str); break; |