[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  429bf5ce231 third_party: Update resolv_wrapper to version 1.1.8
      from  6ec24883876 CI: add a test for wbinfo --change-secret-at=DC

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


- Log -----------------------------------------------------------------
commit 429bf5ce231c417b678b576096b437d1bd58c348
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Dec 21 08:42:49 2022 +0100

    third_party: Update resolv_wrapper to version 1.1.8
    
    res_randomid() is marked as deprecated in newer glibc.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Dec 21 21:28:42 UTC 2022 on sn-devel-184

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

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


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py
index d98c0eeb18e..b0a5190bbb2 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.7')
+    return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.8')
 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 b69a55a80e0..899f4ccc7a9 100644
--- a/third_party/resolv_wrapper/resolv_wrapper.c
+++ b/third_party/resolv_wrapper/resolv_wrapper.c
@@ -434,6 +434,8 @@ static int rwrap_create_fake_ptr_rr(const char *key,
 	return 0;
 }
 
+#define rwrap_randomid() 0xffff & getpid()
+
 /* Prepares a fake header with a single response. Advances header_blob */
 static ssize_t rwrap_fake_header(uint8_t **header_blob, size_t remaining,
 			         size_t ancount, size_t arcount)
@@ -451,7 +453,7 @@ static ssize_t rwrap_fake_header(uint8_t **header_blob, size_t remaining,
 	h.blob = *header_blob;
 	memset(h.blob, 0, NS_HFIXEDSZ);
 
-	h.header->id = res_randomid();		/* random query ID */
+	h.header->id = rwrap_randomid();	/* random query ID */
 	h.header->qr = 1;			/* response flag */
 	h.header->rd = 1;			/* recursion desired */
 	h.header->ra = 1;			/* recursion available */
diff --git a/third_party/resolv_wrapper/wscript b/third_party/resolv_wrapper/wscript
index 7e369bd90b5..9aa06bc1508 100644
--- a/third_party/resolv_wrapper/wscript
+++ b/third_party/resolv_wrapper/wscript
@@ -3,7 +3,7 @@
 import os
 from waflib import Logs
 
-VERSION="1.1.7"
+VERSION="1.1.8"
 
 def configure(conf):
     if conf.CHECK_RESOLV_WRAPPER():


-- 
Samba Shared Repository