diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-24 10:53:06 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-24 10:53:06 +1100 |
| commit | 0e3339a46b1747156f35d136dbbc93b503b85b1c (patch) | |
| tree | 783aafc4b94db5ba1be889cbe4b44363dfee5d54 /source3/param/loadparm.c | |
| parent | 7f113904eba5361d963075bcea7e36fd98ca34aa (diff) | |
| parent | 36b957b5b7a1f70e39eeef224820739f24b999c9 (diff) | |
| download | samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.gz samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.bz2 samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/param/loadparm.c')
| -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); } /******************************************************************* |