[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  fbe58531a20 third_party: Update resolv_wrapper to version 1.1.7
       via  09fba1f3e32 selftest: Catch exception from dns_hub.py
      from  e9137a9e9dd docs-xml: pam_winbind manpage: grammar and typos

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fbe58531a20cbbe0906f13e370329f3030d4ce96
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Aug 25 17:39:18 2020 +0200

    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 at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Aug 26 09:59:28 UTC 2020 on sn-devel-184

commit 09fba1f3e32e0a5c406882b36bfa5901f9df92a8
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Aug 25 08:28:00 2020 +0200

    selftest: Catch exception from dns_hub.py
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Noel Power <npower at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_third_party.py    | 2 +-
 selftest/target/dns_hub.py                  | 6 +++++-
 third_party/resolv_wrapper/resolv_wrapper.c | 4 ++--
 third_party/resolv_wrapper/wscript          | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

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/selftest/target/dns_hub.py b/selftest/target/dns_hub.py
index 4f42395f17d..e21544ae322 100755
--- a/selftest/target/dns_hub.py
+++ b/selftest/target/dns_hub.py
@@ -135,7 +135,11 @@ class DnsHandler(sserver.BaseRequestHandler):
             response.operation |= dns.DNS_FLAG_RECURSION_AVAIL
             response.operation |= dns.DNS_RCODE_NXDOMAIN
         else:
-            response = self.dns_transaction_udp(query, forwarder)
+            try:
+                response = self.dns_transaction_udp(query, forwarder)
+            except OSError as err:
+                print("dns_hub: Error sending dns query to forwarder[%s] for name[%s]: %s" %
+                      (forwarder, name, err))
 
         if response is None:
             response = query
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():


-- 
Samba Shared Repository