From 1e1326aeb8923782138e133f091afec41d969c40 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 4 Dec 2012 14:37:56 +0900 Subject: 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. --- scd/sc-copykeys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scd/sc-copykeys.c') diff --git a/scd/sc-copykeys.c b/scd/sc-copykeys.c index 0056dd79a..3f34d6983 100644 --- a/scd/sc-copykeys.c +++ b/scd/sc-copykeys.c @@ -139,7 +139,7 @@ main (int argc, char **argv ) if (argc != 1) usage (1); - slot = apdu_open_reader (reader_port, NULL); + slot = apdu_open_reader (reader_port); if (slot == -1) exit (1); if (apdu_connect (slot)) -- cgit v1.2.3