Attachment 17107 Details for Bug 14953 – patch for 4.15

[patch] patch for 4.15

0001-waf-Fix-resolv_wrapper-with-glibc-2.34.patch (text/plain), 2.62 KB, created by Andreas Schneider on 2022-01-20 09:51:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2022-01-20 09:51:33 UTC

Size: 2.62 KB

patch

obsolete

>From d10b8705b3a9bfb98f09582020a6b7ecd70eb40b Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Thu, 7 Oct 2021 15:55:37 +0200
>Subject: [PATCH] waf: Fix resolv_wrapper with glibc 2.34
>
>With glibc 2.34 we are not able to talk to the DNS server via socket_wrapper
>anymore. The res_* symbols have been moved from libresolv to libc. We are not
>able to intercept any traffic inside of libc.
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit e556b4067e0c4036e20fc26523e3b4d6d5c6be42)
>---
> selftest/wscript                   |  2 +-
> third_party/resolv_wrapper/wscript | 13 +++++++++++++
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
>diff --git a/selftest/wscript b/selftest/wscript
>index a6be06c2ae9..85d9338489a 100644
>--- a/selftest/wscript
>+++ b/selftest/wscript
>@@ -252,7 +252,7 @@ def cmd_testonly(opt):
>     if os.environ.get('USE_NAMESPACES') is None:
>         env.OPTIONS += " --socket_wrapper_so_path=" + CONFIG_GET(opt, 'LIBSOCKET_WRAPPER_SO_PATH')
> 
>-    if Utils.unversioned_sys_platform() in ('netbsd', 'openbsd', 'sunos'):
>+    if not CONFIG_SET(opt, 'HAVE_RESOLV_CONF_SUPPORT'):
>         env.OPTIONS += " --use-dns-faking"
> 
>     if CONFIG_GET(opt, 'USING_SYSTEM_KRB5') and CONFIG_GET(opt, 'MIT_KDC_PATH'):
>diff --git a/third_party/resolv_wrapper/wscript b/third_party/resolv_wrapper/wscript
>index a7f18389b0f..7e369bd90b5 100644
>--- a/third_party/resolv_wrapper/wscript
>+++ b/third_party/resolv_wrapper/wscript
>@@ -1,6 +1,7 @@
> #!/usr/bin/env python
> 
> import os
>+from waflib import Logs
> 
> VERSION="1.1.7"
> 
>@@ -49,6 +50,18 @@ def configure(conf):
>         if conf.CONFIG_SET('HAVE_RES_NCLOSE'):
>             conf.DEFINE('HAVE_RES_NCLOSE_IN_LIBRESOLV', 1)
> 
>+        # If we find res_nquery in libc, we can't do resolv.conf redirect
>+        conf.CHECK_FUNCS('res_nquery __res_nquery')
>+        if (conf.CONFIG_SET('HAVE_RES_NQUERY')
>+                or conf.CONFIG_SET('HAVE___RES_NQUERY')):
>+            Logs.warn("Detection for resolv_wrapper: "
>+                      "Only dns faking will be available")
>+        else:
>+            if conf.CHECK_FUNCS('res_nquery', lib='resolv'):
>+                conf.DEFINE('HAVE_RESOLV_CONF_SUPPORT', 1)
>+            if conf.CHECK_FUNCS('__res_nquery', lib='resolv'):
>+                conf.DEFINE('HAVE_RESOLV_CONF_SUPPORT', 1)
>+
>         conf.CHECK_FUNCS_IN('res_init __res_init', 'resolv', checklibc=True)
>         conf.CHECK_FUNCS_IN('res_ninit __res_ninit', 'resolv', checklibc=True)
>         conf.CHECK_FUNCS_IN('res_close __res_close', 'resolv', checklibc=True)
>-- 
>2.34.1
>

Flags:

ab: review+

Actions: View

Attachments on bug 14953: 17107