sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

libcli/smb: don't overwrite status code

Browse Source 
The original commit c5cd22b5bb from bug
9175 never worked, as the preceeding signing check overwrote the status
variable.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=9175

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Tue Nov 13 17:28:45 CET 2018 on sn-devel-144

(cherry picked from commit 5a8583ed70)
This commit is contained in:
Ralph Boehme 2018-11-07 14:00:25 +01:00 committed by Karolin Seeger
parent 739ce2c733
commit 2332c99cba
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcli/smb/smbXcli_base.c
View File

@ -3908,15 +3908,17 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
}
if (signing_key) {
status = smb2_signing_check_pdu(*signing_key,
state->conn->protocol,
&cur[1], 3);
if (!NT_STATUS_IS_OK(status)) {
NTSTATUS signing_status;
signing_status = smb2_signing_check_pdu(*signing_key,
state->conn->protocol,
&cur[1], 3);
if (!NT_STATUS_IS_OK(signing_status)) {
/*
* If the signing check fails, we disconnect
* the connection.
*/
return status;
return signing_status;
}
}

2
selftest/knownfail.d/samba3.smb2.session
View File

@ -1,2 +0,0 @@
^samba3.smb2.session krb5.expire_disconnect\(ad_dc\)
^samba3.smb2.session krb5.expire_disconnect\(ad_member\)