Jeremy Allison
9caa467cc2
s3: smbd: Rename srv_set_message() -> srv_smb1_set_message().
...
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>
2022-04-07 17:37:30 +00:00
Jeremy Allison
d949073e0d
s3: smbd: Rename valid_smb_header() -> valid_smb1_header()
...
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>
2022-04-07 17:37:30 +00:00
David Mulder
e17ad24c02
smbd: Remove srv_send_smb
...
Signed-off-by: David Mulder <dmulder@suse.com>
Signed-off-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
a48bf2431e
smbd: Remove uses of srv_send_smb
...
Replace them with direct calls to smb1_srv_send
and smb2_srv_send.
Signed-off-by: David Mulder <dmulder@suse.com>
Signed-off-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
536330d2eb
smbd: Move reply_pipe_write to smb1_pipes.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Signed-off-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
085b16e0c2
smbd: Process error reply if SMB1 negprot parsing fails
...
Signed-off-by: David Mulder <dmulder@suse.com>
Signed-off-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
aa61db2d0b
smbd: Enable multi-protocol negotiate w/out SMB1
...
This enables the multi-protocol negotiate when
the SMB1 build is disabled. It requires enabling
parts of the SMB1 negotiation.
Signed-off-by: David Mulder <dmulder@suse.com>
Signed-off-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
f0ae7fba87
smbd: Move init_smb_request to smb2_process.c
...
init_smb_request is needed for a multi-protocol
negotiation.
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
ed23ce77d9
smbd: Move valid_smb_header to smb2_process.c
...
valid_smb_header is needed for a multi-protocol
negotiation.
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
8084c43252
smbd: Disable use of smb_fn_name when SMB1 is disabled
...
perfcount_test.c was using the smb_fn_name
function, which doesn't exist when SMB1 is
disabled.
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
f810a113a8
smbd: Remove duplicate read_nttrans_ea_list function prototype
...
Because this stray prototype was mixed in with
the smb1 code, it caused the smb2-only build to
fail. Instead of duplicating the function
prototype, lets just include the correct header.
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
858a49d157
smbd: Disable SMB_SET_POSIX_LOCK when SMB1 is disabled
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
941ed7efd2
smbd: Disable SMB_QUERY_CIFS_UNIX_INFO when SMB1 is disable
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
b70c88fb0b
smbd: Disable use of smb_fn_name without SMB1 in error.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
e081b25e07
torture: Disable vfs chain test dependant on SMB1
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
85753e4693
smbd: Move trans2.c -> smb2_trans2.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
Jeremy Allison
b2e52ab97e
s3: smbd: Move reply_findnclose() from trans2.c to smb1_reply.c
...
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>
2022-04-07 17:37:30 +00:00
Jeremy Allison
481b7bfd29
s3: smbd: Move reply_findclose() from trans2.c to smb1_reply.c
...
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>
2022-04-07 17:37:30 +00:00
David Mulder
97136a7a8a
smbd: Move reply_transs2 to smb1_trans2.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
aab698e526
smbd: Move reply_trans2 to smb1_trans2.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
547f5c78ad
smbd: Move smb_set_posix_lock to smb1_trans2.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
88b07d3b7f
smbd: Move send_trans2_replies to smb1_trans2.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
34feb41881
smbd: Move smb1_utils.h include to smbd.h
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
7e1ff0ff35
smbd: Move process.c -> smb1_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
43672e1558
smbd: Move smbd_process to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
2e0e49f41b
smbd: Disable smb1 in smbd_process
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
6f792afe43
smbd: Move smbd_add_connection to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
c43c9ef3ee
smbd: Disable smb1 in smbd_smb2_server_connection_read_handler
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
3d37047f3c
smbd: Disable smb1 in smbd_server_connection_handler
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
e153f4270c
smbd: Disable smb1 in smbd_add_connection
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
7a8f77acb9
smbd: Move smbXsrv_connection_dbg to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
635bf8513b
smbd: Move smbXsrv_connection_init_tables to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
137d29897c
smbd: Disable smb1 in smbXsrv_connection_init_tables
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
f2fc4227a5
smbd: Move process_smb to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
92d18a3599
smbd: Move reply_outbuf and construct_reply_common_req to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
5582077b92
smbd: Move push_deferred_open_message_smb to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:30 +00:00
David Mulder
9e4517468e
smbd: Separate smb1 code from push_deferred_open_message_smb
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
8e3f809953
smbd: Move get_deferred_open_message_state to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
f1cc153ed9
smbd: Move open_was_deferred to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
86452205ab
smbd: Move schedule_deferred_open_message_smb to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
4a4be53530
smbd: Move remove_deferred_open_message_smb to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
7e55512a3b
smbd: Move receive_smb_talloc/smb2_receive_talloc to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
b231372245
smbd: Split receive_smb_talloc into smb1_receive_talloc/smb2_receive_talloc
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
cd111f7269
smbd: Move read_packet_remainder to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
e287f7c27b
smbd: Move srv_set_message to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
08aa1619c6
smbd: Move srv_send_smb/smb2_srv_send to smb2_process.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
8914b9ca8e
smbd: Split srv_send_smb into smb1_srv_send/smb2_srv_send
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
e8c36c25a4
smbd: Split process_smb() into process_smb1() and process_smb2()
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
7439d7eb7d
smbd: Move signing.c -> smb1_signing.c
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00
David Mulder
3e38df7d20
smbd: Disable call to smb1_srv_init_signing without smb1
...
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
2022-04-07 17:37:29 +00:00