[Pkg-gnupg-commit] [gnupg2] 41/116: scd: Fix for --disable-ccid for scdaemon.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Tue Jan 24 04:40:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 858e14cd794e2a6125d51e652a754bbe26def997
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Fri Jan 6 10:35:46 2017 +0900
scd: Fix for --disable-ccid for scdaemon.
* scd/apdu.c (apdu_dev_list_finish): Don't call ccid_dev_scan_finish
with no table.
(apdu_open_reader): Only increment when it's zero.
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
scd/apdu.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/scd/apdu.c b/scd/apdu.c
index db46c4d..38ebd2b 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2974,7 +2974,8 @@ void
apdu_dev_list_finish (struct dev_list *dl)
{
#ifdef HAVE_LIBUSB
- ccid_dev_scan_finish (dl->ccid_table, dl->idx_max);
+ if (dl->ccid_table)
+ ccid_dev_scan_finish (dl->ccid_table, dl->idx_max);
#endif
xfree (dl);
npth_mutex_unlock (&reader_table_lock);
@@ -3195,15 +3196,15 @@ apdu_open_reader (struct dev_list *dl)
else
#endif
{ /* PC/SC readers. */
- if (dl->idx++ == 0)
- slot = apdu_open_one_reader (dl->portstr);
+ if (dl->idx == 0)
+ {
+ dl->idx++;
+ slot = apdu_open_one_reader (dl->portstr);
+ }
else
slot = -1;
}
- if (DBG_READER)
- log_debug ("leave: apdu_open_reader => slot=%d [ccid]\n", slot);
-
return slot;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list