[git] GnuPG - branch, master, updated. gnupg-2.1.17-10-g1909e99

by Neal H. Walfield cvs at cvs.gnupg.org
Thu Dec 22 16:06:19 CET 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  1909e994cb87d6c6866a465f0c20a456d4df46cc (commit)
      from  e917dfcd973a3ebbf5eb584e819ffa89f932bfef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1909e994cb87d6c6866a465f0c20a456d4df46cc
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Dec 22 16:06:13 2016 +0100

    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 <neal at g10code.com>

diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index d58c81b..5814b40 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);

-----------------------------------------------------------------------

Summary of changes:
 tools/gpg-wks-client.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list