diff options
| author | Andreas Schneider <asn@samba.org> | 2020-08-25 17:39:18 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2020-08-26 09:59:28 +0000 |
| commit | fbe58531a20cbbe0906f13e370329f3030d4ce96 (patch) | |
| tree | fd4813e980330fd570f37f937a19cc93bced6142 | |
| parent | 09fba1f3e32e0a5c406882b36bfa5901f9df92a8 (diff) | |
| download | samba-fbe58531a20cbbe0906f13e370329f3030d4ce96.tar.gz | |
third_party: Update resolv_wrapper to version 1.1.7
This fixes some Samba tests which redirect stderr to stdout and then get
more messages than expected.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Aug 26 09:59:28 UTC 2020 on sn-devel-184
| -rw-r--r-- | buildtools/wafsamba/samba_third_party.py | 2 | ||||
| -rw-r--r-- | third_party/resolv_wrapper/resolv_wrapper.c | 4 | ||||
| -rw-r--r-- | third_party/resolv_wrapper/wscript | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py index 318da4f4eff..bc2b21f2a55 100644 --- a/buildtools/wafsamba/samba_third_party.py +++ b/buildtools/wafsamba/samba_third_party.py @@ -34,7 +34,7 @@ Build.BuildContext.CHECK_NSS_WRAPPER = CHECK_NSS_WRAPPER @conf def CHECK_RESOLV_WRAPPER(conf): - return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.6') + return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.7') Build.BuildContext.CHECK_RESOLV_WRAPPER = CHECK_RESOLV_WRAPPER @conf diff --git a/third_party/resolv_wrapper/resolv_wrapper.c b/third_party/resolv_wrapper/resolv_wrapper.c index 0d3f34ce591..b69a55a80e0 100644 --- a/third_party/resolv_wrapper/resolv_wrapper.c +++ b/third_party/resolv_wrapper/resolv_wrapper.c @@ -1844,7 +1844,7 @@ static int rwrap_parse_resolv_conf(struct __res_state *state, fp = fopen(resolv_conf, "r"); if (fp == NULL) { - RWRAP_LOG(RWRAP_LOG_ERROR, + RWRAP_LOG(RWRAP_LOG_WARN, "Opening %s failed: %s", resolv_conf, strerror(errno)); return -1; @@ -1930,7 +1930,7 @@ static int rwrap_parse_resolv_conf(struct __res_state *state, fclose(fp); if (nserv == 0) { - RWRAP_LOG(RWRAP_LOG_ERROR, + RWRAP_LOG(RWRAP_LOG_WARN, "No usable nameservers found in %s", resolv_conf); errno = ESRCH; diff --git a/third_party/resolv_wrapper/wscript b/third_party/resolv_wrapper/wscript index ea3df498a6e..a7f18389b0f 100644 --- a/third_party/resolv_wrapper/wscript +++ b/third_party/resolv_wrapper/wscript @@ -2,7 +2,7 @@ import os -VERSION="1.1.6" +VERSION="1.1.7" def configure(conf): if conf.CHECK_RESOLV_WRAPPER(): |