diff options
Diffstat (limited to 'g10/call-keyboxd.c')
| -rw-r--r-- | g10/call-keyboxd.c | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/g10/call-keyboxd.c b/g10/call-keyboxd.c index 181f33fed..e09fa20e3 100644 --- a/g10/call-keyboxd.c +++ b/g10/call-keyboxd.c @@ -142,40 +142,9 @@ gpg_keyboxd_deinit_session_data (ctrl_t ctrl) static gpg_error_t warn_version_mismatch (assuan_context_t ctx, const char *servername) { - gpg_error_t err; - char *serverversion; - const char *myversion = gpgrt_strusage (13); - - err = get_assuan_server_version (ctx, 0, &serverversion); - if (err) - log_error (_("error getting version from '%s': %s\n"), - servername, gpg_strerror (err)); - else if (compare_version_strings (serverversion, myversion) < 0) - { - char *warn; - - warn = xtryasprintf (_("server '%s' is older than us (%s < %s)"), - servername, serverversion, myversion); - if (!warn) - err = gpg_error_from_syserror (); - else - { - log_info (_("WARNING: %s\n"), warn); - if (!opt.quiet) - { - log_info (_("Note: Outdated servers may lack important" - " security fixes.\n")); - log_info (_("Note: Use the command \"%s\" to restart them.\n"), - "gpgconf --kill all"); - } - - write_status_strings (STATUS_WARNING, "server_version_mismatch 0", - " ", warn, NULL); - xfree (warn); - } - } - xfree (serverversion); - return err; + return warn_server_version_mismatch (ctx, servername, 0, + write_status_strings2, NULL, + !opt.quiet); } |