From 488b183811fc25c1ae49b4730491accf1adf518e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 2 Nov 2016 16:24:58 +0100 Subject: common: Improve compare_string_versions. * common/stringhelp.c: Include limits.h. (compare_version_strings): Change semantics to behave like strcmp. Include the patch lebel in the comparison. Allow checking a single version string. * common/t-stringhelp.c (test_compare_version_strings): Adjust test vectors and a few new vectors. * g10/call-agent.c (warn_version_mismatch): Adjust to new sematics. * g10/call-dirmngr.c (warn_version_mismatch): Ditto. * sm/call-agent.c (warn_version_mismatch): Ditto. * sm/call-dirmngr.c (warn_version_mismatch): Ditto. Signed-off-by: Werner Koch --- sm/call-agent.c | 2 +- sm/call-dirmngr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sm') diff --git a/sm/call-agent.c b/sm/call-agent.c index c0a2081fe..c9a210fa5 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -97,7 +97,7 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx, if (err) log_error (_("error getting version from '%s': %s\n"), servername, gpg_strerror (err)); - else if (!compare_version_strings (serverversion, myversion)) + else if (compare_version_strings (serverversion, myversion) < 0) { char *warn; diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index 03c9a6833..6d7053c54 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -163,7 +163,7 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx, if (err) log_error (_("error getting version from '%s': %s\n"), servername, gpg_strerror (err)); - else if (!compare_version_strings (serverversion, myversion)) + else if (compare_version_strings (serverversion, myversion) < 0) { char *warn; -- cgit v1.2.3