diff options
| author | Neal H. Walfield <[email protected]> | 2016-12-22 15:06:13 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-12-22 15:06:13 +0000 |
| commit | 1909e994cb87d6c6866a465f0c20a456d4df46cc (patch) | |
| tree | d0b94921bc592abd46cfab66693c923cd2f54f71 | |
| parent | wks: Let the client ignore missing policy flags. (diff) | |
| download | gnupg-1909e994cb87d6c6866a465f0c20a456d4df46cc.tar.gz gnupg-1909e994cb87d6c6866a465f0c20a456d4df46cc.zip | |
tools: Show a clearer error message if a server doesn't support WKS
* tools/gpg-wks-client.c (command_send): If we fail to lookup the
submission address, print a better error message. If it is because
the corresponding file doesn't exist, provide the hint that the server
probably doesn't support WKS.
Signed-off-by: Neal H. Walfield <[email protected]>
| -rw-r--r-- | tools/gpg-wks-client.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c index d58c81b83..5814b4056 100644 --- a/tools/gpg-wks-client.c +++ b/tools/gpg-wks-client.c @@ -690,7 +690,16 @@ command_send (const char *fingerprint, char *userid) else err = wkd_get_submission_address (addrspec, &submission_to); if (err) - goto leave; + { + char *domain = strchr (addrspec, '@'); + if (domain) + domain = domain + 1; + log_error (_("looking up WKS submission address for %s: %s\n"), + domain ? domain : addrspec, gpg_strerror (err)); + if (gpg_err_code (err) == GPG_ERR_NO_DATA) + log_error (_("this domain probably doesn't support WKS.\n")); + goto leave; + } log_info ("submitting request to '%s'\n", submission_to); /* Get the policy flags. */ @@ -704,7 +713,7 @@ command_send (const char *fingerprint, char *userid) log_error ("error reading policy flags for '%s': %s\n", submission_to, gpg_strerror (err)); goto leave; - } + } if (mbuf) { err = wks_parse_policy (&policy, mbuf, 1); |