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