Silence some warnings and errors

(cherry picked from commit 0f0dfc7f86bc60a63e2d7da5ae8a4020575cf0b7)

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index d044cde7b3d033f62007df6d878887ca8793f8c3..2b597373c2c49d11b53b231c83d03edb9d0a5254 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1772,7 +1772,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 6ace9b4882945d3b511b00d704cbb13b0d8075cb..574de2a6d6e7785506b77e9baed7102d1c2092b0 100644 (file)
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
 
@@ -259,7 +257,7 @@ struct isc_socket_connev {
  * _DSCP:      The UDP DSCP value is valid.
  * _USEMINMTU: Set the per packet IPV6_USE_MIN_MTU flag.
  */
-#define ISC_SOCKEVENTATTR_ATTACHED             0x80000000U /* internal */
+#define ISC_SOCKEVENTATTR_ATTACHED             0x10000000U /* internal */
 #define ISC_SOCKEVENTATTR_TRUNC                        0x00800000U /* public */
 #define ISC_SOCKEVENTATTR_CTRUNC               0x00400000U /* public */
 #define ISC_SOCKEVENTATTR_TIMESTAMP            0x00200000U /* public */