aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-06-05 09:57:02 +0000
committerWerner Koch <[email protected]>2017-06-08 07:37:36 +0000
commit17e5afd80f247c356f03c71e8b61da424ffedabb (patch)
treea7fa72351c6212960376ba3b2c09025334246cd5
parentcommon: Add cipher mode to compliance predicate. (diff)
downloadgnupg-17e5afd80f247c356f03c71e8b61da424ffedabb.tar.gz
gnupg-17e5afd80f247c356f03c71e8b61da424ffedabb.zip
gpg: Avoid failure exit when scdaemon is disabled but not needed.
* g10/call-agent.c (warn_version_mismatch): Use log_info if error is "not supported". -- This fix may make the fix for GnuPG-bug-id: 3192 even more robust. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/call-agent.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c
index e6dbb7347..7b769332e 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -194,8 +194,10 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
err = get_assuan_server_version (ctx, mode, &serverversion);
if (err)
- log_error (_("error getting version from '%s': %s\n"),
- servername, gpg_strerror (err));
+ log_log (gpg_err_code (err) == GPG_ERR_NOT_SUPPORTED?
+ GPGRT_LOG_INFO : GPGRT_LOG_ERROR,
+ _("error getting version from '%s': %s\n"),
+ servername, gpg_strerror (err));
else if (compare_version_strings (serverversion, myversion) < 0)
{
char *warn;