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@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Dec 21 21:28:42 UTC 2022 on sn-devel-184

diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py
index d98c0eeb18e73bab7905ab85c52833cca01ff454..b0a5190bbb25560a5e38de8f8a5584374eaf05cc 100644 (file)
--- 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 b69a55a80e0c437e1ed2b2e7c5c6480a64d57bf6..899f4ccc7a97ce55ad9dcc00f75ac480db85f3ae 100644 (file)
--- 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 7e369bd90b52e304ac868447442dd3f46f8c2605..9aa06bc1508a42b89ca42f6d61a7e1a4bfe9c4a6 100644 (file)
--- 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():