diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 15:31:02 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 15:31:02 +0100 |
commit | 1e200c1952adab450909ac35252be4636c3e1053 (patch) | |
tree | 575e1337aaec5cf8decb10567a4876c1650441c6 /source3/param | |
parent | ca202cf464aec82e63be4b2160f394f56b8c195e (diff) | |
parent | 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (diff) | |
download | samba-1e200c1952adab450909ac35252be4636c3e1053.tar.gz samba-1e200c1952adab450909ac35252be4636c3e1053.tar.bz2 samba-1e200c1952adab450909ac35252be4636c3e1053.zip |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/param')
-rw-r--r-- | source3/param/loadparm.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f49a1bc4c9..66fb8bf1bc 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -9542,10 +9542,6 @@ const char *lp_printcapname(void) return PRINTCAP_NAME; } -/******************************************************************* - Ensure we don't use sendfile if server smb signing is active. -********************************************************************/ - static uint32 spoolss_state; bool lp_disable_spoolss( void ) @@ -9572,15 +9568,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); } /******************************************************************* |