From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Wed, 4 Dec 2019 17:30:26 +0000 (-0500)
Subject: lib: Don't use EAI_{ADDRFAMILY,NODATA} when they don't exist
X-Git-Tag: 2.3.10~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1711eb6fdae98ca63c1a044188b1098f52a35ba;p=thirdparty%2Fdovecot%2Fcore.git

lib: Don't use EAI_{ADDRFAMILY,NODATA} when they don't exist

Broken by c85f1bc3ce612c736c9d2c468cc08306db1b5851
---

diff --git a/src/lib/net.c b/src/lib/net.c
index 63581159d8..43735b3287 100644
--- a/src/lib/net.c
+++ b/src/lib/net.c
@@ -1080,13 +1080,17 @@ enum net_hosterror_type net_get_hosterror_type(int error)
 		int error;
 		enum net_hosterror_type type;
 	} error_map[] = {
+#ifdef EAI_ADDRFAMILY /* Obsoleted by RFC 2553bis-02 */
 		{ EAI_ADDRFAMILY, NET_HOSTERROR_TYPE_NOT_FOUND },
+#endif
 		{ EAI_AGAIN, NET_HOSTERROR_TYPE_NAMESERVER },
 		{ EAI_BADFLAGS, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
 		{ EAI_FAIL, NET_HOSTERROR_TYPE_NAMESERVER },
 		{ EAI_FAMILY, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
 		{ EAI_MEMORY, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
+#ifdef EAI_NODATA /* Obsoleted by RFC 2553bis-02 */
 		{ EAI_NODATA, NET_HOSTERROR_TYPE_NOT_FOUND },
+#endif
 		{ EAI_NONAME, NET_HOSTERROR_TYPE_NOT_FOUND },
 		{ EAI_SERVICE, NET_HOSTERROR_TYPE_INTERNAL_ERROR },
 		{ EAI_SOCKTYPE, NET_HOSTERROR_TYPE_INTERNAL_ERROR },