From d932ec871c5c96f025653b835302019f5f90b878 Mon Sep 17 00:00:00 2001
From: Witold Krecicki <wpk@isc.org>
Date: Thu, 30 Aug 2018 13:16:15 +0200
Subject: [PATCH] Silence some warnings and errors

---
 lib/bind9/check.c            | 2 +-
 lib/isc/include/isc/socket.h | 4 ++--
 lib/isc/socket_api.c         | 2 +-
 lib/isc/unix/socket.c        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 52dfe61bf3..ec3bb85089 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1871,7 +1871,7 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) {
 
 typedef struct {
 	const char *name;
-	int allowed;
+	unsigned int allowed;
 } optionstable;
 
 static isc_result_t
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 0e1b9d8dcd..dc95122e7d 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -231,7 +231,7 @@ enum {
  * _USEMINMTU:	Set the per packet IPV6_USE_MIN_MTU flag.
  */
 typedef enum {
-	ISC_SOCKEVENTATTR_ATTACHED =	0x80000000U, /* internal */
+	ISC_SOCKEVENTATTR_ATTACHED =	0x10000000U, /* internal */
 	ISC_SOCKEVENTATTR_TRUNC =	0x00800000U, /* public */
 	ISC_SOCKEVENTATTR_CTRUNC =	0x00400000U, /* public */
 	ISC_SOCKEVENTATTR_TIMESTAMP =	0x00200000U, /* public */
@@ -352,7 +352,7 @@ typedef struct isc_socketmethods {
 	void		(*detach)(isc_socket_t **socketp);
 	isc_result_t	(*bind)(isc_socket_t *sock,
 				const isc_sockaddr_t *sockaddr,
-				unsigned int options);
+				isc_socket_options_t options);
 	isc_result_t	(*sendto)(isc_socket_t *sock, isc_region_t *region,
 				  isc_task_t *task, isc_taskaction_t action,
 				  void *arg,
diff --git a/lib/isc/socket_api.c b/lib/isc/socket_api.c
index ca02a0795b..3db213375f 100644
--- a/lib/isc/socket_api.c
+++ b/lib/isc/socket_api.c
@@ -134,7 +134,7 @@ isc_socket_detach(isc_socket_t **socketp) {
 
 isc_result_t
 isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr,
-		unsigned int options)
+		isc_socket_options_t options)
 {
 	REQUIRE(ISCAPI_SOCKET_VALID(sock));
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 772e06be3e..343cec2234 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -543,7 +543,7 @@ isc__socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm,
 		     uint32_t owner, uint32_t group);
 isc_result_t
 isc__socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr,
-		 unsigned int options);
+		 isc_socket_options_t options);
 isc_result_t
 isc__socket_filter(isc_socket_t *sock, const char *filter);
 isc_result_t