From 474fbe88bf45a08494c769410204dd65cfbf0a92 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 16 Nov 2018 11:51:05 +1100
Subject: [PATCH 1/3] add missing tasks argument

---
 lib/isc/win32/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 46ffcacfde..28d96b0df5 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -2531,7 +2531,7 @@ SocketIoThread(LPVOID ThreadContext) {
  */
 isc_result_t
 isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
-	return (isc_socketmgr_create2(mctx, managerp, 0));
+	return (isc_socketmgr_create2(mctx, managerp, 0, 1));
 }
 
 isc_result_t

From 1ca5920113fcda3586b2b1e2a0a375b7c05791aa Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 16 Nov 2018 12:23:36 +1100
Subject: [PATCH 2/3]

---
 lib/isc/mem.c                    | 12 +++++++-----
 lib/isc/unix/ifiter_getifaddrs.c |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 704bfcca06..5c449f3482 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -22,16 +22,17 @@
 #include <limits.h>
 
 #include <isc/bind9.h>
+#include <isc/hash.h>
 #include <isc/json.h>
 #include <isc/magic.h>
-#include <isc/hash.h>
 #include <isc/mem.h>
 #include <isc/msgs.h>
-#include <isc/once.h>
-#include <isc/refcount.h>
-#include <isc/string.h>
 #include <isc/mutex.h>
+#include <isc/once.h>
 #include <isc/print.h>
+#include <isc/refcount.h>
+#include <isc/strerr.h>
+#include <isc/string.h>
 #include <isc/util.h>
 #include <isc/xml.h>
 
@@ -734,8 +735,9 @@ default_memalloc(void *arg, size_t size) {
 
 	if (ptr == NULL && size != 0) {
 		char strbuf[ISC_STRERRORSIZE];
+		strerror_r(errno, strbuf, sizeof(strbuf));
 		isc_error_fatal(__FILE__, __LINE__, "malloc failed: %s",
-				strerror_r(errno, strbuf, sizeof(strbuf)));
+				strbuf);
 	}
 
 	return (ptr);
diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c
index 18deb7ace0..7f10a9ac38 100644
--- a/lib/isc/unix/ifiter_getifaddrs.c
+++ b/lib/isc/unix/ifiter_getifaddrs.c
@@ -20,6 +20,8 @@
 
 #include <ifaddrs.h>
 
+#include <isc/strerr.h>
+
 /*% Iterator Magic */
 #define IFITER_MAGIC		ISC_MAGIC('I', 'F', 'I', 'G')
 /*% Valid Iterator */

From bad342adab773fbd5d0abbf10c12aca7f28f8cd5 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 16 Nov 2018 12:23:08 +1100
Subject: [PATCH 3/3] check for missing #include <isc/strerr.h>

---
 util/checklibs.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/util/checklibs.sh b/util/checklibs.sh
index 9e00c8f784..20914b18d2 100755
--- a/util/checklibs.sh
+++ b/util/checklibs.sh
@@ -25,6 +25,21 @@ list=`git grep -l snprintf lib bin |
     echo "$list"
 }
 
+#
+# Check for missing #include <isc/strerr.h>
+#
+list=`git grep -wl strerror_r lib bin |
+      grep '\.c$' |
+      grep -vE -e '(lib/bind|lib/dns/rdata|lib/dns/gen.c)' \
+	       -e lib/isc/string.c \
+	       -e '(lib/isc/win32/time.c|dlzexternal/driver.c)' |
+      xargs grep -EL "(isc/strerr.h)" 2> /dev/null`
+[ -n "$list" ] && {
+    status=1
+    echo 'Missing #include <isc/strerr.h>:'
+    echo "$list"
+}
+
 #
 # Check for missing #include <inttypes.h>"
 #