Silence some warnings and errors

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 52dfe61bf37bb56cfde26c1802a4e27259002150..ec3bb850892c0c730878ae1ca0e4562a139dab3e 100644 (file)
--- 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 0e1b9d8dcd18bdea244c8ee452c86e7e1b10c2df..dc95122e7d4aa020d3edf5335dd02ddd959a866b 100644 (file)
--- 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 ca02a0795b64d93fe183a24b781748095d824c92..3db213375f88ef309fd97b826a7d4ee6dd49c36f 100644 (file)
--- 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 772e06be3e6a41548ae00210939041c0ffb0e7e5..343cec2234c1eec2d21ea6afe5d001837ed74312 100644 (file)
--- 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