[Pkg-gnupg-commit] [libgpg-error] 13/22: New error code GPG_ERR_DNS_TIMEOUT.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository libgpg-error.

commit 90b4dfad438900c7808b8c2995ba984fa3587bb2
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 12 19:26:17 2016 +0100

    New error code GPG_ERR_DNS_TIMEOUT.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 NEWS               |  1 +
 doc/errorref.txt   | 10 +++++++---
 src/err-codes.h.in |  3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 5d24426..3b3ffb2 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Noteworthy changes in version 1.26 (unreleased) [C20/A20/R_]
  GPG_ERR_DNS_NO_ANSWER	          NEW.
  GPG_ERR_DNS_CLOSED	          NEW.
  GPG_ERR_DNS_VERIFY	          NEW.
+ GPG_ERR_DNS_TIMEOUT	          NEW.
 
 
 Noteworthy changes in version 1.25 (2016-11-14) [C20/A20/R0]
diff --git a/doc/errorref.txt b/doc/errorref.txt
index 5fffac9..ce626eb 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -293,7 +293,9 @@ GPG_ERR_NOT_SUPPORTED           Not supported
 
 GPG_ERR_INV_OP                  Invalid operation code
 
-GPG_ERR_TIMEOUT                         Timeout
+GPG_ERR_TIMEOUT                 Timeout
+
+    Some function or network access timed out.
 
 GPG_ERR_INTERNAL                Internal error
 
@@ -1066,12 +1068,14 @@ GPG_ERR_DNS_VERIFY              Verification failed in DNS
 
    Used by Dirmngr for DNS errors from libdns (DNS_EVERIFY);
 
+GPG_ERR_DNS_TIMEOUT             DNS Timeout
 
+   A DNS query timed out
 
 GPG_ERR_LDAP_GENERAL            LDAP General error
 
-   Catch all error for LDAP.  Use if if can't map an erro rocde to an
-   gpg-error code.
+   Catch all error for LDAP.  Use when an error code could not be
+   mapped to a gpg-error code.
 
 GPG_ERR_LDAP_ATTR_GENERAL       LDAP General attribute error
 GPG_ERR_LDAP_NAME_GENERAL       LDAP General name error
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index b3eaf3c..efc40e4 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -336,7 +336,7 @@
 666	GPG_ERR_SYSTEM_BUG		System bug detected
 
 #
-# Mapping of some error codes from libdns.
+# Mapping of some error codes from libdns and other DNS specific error codes
 #
 711	GPG_ERR_DNS_UNKNOWN		Unknown DNS error
 712	GPG_ERR_DNS_SECTION		Invalid DNS section
@@ -345,6 +345,7 @@
 715	GPG_ERR_DNS_NO_ANSWER		Missing DNS answer packet
 716	GPG_ERR_DNS_CLOSED		Connection closed in DNS
 717	GPG_ERR_DNS_VERIFY		Verification failed in DNS
+718	GPG_ERR_DNS_TIMEOUT		DNS Timeout
 
 #
 # Mapping of LDAP error codes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libgpg-error.git