diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 19:00:46 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 19:00:46 +0200 |
commit | 87e4e0e9406a4805c0116652b2ea34114acc279a (patch) | |
tree | cdc67a526490daed41730599dd55bad052fdee4d /source3/libsmb/async_smb.c | |
parent | 661d25402ecb36a35bee6b282440854f5280781a (diff) | |
parent | f4293618a712ca7ce59b7d695e2e3d918ddbb542 (diff) | |
download | samba-87e4e0e9406a4805c0116652b2ea34114acc279a.tar.gz samba-87e4e0e9406a4805c0116652b2ea34114acc279a.tar.bz2 samba-87e4e0e9406a4805c0116652b2ea34114acc279a.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc
Conflicts:
source3/Makefile.in
Diffstat (limited to 'source3/libsmb/async_smb.c')
-rw-r--r-- | source3/libsmb/async_smb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index d5eac07b48..fb35ecbe1f 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, char *pdu) +static NTSTATUS validate_smb_crypto(struct cli_state *cli, uint8_t *pdu) { NTSTATUS status; @@ -710,7 +710,7 @@ static NTSTATUS validate_smb_crypto(struct cli_state *cli, char *pdu) if (cli_encryption_on(cli) && CVAL(pdu, 0) == 0) { uint16_t enc_ctx_num; - status = get_enc_ctx_num((uint8_t *)pdu, &enc_ctx_num); + status = get_enc_ctx_num(pdu, &enc_ctx_num); if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("get_enc_ctx_num returned %s\n", nt_errstr(status))); |