libmilter: fix build with glibc 2.30

This commit is contained in:
q66 2019-12-19 17:45:42 +01:00
parent 5dda008bc9
commit c3ddf5944d

View file

@ -0,0 +1,59 @@
The former deprecated macro RES_USE_INET6 is gone with glibc 2.30
Source: openSUSE
---
libmilter/sm_gethost.c | 6 ++++--
sendmail/conf.c | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
--- libmilter/sm_gethost.c
+++ libmilter/sm_gethost.c 2019-09-28 07:27:46.512228011 +0000
@@ -51,18 +51,20 @@ sm_getipnodebyname(name, family, flags,
{
bool resv6 = true;
struct hostent *h;
-
+#ifdef RES_USE_INET6
if (family == AF_INET6)
{
/* From RFC2133, section 6.1 */
resv6 = bitset(RES_USE_INET6, _res.options);
_res.options |= RES_USE_INET6;
}
+#endif
SM_SET_H_ERRNO(0);
h = gethostbyname(name);
+#ifdef RES_USE_INET6
if (family == AF_INET6 && !resv6)
_res.options &= ~RES_USE_INET6;
-
+#endif
/* the function is supposed to return only the requested family */
if (h != NULL && h->h_addrtype != family)
{
--- sendmail/conf.c
+++ sendmail/conf.c 2019-09-28 07:28:39.103245002 +0000
@@ -4242,18 +4242,20 @@ sm_getipnodebyname(name, family, flags,
# else /* HAS_GETHOSTBYNAME2 */
bool resv6 = true;
-
+#ifdef RES_USE_INET6
if (family == AF_INET6)
{
/* From RFC2133, section 6.1 */
resv6 = bitset(RES_USE_INET6, _res.options);
_res.options |= RES_USE_INET6;
}
+#endif
SM_SET_H_ERRNO(0);
h = gethostbyname(name);
+#ifdef RES_USE_INET6
if (!resv6)
_res.options &= ~RES_USE_INET6;
-
+#endif
/* the function is supposed to return only the requested family */
if (h != NULL && h->h_addrtype != family)
{