summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-06-27 12:42:07 +0200
committerMichael Adam <obnox@samba.org>2008-06-27 14:27:30 +0200
commitdb7bd968daa6589bd32573a188e3fc73802c4199 (patch)
tree932d4ae5d4b21abde6084ca7fee431f9f51a5fa7
parentbcc6a3786c30a76ac80529cc60f4958dfed9abc6 (diff)
downloadsamba-db7bd968daa6589bd32573a188e3fc73802c4199.tar.gz
samba-db7bd968daa6589bd32573a188e3fc73802c4199.tar.bz2
samba-db7bd968daa6589bd32573a188e3fc73802c4199.zip
ntlmssp: get rid of "cast to pointer from integer of different size" warning on 64 bit
Not sure if this check is actually necessary, though: the second should be sufficient. Michael (This used to be commit 2813882ef3cc3609a74ad83bcee6be0c2cd53494)
-rw-r--r--source4/auth/ntlmssp/ntlmssp_parse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c
index 8e31d814d0..e1c1e7cbb3 100644
--- a/source4/auth/ntlmssp/ntlmssp_parse.c
+++ b/source4/auth/ntlmssp/ntlmssp_parse.c
@@ -241,7 +241,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
ret = false;
goto cleanup;
}
- if (blob->data + ptr < (uint8_t *)ptr ||
+ if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
blob->data + ptr < blob->data) {
ret = false;
goto cleanup;
@@ -276,7 +276,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
goto cleanup;
}
- if (blob->data + ptr < (uint8_t *)ptr ||
+ if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
blob->data + ptr < blob->data) {
ret = false;
goto cleanup;
@@ -311,7 +311,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
goto cleanup;
}
- if (blob->data + ptr < (uint8_t *)ptr ||
+ if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
blob->data + ptr < blob->data) {
ret = false;
goto cleanup;