aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-01-26 22:17:54 +0000
committerWerner Koch <[email protected]>2019-01-26 22:17:54 +0000
commit54f88afba4564e62e51fe6e22beabbdee75f91ac (patch)
treec2b8be13fed1568b4c99bb845e22df1c805173d0
parentgpg: Move S2K encoding function to a shared file. (diff)
downloadgnupg-54f88afba4564e62e51fe6e22beabbdee75f91ac.tar.gz
gnupg-54f88afba4564e62e51fe6e22beabbdee75f91ac.zip
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 <[email protected]>
-rw-r--r--g10/call-agent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 91af2be39..83777534e 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;
}