[Pkg-gnupg-commit] [gnupg2] 28/49: agent: Fix returning GPG_ERR_NOT_FOUND wrongly.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 3da47d19df89d302c0ea25921f4bd8ce55705afe
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>
    (cherry picked from commit 5e96fe72e477d09e35ccee48af0fd9ab2b3ae409)
---
 agent/learncard.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git