diff options
| -rw-r--r-- | dirmngr/server.c | 1 | ||||
| -rw-r--r-- | g10/call-dirmngr.c | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c index 4a242539b..357aaa592 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -876,6 +876,7 @@ proc_wkd_get (ctrl_t ctrl, assuan_context_t ctx, char *line) if (domaininfo_is_wkd_not_supported (domain_orig)) { err = gpg_error (GPG_ERR_NO_DATA); + dirmngr_status_printf (ctrl, "NOTE", "wkd_cached_result %u", err); goto leave; } } diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c index 88fd97eb1..4180589fa 100644 --- a/g10/call-dirmngr.c +++ b/g10/call-dirmngr.c @@ -394,7 +394,7 @@ ks_status_cb (void *opaque, const char *line) struct ks_status_parm_s *parm = opaque; gpg_error_t err = 0; const char *s, *s2; - const char *warn; + const char *warn = NULL; int is_note = 0; if ((s = has_leading_keyword (line, parm->keyword? parm->keyword : "SOURCE"))) @@ -410,7 +410,12 @@ ks_status_cb (void *opaque, const char *line) else if ((s = has_leading_keyword (line, "WARNING")) || (is_note = !!(s = has_leading_keyword (line, "NOTE")))) { - if ((s2 = has_leading_keyword (s, "tor_not_running"))) + if ((s2 = has_leading_keyword (s, "wkd_cached_result"))) + { + if (opt.verbose) + warn = _("WKD uses a cached result"); + } + else if ((s2 = has_leading_keyword (s, "tor_not_running"))) warn = _("Tor is not running"); else if ((s2 = has_leading_keyword (s, "tor_config_problem"))) warn = _("Tor is not properly configured"); |