From 4ad5bc1b6d72483123963c894ee1412b2ceb99b4 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 31 Jul 2017 11:20:47 +0200 Subject: Explain the "server is older than xxx warning". * g10/call-agent.c (warn_version_mismatch): Print a note on how to restart the servers. * g10/call-dirmngr.c (warn_version_mismatch): Ditto. * sm/call-agent.c (warn_version_mismatch): Ditto. * sm/call-dirmngr.c (warn_version_mismatch): Ditto. -- We should move this fucntion to common. However, the status output functions are different and would need to be streamlined too. GnuPG-bug-id: 3117 Debian-bug-id: 860745 Signed-off-by: Werner Koch --- g10/call-agent.c | 7 +++++++ g10/call-dirmngr.c | 8 ++++++++ sm/call-agent.c | 7 +++++++ sm/call-dirmngr.c | 7 +++++++ 4 files changed, 29 insertions(+) diff --git a/g10/call-agent.c b/g10/call-agent.c index 1ce6641af..545b2448a 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -209,6 +209,13 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode) 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); diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c index 9bae59f47..362731e5f 100644 --- a/g10/call-dirmngr.c +++ b/g10/call-dirmngr.c @@ -157,6 +157,14 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername) 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); diff --git a/sm/call-agent.c b/sm/call-agent.c index ba8fb122b..772c9c312 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -108,6 +108,13 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx, 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"); + } gpgsm_status2 (ctrl, STATUS_WARNING, "server_version_mismatch 0", warn, NULL); xfree (warn); diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index 5ee15b777..930194076 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -175,6 +175,13 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx, 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"); + } gpgsm_status2 (ctrl, STATUS_WARNING, "server_version_mismatch 0", warn, NULL); xfree (warn); -- cgit v1.2.3