diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-03-09 09:47:59 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-03-23 12:21:13 +0100 |
| commit | c16c90a1cb3b0e2ceadd3dea835a4e69acfc2fae (patch) | |
| tree | da998f5b8d22a1183603e8d21f82035ffa52a6ec /source3/param | |
| parent | 2654653f55ed5744cc9fca6a79127386f55425e1 (diff) | |
| download | samba-c16c90a1cb3b0e2ceadd3dea835a4e69acfc2fae.tar.gz samba-c16c90a1cb3b0e2ceadd3dea835a4e69acfc2fae.tar.bz2 samba-c16c90a1cb3b0e2ceadd3dea835a4e69acfc2fae.zip | |
s3:smbd: use new simplified snb_signing code in the server
We keep the seqnum/mid mapping in the smb_request structure.
This also moves one global variable into the
smbd_server_connection struct.
metze
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f49a1bc4c9..8460fea567 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -9572,15 +9572,20 @@ uint32 lp_get_spoolss_state( void ) Ensure we don't use sendfile if server smb signing is active. ********************************************************************/ -bool lp_use_sendfile(int snum) +bool lp_use_sendfile(int snum, struct smb_signing_state *signing_state) { + bool sign_active = false; + /* Using sendfile blows the brains out of any DOS or Win9x TCP stack... JRA. */ if (Protocol < PROTOCOL_NT1) { - return False; + return false; + } + if (signing_state) { + sign_active = smb_signing_is_active(signing_state); } return (_lp_use_sendfile(snum) && (get_remote_arch() != RA_WIN95) && - !srv_is_signing_active()); + !sign_active); } /******************************************************************* |