summaryrefslogtreecommitdiff
path: root/libcli/auth
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-04-23 14:24:16 +0200
committerVolker Lendecke <vl@samba.org>2009-04-23 14:35:50 +0200
commit2146310fb75b743d383aeeae3ac121e37903f229 (patch)
tree5cdf7afcfc30dd78640bc8b5b311e0b5cbbc3d79 /libcli/auth
parentb8cd1cff2dfad726cf6dab368dfcc31a29952889 (diff)
downloadsamba-2146310fb75b743d383aeeae3ac121e37903f229.tar.gz
samba-2146310fb75b743d383aeeae3ac121e37903f229.tar.bz2
samba-2146310fb75b743d383aeeae3ac121e37903f229.zip
Fix a couple of warnings
Diffstat (limited to 'libcli/auth')
-rw-r--r--libcli/auth/msrpc_parse.c25
-rw-r--r--libcli/auth/ntlm_check.c2
-rw-r--r--libcli/auth/smbencrypt.c8
3 files changed, 20 insertions, 15 deletions
diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c
index 2f78f5f190..9125c1cd78 100644
--- a/libcli/auth/msrpc_parse.c
+++ b/libcli/auth/msrpc_parse.c
@@ -66,8 +66,10 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx,
case 'U':
s = va_arg(ap, char *);
head_size += 8;
- ret = push_ucs2_talloc(pointers, (smb_ucs2_t **)&pointers[i].data,
- s, &n);
+ ret = push_ucs2_talloc(
+ pointers,
+ (smb_ucs2_t **)(void *)&pointers[i].data,
+ s, &n);
if (!ret) {
return false;
}
@@ -78,8 +80,9 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx,
case 'A':
s = va_arg(ap, char *);
head_size += 8;
- ret = push_ascii_talloc(pointers, (char **)&pointers[i].data, s,
- &n);
+ ret = push_ascii_talloc(
+ pointers, (char **)(void *)&pointers[i].data,
+ s, &n);
if (!ret) {
return false;
}
@@ -91,8 +94,10 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx,
j = va_arg(ap, int);
intargs[i] = j;
s = va_arg(ap, char *);
- ret = push_ucs2_talloc(pointers, (smb_ucs2_t **)&pointers[i].data,
- s, &n);
+ ret = push_ucs2_talloc(
+ pointers,
+ (smb_ucs2_t **)(void *)&pointers[i].data,
+ s, &n);
if (!ret) {
return false;
}
@@ -230,7 +235,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
ps = va_arg(ap, char **);
if (len1 == 0 && len2 == 0) {
- *ps = discard_const("");
+ *ps = (char *)discard_const("");
} else {
/* make sure its in the right format - be strict */
if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) {
@@ -257,7 +262,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
goto cleanup;
}
} else {
- (*ps) = discard_const("");
+ (*ps) = (char *)discard_const("");
}
}
break;
@@ -270,7 +275,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
ps = (char **)va_arg(ap, char **);
/* make sure its in the right format - be strict */
if (len1 == 0 && len2 == 0) {
- *ps = discard_const("");
+ *ps = (char *)discard_const("");
} else {
if ((len1 != len2) || (ptr + len1 < ptr) || (ptr + len1 < len1) || (ptr + len1 > blob->length)) {
ret = false;
@@ -293,7 +298,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
goto cleanup;
}
} else {
- (*ps) = discard_const("");
+ (*ps) = (char *)discard_const("");
}
}
break;
diff --git a/libcli/auth/ntlm_check.c b/libcli/auth/ntlm_check.c
index 2cfe8e1ef8..978f0fe1be 100644
--- a/libcli/auth/ntlm_check.c
+++ b/libcli/auth/ntlm_check.c
@@ -322,7 +322,7 @@ NTSTATUS ntlm_password_check(TALLOC_CTX *mem_ctx,
if (lm_response->length &&
(convert_string_talloc(mem_ctx, CH_DOS, CH_UNIX,
lm_response->data, lm_response->length,
- (void **)&unix_pw, NULL, false))) {
+ (void *)&unix_pw, NULL, false))) {
if (E_deshash(unix_pw, client_lm.hash)) {
lm_ok = true;
} else {
diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
index 7659446b75..8d07b94806 100644
--- a/libcli/auth/smbencrypt.c
+++ b/libcli/auth/smbencrypt.c
@@ -231,14 +231,14 @@ bool ntv2_owf_gen(const uint8_t owf[16],
domain_byte_len = domain_byte_len - 2;
hmac_md5_init_limK_to_64(owf, 16, &ctx);
- hmac_md5_update((const void *)user, user_byte_len, &ctx);
- hmac_md5_update((const void *)domain, domain_byte_len, &ctx);
+ hmac_md5_update((uint8_t *)user, user_byte_len, &ctx);
+ hmac_md5_update((uint8_t *)domain, domain_byte_len, &ctx);
hmac_md5_final(kr_buf, &ctx);
#ifdef DEBUG_PASSWORD
DEBUG(100, ("ntv2_owf_gen: user, domain, owfkey, kr\n"));
- dump_data(100, (const void *)user, user_byte_len);
- dump_data(100, (const void *)domain, domain_byte_len);
+ dump_data(100, (uint8_t *)user, user_byte_len);
+ dump_data(100, (uint8_t *)domain, domain_byte_len);
dump_data(100, owf, 16);
dump_data(100, kr_buf, 16);
#endif