summaryrefslogtreecommitdiff
path: root/source3/smbd/smb2_server.c
AgeCommit message (Collapse)AuthorFilesLines
2011-09-29s3-smb2_server: SMB2_OP_IOCTL doesn't require at least 1 dyn byteDavid Disseldorp1-0/+1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-09-29s3:smb2_server: SMB2_OP_CANCEL requests don't have to be signedStefan Metzmacher1-0/+2
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Thu Sep 29 02:58:41 CEST 2011 on sn-devel-104
2011-09-23s3:smbd: disconnect the socket if we got an unexpected requestStefan Metzmacher1-0/+20
If we got a SMB2_OP_NEGPROT after the protocol is already negotiated or if we got a non SMB2_OP_NEGPROT before the protocol was negotiated we should close the connection (as windows does). metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Fri Sep 23 12:30:50 CEST 2011 on sn-devel-104
2011-09-23s3:smbd: don't call smbd_terminate_connection in smb2_validate_message_id() ↵Stefan Metzmacher1-2/+3
(bug #8476) Only return false and the caller will terminate the connection. metze
2011-09-22Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.Jeremy Allison1-1/+6
Just drop the connection, not SMB_ASSERT. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Thu Sep 22 19:41:31 CEST 2011 on sn-devel-104
2011-09-14s3:smb2_server: SMB2_OP_GETINFO doesn't require at least 1 dyn byteStefan Metzmacher1-1/+13
metze
2011-09-07s3:smb2_server: add smbd_smb2_request_verify_sizes()Stefan Metzmacher1-0/+42
metze
2011-08-31Fix bug 8429 - Compound SMB2 requests on an IPC connection can corrupt the ↵Jeremy Allison1-12/+17
reply stream. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Aug 31 21:18:11 CEST 2011 on sn-devel-104
2011-08-31Based on metze's fix for Bug 8407 - SMB2 server can return requests ↵Jeremy Allison1-2/+38
out-of-order when processing a compound request. (cherry picked from commit 19db1c98c6ba3cb5e883e16e865c44900ce17444)
2011-08-31s3:smb2_server: keep compound_related on struct smbd_smb2_requestStefan Metzmacher1-4/+3
metze (cherry picked from commit cda93f04eb4e7e975b192a5fd33275ec638140ac)
2011-08-12s3:smb2_server: make sure we prefer responses over requests on the client socketStefan Metzmacher1-12/+52
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Fri Aug 12 16:46:43 CEST 2011 on sn-devel-104
2011-08-07s3:smb2_server: make sure we grant credits on async read/write operations ↵Stefan Metzmacher1-6/+15
(bug #8357) Currently we skip, the "gone async" interim response on read and write, this caused the aio code path to grant 0 credits to the client in the read/write responses. metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Sun Aug 7 22:23:57 CEST 2011 on sn-devel-104
2011-07-29Secod part of bugfix for bug #8335 - file copy aborts with ↵Jeremy Allison1-3/+24
smb2_validate_message_id: bad message_id Modify the credit granting algorithm to closer to what I believe Windows does. Split up max_credits into 1/16ths, and then scale the requested credits by how many 16ths have been currently granted. Less than 1/16th == grant all requested (100%), scale down as more have been granted. Never ask for less than 1 if the client asked for at least 1. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Jul 29 20:37:42 CEST 2011 on sn-devel-104
2011-07-20s3-auth use auth_user_info not netr_SamInfo3 in auth3_session_infoAndrew Bartlett1-1/+1
This makes auth3_session_info identical to auth_session_info The logic to convert the info3 to a struct auth_user_info is essentially moved up the stack from the named pipe proxy in source3/rpc_server to create_local_token(). Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-20s3-auth Use struct auth_user_info_unix for unix_name and sanitized_usernameAndrew Bartlett1-2/+2
This is closer to the layout of struct auth_session_info in auth.idl Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-07-08Move smbd_smb2_request_check_tcon() smbd_smb2_request_check_session() next ↵Jeremy Allison1-0/+130
to their only user and make them static. Add comments. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Jul 8 21:01:40 CEST 2011 on sn-devel-104
2011-07-08s3:smb2_server: add some comments about change_to_user() and ↵Stefan Metzmacher1-2/+98
change_to_root_user() metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Fri Jul 8 13:45:46 CEST 2011 on sn-devel-104
2011-07-08lib/util Move bitmap.c to lib/utilAndrew Bartlett1-0/+1
2011-07-08Fix bug #8293 - SMB2 doesn't rotate the log files often enough.Jeremy Allison1-0/+17
Move the num_requests field out of the smb1 struct into the generic struct smbd_server_connection struct. Use it to count SMB2 requests as well as SMB1 and ensure that check_log_size() is called every 50 SMB2 requests. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Jul 8 01:14:53 CEST 2011 on sn-devel-104
2011-07-07s3:smb2_server: call change_to_root_user() or smbd_smb2_request_check_tcon()Stefan Metzmacher1-3/+26
For all requests which don't operate on a tcon, we should call change_to_root_user(), to match the SMB1 behavior. For SMB1 we do the following operations without AS_USER: /* 0x70 */ { "SMBtcon",reply_tcon,0}, /* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR}, /* 0x72 */ { "SMBnegprot",reply_negprot,0}, /* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,0}, /* 0x74 */ { "SMBulogoffX",reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */ /* 0x75 */ { "SMBtconX",reply_tcon_and_X,0}, ... /* 0x2b */ { "SMBecho",reply_echo,0}, ... /* 0xa4 */ { "SMBntcancel",reply_ntcancel, 0 }, For SMB2tdis we still call smbd_smb2_request_check_tcon() as close_cnum() calls change_to_root_user() when needed. metze Signed-off-by: Jeremy Allison <jra@samba.org>
2011-07-04s3:smb2_server: there's no reason to check the session id twice on a ↵Stefan Metzmacher1-5/+0
smb2_tcon request metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Mon Jul 4 17:34:13 CEST 2011 on sn-devel-104
2011-06-29Second part of fix for bug #8219 - SMB Panic from Windows 7 Client.Jeremy Allison1-1/+1
Pass in the correct vector to the signing algorithm in an async response - we must start with vector[1] which has the SMB2_HDR_BODY length, not vector[0] which is the 4 byte packet length. Also note we're passing in 2 vectors not 3. Metze please review. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Jun 29 20:09:21 CEST 2011 on sn-devel-104
2011-06-29Fix bug #8219 - SMB Panic from Windows 7 ClientJeremy Allison1-0/+8
Caused by referencing an uninitialized variable in the duplicated struct smbd_smb2_request when sending a signed intermediate reply. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Jun 29 04:37:28 CEST 2011 on sn-devel-104
2011-05-31s3-globals Remove smbd_event_context() (use server_event_context())Andrew Bartlett1-1/+1
This has been a wrapper around server_event_context() for some time now, and removing this from dummmysmbd.c assists with library dependencies. Andrew Bartlett
2011-05-12s3: Slightly simplify smbd_smb2_request_next_vectorVolker Lendecke1-3/+5
Metze, Jeremy, please check!
2011-05-05More simple const fixes.Jeremy Allison1-4/+4
2011-05-05s3: Fix dup_smb2_vec3Volker Lendecke1-1/+1
Metze, Jeremy, please check! Thanks, Volker Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Thu May 5 13:39:40 CEST 2011 on sn-devel-104
2011-04-29s3-tevent: only include ../lib/util/tevent wrappers where needed.Günther Deschner1-0/+1
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Fri Apr 29 14:00:30 CEST 2011 on sn-devel-104
2011-04-14s3: only include smb profiling where needed.Günther Deschner1-0/+1
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Thu Apr 14 01:31:39 CEST 2011 on sn-devel-104
2011-03-30s3: include smbd/smbd.h where needed.Günther Deschner1-0/+1
Guenther
2011-01-27Change "security=share" to downgrade to SMB1 from SMB2, rather than trying ↵Jeremy Allison1-8/+0
to fake it.
2011-01-17s3: Fix a C++ warningVolker Lendecke1-1/+1
2010-12-21My algorithm for determining whan an incoming sequence number can be allowed ↵Jeremy Allison1-6/+7
is incorrect. (I based it on the text in MS-SMB2, silly me :-). Fix it so incoming sequence numbers can range over the entire allowable bitmap range. This fixes a repeatable disconnect against Win7. Jeremy.
2010-12-20CREATE in a compound CREATE/NOTIFY sequence was being passed through ↵Ken Harris1-17/+17
set_operation_credits() twice (ultimately perhaps because of bug 7331 involving this compound sequence and the need to be ready for any incoming CANCEL of the NOTIFY). This had the server thinking it had granted more credit than it actually had, which lead to zero-credits being granted in interim NOTIFY responses. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Mon Dec 20 20:59:55 CET 2010 on sn-devel-104
2010-12-15Implement "use sendfile = yes" for SMB2. (cherry picked from commit ↵Jeremy Allison1-0/+9
95cb7adcd03a1abbd0af395b6c96dd8e0eebd3d1) Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed Dec 15 02:24:08 CET 2010 on sn-devel-104
2010-12-14Change crediting so that the credits are returned on the interim async response.Jeremy Allison1-4/+7
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Tue Dec 14 01:09:05 CET 2010 on sn-devel-104
2010-12-13We need to start off with smb2.credits_granted == 0. That wayJeremy Allison1-2/+3
when processing the faked up SMB2 NegProt from the SMB1 packet we always allocate one credit on reply. Jeremy.
2010-12-13Remove extra unused credit arg. to smbd_smb2_request_setup_out()Jeremy Allison1-3/+3
2010-12-10Add a SMB2 crediting algorithm, by default the same as Windows. Defaults to ↵Jeremy Allison1-23/+132
128 credits. Jeremy.
2010-08-30s3: Fix some uninitialized variable warningsVolker Lendecke1-1/+1
2010-08-27Fix bug #7653 - When SMB2 is on, Windows 7 clients can not connect as guest ↵Jeremy Allison1-0/+8
to a share. Fix "security = share" with SMB2 by mapping internally to "security = user" and "map to guest = Bad User". Jeremy.
2010-08-16s3: Remove smbd_server_fd from smbd_initialize_smb2Volker Lendecke1-2/+2
2010-07-09s3: Cleanup of the initial SMB2 counters patch.Ira Cooper1-89/+191
This reorganizes smbd_smb2_request_dispatch to have a central exit point, and use the normal profiling macros. Signed-off-by: Jeremy Allison <jra@samba.org>
2010-07-07s3: Add SMB2 performance counters.Ira Cooper1-19/+58
A performance counter was added for every base type of SMB2 op.
2010-06-14SMB2 correctness fix. As we've already returned the credits in an interimJeremy Allison1-0/+2
response, don't add more in the final return. Jeremy.
2010-06-10Ensure we correctly setup req->subreq before testing for async. Stops ↵Jeremy Allison1-4/+4
crashes when XX_send functions set async to stop interim replies being sent. Jeremy.
2010-06-08Second part of fix for 7501 - SMB2: CREATE request replies getting mangled.Jeremy Allison1-67/+67
Based on code from Ira Cooper <samba@ira.wakeful.net>, and also advice on refactoring the patch into a function call. outbuf vectors can be reallocated by smb2 processing code, so when returning interim responses we must not make assumptions about vector size. Jeremy
2010-06-08Fix for bug 7501 - SMB2: CREATE request replies getting mangled.Ira Cooper1-3/+1
Code for dup_smb2_req() was duplicating the wrong vector (i, instead of i+2) when returning a non-minimal SMB2 response.
2010-06-02Ensure we remove SMB2 cancel requests from the active queueJeremy Allison1-0/+1
now we don't remove them in the talloc destructor. Jeremy.
2010-06-02Fix a crash bug found by Ira Cooper <samba@ira.wakeful.net>.Jeremy Allison1-4/+5
A create call comes in, goes async (on the oplock request). At a later time (just before a cancel request is received) it completes, and goes through smbd_smb2_request_reply() to send the reply to the create call. However, the output socket queue is full, so when tstream_writev_queue_send() is called from smbd_smb2_request_reply(), the smb2req stays on the "being processed" queue on sconn->smb2.requests, as only when tstream_writev_queue_send() completes is smbd_smb2_request_writev_done() get called, which will TALLOC_FREE the smb2req (and thus take if off the queue). The cancel comes in, gets processed and looks through the requests on the queue, and BANG - hits the smb2req that has already been processed and is outgoing.... Remove the request from the queue once tstream_writev_queue_send() is called and not in the talloc destructor function. Jeremy.