[git] GnuPG - branch, master, updated. gnupg-2.2.1-63-g5e96fe7

by NIIBE Yutaka cvs at cvs.gnupg.org
Thu Nov 2 08:46:27 CET 2017


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  5e96fe72e477d09e35ccee48af0fd9ab2b3ae409 (commit)
      from  fd3f5ca151b9440ade2fa4991b7cfb190e357893 (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 5e96fe72e477d09e35ccee48af0fd9ab2b3ae409
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Nov 2 16:23:10 2017 +0900

    agent: Fix returning GPG_ERR_NOT_FOUND wrongly.
    
    * agent/learncard.c (agent_handle_learn): Find SERIALNO.
    
    --
    
    Bug is: "gpg-connect-agent learn /bye" just fails wrongly.
    
    Fixes-commit: 8c8ce8711d9c938fcb982b0341e6b052742cb887
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/learncard.c b/agent/learncard.c
index e0c882a..abe1dd0 100644
--- a/agent/learncard.c
+++ b/agent/learncard.c
@@ -340,14 +340,12 @@ agent_handle_learn (ctrl_t ctrl, int send, void *assuan_context, int force)
     }
 
   /* Pass on all the collected status information. */
-  if (assuan_context)
+  for (sitem = sparm.info; sitem; sitem = sitem->next)
     {
-      for (sitem = sparm.info; sitem; sitem = sitem->next)
-        {
-          if (!strcmp (sitem->keyword, "SERIALNO"))
-            serialno = sitem->data;
-          assuan_write_status (assuan_context, sitem->keyword, sitem->data);
-        }
+      if (!strcmp (sitem->keyword, "SERIALNO"))
+        serialno = sitem->data;
+      if (assuan_context)
+        assuan_write_status (assuan_context, sitem->keyword, sitem->data);
     }
 
   if (!serialno)

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

Summary of changes:
 agent/learncard.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)


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




More information about the Gnupg-commits mailing list