From 4262933ef6f7530b4ad55646250a6763de9bf103 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 4 Jun 2019 09:45:31 +0900
Subject: [PATCH] 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 <gniibe@fsij.org>
---
 doc/scdaemon.texi | 14 --------------
 scd/scdaemon.c    |  5 -----
 2 files changed, 19 deletions(-)

diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 0c984162c..575553f35 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -286,20 +286,6 @@ To get a list of available CCID readers you may use this command:
 @end smallexample
 @end cartouche
 
-@item --card-timeout @var{n}
-@opindex card-timeout
-If @var{n} is not 0 and no client is actively using the card, the card
-will be powered down after @var{n} seconds.  Powering down the card
-avoids a potential risk of damaging a card when used with certain
-cheap readers.  This also allows applications that are not aware of
-Scdaemon to access the card.  The disadvantage of using a card timeout
-is that accessing the card takes longer and that the user needs to
-enter the PIN again after the next power up.
-
-Note that with the current version of Scdaemon the card is powered
-down immediately at the next timer tick for any value of @var{n} other
-than 0.
-
 @item --enable-pinpad-varlen
 @opindex enable-pinpad-varlen
 Please specify this option when the card reader supports variable
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;