diff options
| author | Jeremy Allison <jra@samba.org> | 2011-03-28 13:26:27 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-03-28 23:12:07 +0200 |
| commit | 52602e4f5ad0f7c3cdb4a50dfe32d0b8ad49b6e4 (patch) | |
| tree | 69911fe6eca738368d497107032f3a3b084058b6 /libcli/auth/ntlmssp_sign.c | |
| parent | fbe19ba39843d0c70758fc8d775b085a67224a94 (diff) | |
| download | samba-52602e4f5ad0f7c3cdb4a50dfe32d0b8ad49b6e4.tar.gz samba-52602e4f5ad0f7c3cdb4a50dfe32d0b8ad49b6e4.tar.bz2 samba-52602e4f5ad0f7c3cdb4a50dfe32d0b8ad49b6e4.zip | |
Fix inspired by work done by David Disseldorp for bug #8040 - smbclient segfaults when a Cyrillic netbios name or workgroup is configured.
Change msrpc_gen to return NTSTATUS and ensure everywhere this is
used it is correctly checked to return that status.
Jeremy.
Diffstat (limited to 'libcli/auth/ntlmssp_sign.c')
| -rw-r--r-- | libcli/auth/ntlmssp_sign.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libcli/auth/ntlmssp_sign.c b/libcli/auth/ntlmssp_sign.c index 0e57c07a8d..42b459c6d4 100644 --- a/libcli/auth/ntlmssp_sign.c +++ b/libcli/auth/ntlmssp_sign.c @@ -130,17 +130,17 @@ static NTSTATUS ntlmssp_make_packet_signature(struct ntlmssp_state *ntlmssp_stat dump_data_pw("ntlmssp v2 sig ", sig->data, sig->length); } else { - bool ok; + NTSTATUS status; uint32_t crc; crc = crc32_calc_buffer(data, length); - ok = msrpc_gen(sig_mem_ctx, + status = msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, ntlmssp_state->crypt->ntlm.seq_num); - if (!ok) { - return NT_STATUS_NO_MEMORY; + if (!NT_STATUS_IS_OK(status)) { + return status; } ntlmssp_state->crypt->ntlm.seq_num++; @@ -307,17 +307,17 @@ NTSTATUS ntlmssp_seal_packet(struct ntlmssp_state *ntlmssp_state, sig->data+4, 8); } } else { - bool ok; + NTSTATUS status; uint32_t crc; crc = crc32_calc_buffer(data, length); - ok = msrpc_gen(sig_mem_ctx, + status = msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, ntlmssp_state->crypt->ntlm.seq_num); - if (!ok) { - return NT_STATUS_NO_MEMORY; + if (!NT_STATUS_IS_OK(status)) { + return status; } /* |