[git] GnuPG - branch, master, updated. gnupg-2.1.17-41-g858e14c

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  858e14cd794e2a6125d51e652a754bbe26def997 (commit)
      from  62268a2732dddca7a05ca4cf45d0e4338c7dc3c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 scd/apdu.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org