diff options
| author | NIIBE Yutaka <[email protected]> | 2012-12-04 05:37:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-12-04 09:48:20 +0000 |
| commit | 1e1326aeb8923782138e133f091afec41d969c40 (patch) | |
| tree | fddf46b54ec4bfb1c7fdd2ce318dafd86aa36bd2 /scd/apdu.h | |
| parent | Don't keep opening unavailable card reader. (diff) | |
| download | gnupg-1e1326aeb8923782138e133f091afec41d969c40.tar.gz gnupg-1e1326aeb8923782138e133f091afec41d969c40.zip | |
Revert SCD changes of 2010-05-03.
* scd/apdu.c (pcsc_no_service): Remove.
(open_pcsc_reader_direct, open_pcsc_reader_wrapped): Remove
pcsc_no_service support.
(apdu_open_reader): Remove R_NO_SERVICE.
* scd/apdu.h (apdu_open_reader): Remove R_NO_SERVICE.
* scd/command.c (reader_disabled): Remove.
(get_current_reader): Follow the change of R_NO_SERVICE.
(open_card, cmd_serialno, scd_command_handler): Remove reader_disabled
support.
* scd/sc-copykeys.c (main): Follow the change of R_NO_SERVICE.
--
Daemon should handle all possible cases. Even if such a difficult
case like reader_disabled, it should not exit.
Diffstat (limited to 'scd/apdu.h')
| -rw-r--r-- | scd/apdu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/apdu.h b/scd/apdu.h index 75025469e..bf5534634 100644 --- a/scd/apdu.h +++ b/scd/apdu.h @@ -84,7 +84,7 @@ enum { /* Note, that apdu_open_reader returns no status word but -1 on error. */ -int apdu_open_reader (const char *portstr, int *r_no_service); +int apdu_open_reader (const char *portstr); int apdu_open_remote_reader (const char *portstr, const unsigned char *cookie, size_t length, int (*readfnc) (void *opaque, |