760f23a8e2
s3:smb2_negprot: allow really large io sizes up to allmost 16MB
...
The default is still 8MB (as on Windows 2012 *).
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-30 23:35:08 +02:00
321404ac25
fileserver: raise debug level for share connection closing for non-IPC to 2.
...
This reduces spamming during 'make test' runs.
This change is consistent with aad5eeb9b4
, which raised the log level for logging of new non-IPC connections.
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org >
Change-Id: I4343570c8d6158b6715e514a8a7cd323a9c727ae
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-28 01:32:09 +02:00
d7d70c0d3c
smbd:smb2: improve smbd_smb2_protocol_dialect_match(), removing code duplication
...
Signed-off-by: Michael Adam <obnox@samba.org >
Reviewed-by: Volker Lendecke <vl@samba.org >
2014-09-27 10:17:05 +02:00
01026363dd
s3:messaging: add fds-array to messaging_send_iov()
...
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org >
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Signed-off-by: Michael Adam <obnox@samba.org >
2014-09-24 08:44:12 +02:00
31d3224550
smbd: fix a comment typo.
...
Signed-off-by: Michael Adam <obnox@samba.org >
Reviewed-by: Stefan Metzmacher <metze@samba.org >
Autobuild-User(master): Michael Adam <obnox@samba.org >
Autobuild-Date(master): Sun Sep 21 22:43:55 CEST 2014 on sn-devel-104
2014-09-21 22:43:55 +02:00
89c6d67124
s3:smb2_sesssetup: we don't need to do a 2nd smb2srv_session_lookup()
...
For the continuation of a SMB2 SessionSetup we already have the
smb2req->session (with NT_STATUS_MORE_PROCESSING_REQUIRED).
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:13 +02:00
5003232c44
s3:smb2_server: add smbd_smb2_signing_key() helper function
...
This will find the correct signing key for the connection.
If there's already a channel session key, we need to use that
otherwise we need to use the global session key.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:13 +02:00
6ed4eebe19
s3:smbXsrv_session: add smbXsrv_session_find_channel()
...
This function can check if a smbXsrv_connection is already bound to
a smbXsrv_session.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:13 +02:00
cd7c24a9b1
s3:smbXsrv_session: remember the smbXsrv_connection on channel attached to a session
...
A session will be usable from multiple connections in future.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:13 +02:00
e773851c73
s3:smbd: split out a smbd_add_connection() helper function.
...
This attaches a smbXsrv_connection to a smbXsrv_client structure.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:13 +02:00
7a45ddbaca
s3:smbd: remove now unused smbd_server_connection->conn
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:13 +02:00
0944797fef
s3:smb2_lock: iterate over all sconn->client->connections
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
1d53557df5
s3:smb2_lock: always use tevent_req_defer_callback() if we go async
...
process_blocking_lock_queue_smb2() can call reprocess_blocked_smb2_lock()
multiple times, which results in multiple tevent_req_done() calls.
As we could disconnect the connection from there,
process_blocking_lock_queue_smb2() could crash as the local state might be
destroyed.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
04a9b0a7b2
s3:smb2_glue: remove chained fsps from all connections in remove_smb2_chained_fsp()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
6e28bf174b
s3:smb2_break: use fsp->conn->sconn->client->connections to send SMB2 oplock breaks
...
This means we use the first connection for now.
TODO: we may need to use the connection on which the SMB2 create was done
and fallback to other connections.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
33bffc3258
s3:smb2_break: pass smbXsrv_connection to smbd_smb2_send_oplock_break()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
a6ff17f978
s3:smb2_create: pass smbXsrv_connection to *deferred*_smb2
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
56d454b4ae
s3:smbd: pass smbXsrv_connection to schedule_deferred_open_message_smb()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
b05ae37da6
s3:smbd: pass smbXsrv_connection to remove_deferred_open_message_smb()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
d8cffad8e0
s3:smbd: pass smbXsrv_connection to open_was_deferred()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
333707fa37
s3:smbd: move smbXsrv_{session,tcon,open} tables to smbXsrv_client
...
These should be per client (based on the SMB >= 2.1 client_guid),
this is a preparation for multi-channel support.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
1d615ee923
s3:smbd: use tevent_loop_wait() in the parent smbd process.
...
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org >
Signed-off-by: Michael Adam <obnox@samba.org >
Signed-off-by: Stefan Metzmacher <metze@samba.org >
2014-09-19 09:15:12 +02:00
9afc37bef4
s3:smbd: use tevent_loop_wait() in the child process event loop
...
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org >
Signed-off-by: Michael Adam <obnox@samba.org >
Signed-off-by: Stefan Metzmacher <metze@samba.org >
2014-09-19 09:15:12 +02:00
80e226ddae
s3:smbXsrv_session: change smbXsrv_session->connection to smbXsrv_session->client
...
A session will be usable from multiple connections in future.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
d7e66e59b0
s3:smbd: use fsp->conn->sconn->client->connections to send SMB1 oplock breaks
...
This means we use the first and only connection.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
555b3d18d2
s3:smbd: use sconn->client->connections in keepalive_fn()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
bf22882ed3
s3:smbd: use sconn->client->connections in reload_services()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
7012008eb6
s3:smbd: remove now unused smbXsrv_connection->sconn
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
4a5ca44770
s3:smbXsrv_open: use xconn->client->sconn in smb1srv_open_table_init()
...
conn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
f9d65d4764
s3:smbXsrv_session: use xconn->client->sconn in smbXsrv_session_logoff()
...
conn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
e2af19a5d8
s3:smb2_server: use xconn->client->sconn in smbd_smb2_request_next_incoming()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
4bece82dd6
s3:smb2_server: use xconn->client->sconn in smbd_smb2_request_create()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
fe00c8e436
s3:smb2_server: use xconn->client->sconn in smbd_smb2_first_negprot()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
b970db154a
s3:smb2_server: use xconn->client->sconn in smbd_smb2_io_handler()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
f3fa664ea5
s3:smbd: use xconn->client->sconn in make_connection_snum()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:12 +02:00
981fb261c9
s3:smbd: use xconn->client->sconn in smb1_parse_chain()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
d83ecf5b1d
s3:smbd: use xconn->client->sconn in construct_reply()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
fda21db351
s3:smbd: use xconn->client->sconn in reply_special()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
78951fb099
s3:smbd: use xconn->client->sconn in process_smb()
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
e23785ae37
s3:smbd: introduce 'struct smbXsrv_client' in order to prepare multi-channel support
...
This structure is supposed to hold the global state shared between
multiple connections from the same client.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
d27ae4a14a
s3:smbd: pass smbXsrv_connection to make_connection_snum()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
2405415583
s3:smbd: pass smb_request to make_connection_smb1()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
2dd215919d
s3:smbd: pass smbd_smb2_request to make_connection_smb2()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
21eee0ea05
s3:smbd: pass smb_request to make_connection()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
7408736d9d
s3:smbd: pass smbXsrv_connection to construct_reply*()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
3a26bd1a3d
s3:smbd: pass smbXsrv_connection to smb1_parse_chain()
...
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
7c1553fe89
s3:smbd: support xconn=NULL in init_smb_request()
...
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org >
Signed-off-by: Michael Adam <obnox@samba.org >
Signed-off-by: Stefan Metzmacher <metze@samba.org >
2014-09-19 09:15:11 +02:00
0b99a8ac45
s3:smbd: only pass smbXsrv_connection to fork_echo_handler()
...
We don't need smbd_server_connection there.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
92d2748303
s3:smbd: use req->sconn in reply.c where possible
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00
47f00fee35
s3:smbd: use req->sconn in sesssetup.c
...
xconn->sconn will go away soon.
Signed-off-by: Stefan Metzmacher <metze@samba.org >
Reviewed-by: Michael Adam <obnox@samba.org >
2014-09-19 09:15:11 +02:00