diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-07-08 09:19:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-08 12:35:56 +0200 |
| commit | cda86869400285afe17db87a9a666fbcc5b918a8 (patch) | |
| tree | d5e36a1f276729a827c2303bdfad56b8aacff55f /source3/smbd/smb2_read.c | |
| parent | cf406f7e7d58b9c993ba1ddc6471fa85e445ba88 (diff) | |
| download | samba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.gz samba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.bz2 samba-cda86869400285afe17db87a9a666fbcc5b918a8.zip | |
lib/param: Merge struct loadparm_service into common
This is handled by a common header and a .c file that is included into
both loadparm.c files.
In the process, _lp functions were renamed to lp__ to allow the common
function definition declarations to be used by source3 and source4
(which have different macro definitions).
The only parameter to change type is 'strict_locking' which was a
bool, and is now an int, to accommodate the 'Auto' value from source3.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Jul 8 12:35:56 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/smbd/smb2_read.c')
| -rw-r--r-- | source3/smbd/smb2_read.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 996f8d46ae..8c3a8fd877 100644 --- a/source3/smbd/smb2_read.c +++ b/source3/smbd/smb2_read.c @@ -288,7 +288,7 @@ static NTSTATUS schedule_smb2_sendfile_read(struct smbd_smb2_request *smb2req, * reads on most normal files. JRA. */ - if (!_lp_use_sendfile(SNUM(fsp->conn)) || + if (!lp__use_sendfile(SNUM(fsp->conn)) || smb2req->do_signing || smb2req->in.vector_count != 4 || (fsp->base_fsp != NULL) || |