diff options
| author | NIIBE Yutaka <[email protected]> | 2019-06-06 00:55:10 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2019-06-06 00:55:10 +0000 |
| commit | 72fe8d652fce6cb9104bb07ef0fb811cbab3303a (patch) | |
| tree | 8027c2f0b21018a067bba2a6728b720671707a65 | |
| parent | gpgparsemail: Die on parse error (not abort). (diff) | |
| download | gnupg-72fe8d652fce6cb9104bb07ef0fb811cbab3303a.tar.gz gnupg-72fe8d652fce6cb9104bb07ef0fb811cbab3303a.zip | |
scd: Bring back --card-timeout option as deprecated.
* doc/scdaemon.texi (card-timeout): Add.
* scd/scdaemon.c (main): Revert the change.
--
GnuPG-bug-id: 3383
Fixes-commit: 4262933ef6f7530b4ad55646250a6763de9bf103
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | doc/scdaemon.texi | 6 | ||||
| -rw-r--r-- | scd/scdaemon.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi index 575553f35..21c3fd826 100644 --- a/doc/scdaemon.texi +++ b/doc/scdaemon.texi @@ -286,6 +286,12 @@ 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 +This option is deprecated. In GnuPG 2.0, it used to be used for +DISCONNECT command to control timing issue. Since DISCONNECT command +works synchronously, it has no effect. + @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 12eff755b..42efb4c37 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -89,6 +89,7 @@ enum cmd_and_opt_values oDaemon, oBatch, oReaderPort, + oCardTimeout, octapiDriver, opcscDriver, oDisableCCID, @@ -143,6 +144,8 @@ 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")), @@ -611,6 +614,8 @@ 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; |