[git] GnuPG - branch, master, updated. gnupg-2.2.7-333-g54f88af

[by Werner Koch]

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  54f88afba4564e62e51fe6e22beabbdee75f91ac (commit)
      from  ec13b1c562e34c0fcbc7b848ab6dc187b79cf2c1 (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 54f88afba4564e62e51fe6e22beabbdee75f91ac
Author: Werner Koch <wk at gnupg.org>
Date:   Sat Jan 26 23:17:54 2019 +0100

    gpg: Fix just changed agent_get_s2k_count.
    
    * g10/call-agent.c (agent_get_s2k_count): Actually return the count.
    --
    
    The previous push was definitely a bit to hasty.
    Fixes-Commit: ec13b1c562e34c0fcbc7b848ab6dc187b79cf2c1
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/call-agent.c b/g10/call-agent.c
index 91af2be..8377753 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -1502,10 +1502,10 @@ agent_get_s2k_count (void)
         log_error (_("problem with the agent: %s\n"), gpg_strerror (err));
 
       /* Default to 65536 which was used up to 2.0.13.  */
-      return 65536;
+      count = 65536;
     }
 
-  return err;
+  return count;
 }
 
 

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

Summary of changes:
 g10/call-agent.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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