sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

smbd: Change protocol selection to not use "sconn->using_smb2"

Browse Source 
To me this is pretty confusing, it seems to overload this struct
element.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
This commit is contained in:
Volker Lendecke 2024-02-13 12:56:17 +01:00 committed by Martin Schwenke
parent 7e621b1b53
commit f1bb46ad4e
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/smbd/smb2_process.c
View File

@ -587,7 +587,7 @@ void process_smb(struct smbXsrv_connection *xconn,
} }
#if defined(WITH_SMB1SERVER) #if defined(WITH_SMB1SERVER)
if (sconn->using_smb2) { if (lp_server_max_protocol() >= PROTOCOL_SMB2_02) {
/* At this point we're not really using smb2, /* At this point we're not really using smb2,
* we make the decision here.. */ * we make the decision here.. */
if (smbd_is_smb2_header(inbuf, nread)) { if (smbd_is_smb2_header(inbuf, nread)) {
@ -605,7 +605,7 @@ void process_smb(struct smbXsrv_connection *xconn,
&& CVAL(inbuf, smb_com) != 0x72) { && CVAL(inbuf, smb_com) != 0x72) {
/* This is a non-negprot SMB1 packet. /* This is a non-negprot SMB1 packet.
Disable SMB2 from now on. */ Disable SMB2 from now on. */
sconn->using_smb2 = false; lp_do_parameter(-1, "server max protocol", "NT1");
} }
} }
process_smb1(xconn, inbuf, nread, unread_bytes, seqnum, encrypted); process_smb1(xconn, inbuf, nread, unread_bytes, seqnum, encrypted);
@ -1876,21 +1876,6 @@ void smbd_process(struct tevent_context *ev_ctx,
exit_server("pthreadpool_tevent_init() failed."); exit_server("pthreadpool_tevent_init() failed.");
} }
#if defined(WITH_SMB1SERVER)
if (lp_server_max_protocol() >= PROTOCOL_SMB2_02) {
#endif
/*
* We're not making the decision here,
* we're just allowing the client
* to decide between SMB1 and SMB2
* with the first negprot
* packet.
*/
sconn->using_smb2 = true;
#if defined(WITH_SMB1SERVER)
}
#endif
if (!interactive) { if (!interactive) {
smbd_setup_sig_term_handler(sconn); smbd_setup_sig_term_handler(sconn);
smbd_setup_sig_hup_handler(sconn); smbd_setup_sig_hup_handler(sconn);