[Pkg-gnupg-commit] [gnupg2] 04/205: dirmngr: Build fix for FreeBSD (EAI macros)

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed May 11 08:38:07 UTC 2016


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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 4d67144142f04184b835e50314eb21b882b9e00a
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 27 13:55:31 2016 +0100

    dirmngr: Build fix for FreeBSD (EAI macros)
    
    * dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
    EAI_ADDRFAMILY only if defined.
    --
    
    Reported-by: Christoph Moench-Tegeder <cmt at burggraben.net>
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 dirmngr/dns-stuff.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index 63dfc8d..40c71f3 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -177,13 +177,17 @@ map_eai_to_gpg_error (int ec)
     case EAI_BADFLAGS:  err = gpg_error (GPG_ERR_INV_FLAG); break;
     case EAI_FAIL:      err = gpg_error (GPG_ERR_SERVER_FAILED); break;
     case EAI_MEMORY:    err = gpg_error (GPG_ERR_ENOMEM); break;
+#ifdef EAI_NODATA
     case EAI_NODATA:    err = gpg_error (GPG_ERR_NO_DATA); break;
+#endif
     case EAI_NONAME:    err = gpg_error (GPG_ERR_NO_NAME); break;
     case EAI_SERVICE:   err = gpg_error (GPG_ERR_NOT_SUPPORTED); break;
     case EAI_FAMILY:    err = gpg_error (GPG_ERR_EAFNOSUPPORT); break;
     case EAI_SOCKTYPE:  err = gpg_error (GPG_ERR_ESOCKTNOSUPPORT); break;
 #ifndef HAVE_W32_SYSTEM
+# ifdef EAI_ADDRFAMILY
     case EAI_ADDRFAMILY:err = gpg_error (GPG_ERR_EADDRNOTAVAIL); break;
+# endif
     case EAI_SYSTEM:    err = gpg_error_from_syserror (); break;
 #endif
     default:            err = gpg_error (GPG_ERR_UNKNOWN_ERRNO); break;

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



More information about the Pkg-gnupg-commit mailing list