Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 16:16:15 +0000 (09:16 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 16:16:15 +0000 (09:16 -0700)
source/libads/dns.c
source/rpc_client/cli_pipe.c

index 5ba6241..bfb2dc0 100644 (file)
@@ -688,7 +688,7 @@ char *sitename_fetch(const char *realm)
        char *key;
        
        if (!gencache_init()) {
-               return False;
+               return NULL;
        }
 
        if (!realm || (strlen(realm) == 0)) {
index 47fcbfe..3b41e74 100644 (file)
@@ -446,8 +446,8 @@ static NTSTATUS cli_pipe_validate_rpc_response(struct rpc_pipe_client *cli, RPC_
                        return NT_STATUS_INVALID_PARAMETER;
                }
 
-               if (prhdr->auth_len + RPC_HDR_AUTH_LEN < prhdr->auth_len ||
-                               prhdr->auth_len + RPC_HDR_AUTH_LEN < RPC_HDR_AUTH_LEN) {
+               if (prhdr->auth_len + (unsigned int)RPC_HDR_AUTH_LEN < prhdr->auth_len ||
+                               prhdr->auth_len + (unsigned int)RPC_HDR_AUTH_LEN < (unsigned int)RPC_HDR_AUTH_LEN) {
                        /* Integer wrap attempt. */
                        return NT_STATUS_INVALID_PARAMETER;
                }