summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-15 02:54:39 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-15 02:54:39 +0200
commitd6e5204807fcd5a84b8b3b5d3717d352f6852b22 (patch)
treec07dec84d4050f5f64e319e0ad00767faf78111d
parentaaa3e0425d8394c36a6211ddbd76837b5b3e3e56 (diff)
parent16bbfc22629ea9e9aebc6164cae28a6b031cd9e0 (diff)
downloadsamba-d6e5204807fcd5a84b8b3b5d3717d352f6852b22.tar.gz
samba-d6e5204807fcd5a84b8b3b5d3717d352f6852b22.tar.bz2
samba-d6e5204807fcd5a84b8b3b5d3717d352f6852b22.zip
Merge branch 'master' of git://git.samba.org/samba
-rw-r--r--source3/libsmb/async_smb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 68495076b6..d371e057e3 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -697,7 +697,7 @@ NTSTATUS cli_pull_reply(struct async_req *req,
*/
-static NTSTATUS validate_smb_crypto(struct cli_state *cli, uint8_t *pdu)
+static NTSTATUS validate_smb_crypto(struct cli_state *cli, char *pdu)
{
NTSTATUS status;
@@ -710,7 +710,7 @@ static NTSTATUS validate_smb_crypto(struct cli_state *cli, uint8_t *pdu)
if (cli_encryption_on(cli) && CVAL(pdu, 0) == 0) {
uint16_t enc_ctx_num;
- status = get_enc_ctx_num(pdu, &enc_ctx_num);
+ status = get_enc_ctx_num((uint8_t *)pdu, &enc_ctx_num);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("get_enc_ctx_num returned %s\n",
nt_errstr(status)));