s4:heimdal: import lorikeet-heimdal-201107150856 (commit 48936803fae4a2fb362c79365d31...

[samba.git] / source4 / heimdal / lib / roken / resolve.c

diff --git a/source4/heimdal/lib/roken/resolve.c b/source4/heimdal/lib/roken/resolve.c
index 03715e5ffd71da2df94a78964eac7dda7e9d0b06..b27f37a6d6d1ca34042d0c5fdd23ce47e9cc8393 100644 (file)
--- a/source4/heimdal/lib/roken/resolve.c
+++ b/source4/heimdal/lib/roken/resolve.c
@@ -194,7 +194,7 @@ parse_record(const unsigned char *data, const unsigned char *end_data,
            dns_free_rr(rr);
            return -1;
        }
-       if (status + 2 > size) {
+       if ((size_t)status + 2 > size) {
            dns_free_rr(rr);
            return -1;
        }
@@ -217,7 +217,7 @@ parse_record(const unsigned char *data, const unsigned char *end_data,
            dns_free_rr(rr);
            return -1;
        }
-       if (status + 6 > size) {
+       if ((size_t)status + 6 > size) {
            dns_free_rr(rr);
            return -1;
        }
@@ -237,7 +237,7 @@ parse_record(const unsigned char *data, const unsigned char *end_data,
        break;
     }
     case rk_ns_t_txt:{
-       if(size == 0 || size < *p + 1) {
+       if(size == 0 || size < (unsigned)(*p + 1)) {
            dns_free_rr(rr);
            return -1;
        }
@@ -284,7 +284,7 @@ parse_record(const unsigned char *data, const unsigned char *end_data,
            dns_free_rr(rr);
            return -1;
        }
-       if (status + 18 > size) {
+       if ((size_t)status + 18 > size) {
            dns_free_rr(rr);
            return -1;
        }
@@ -409,7 +409,7 @@ parse_reply(const unsigned char *data, size_t len)
 {
     const unsigned char *p;
     int status;
-    int i;
+    size_t i;
     char host[MAXDNAME];
     const unsigned char *end_data = data + len;
     struct rk_dns_reply *r;
@@ -528,7 +528,7 @@ dns_lookup_int(const char *domain, int rr_class, int rr_type)
     struct sockaddr_storage from;
     uint32_t fromsize = sizeof(from);
     dns_handle_t handle;
-    
+
     handle = dns_open(NULL);
     if (handle == NULL)
        return NULL;