diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-26 17:12:36 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-26 17:12:36 -0800 |
| commit | afc93255d183eefb68e45b8ec6275f6a62cf9795 (patch) | |
| tree | 712efc0cd3c95d30c0e44055b25807c41533bc1f /source3/param | |
| parent | 23c965d9472058c566a1b9f8a44964acd5c8a446 (diff) | |
| download | samba-afc93255d183eefb68e45b8ec6275f6a62cf9795.tar.gz samba-afc93255d183eefb68e45b8ec6275f6a62cf9795.tar.bz2 samba-afc93255d183eefb68e45b8ec6275f6a62cf9795.zip | |
Add SMB encryption. Still fixing client decrypt but
negotiation works.
Jeremy.
(This used to be commit d78045601af787731f0737b8627450018902b104)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 5b009fc964..7186d4f075 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -6209,7 +6209,7 @@ uint32 lp_get_spoolss_state( void ) } /******************************************************************* - Ensure we don't use sendfile if server smb signing is active. + Ensure we don't use sendfile if server smb signing or selaing is active. ********************************************************************/ bool lp_use_sendfile(int snum) @@ -6218,7 +6218,10 @@ bool lp_use_sendfile(int snum) if (Protocol < PROTOCOL_NT1) { return False; } - return (_lp_use_sendfile(snum) && (get_remote_arch() != RA_WIN95) && !srv_is_signing_active()); + return (_lp_use_sendfile(snum) && + (get_remote_arch() != RA_WIN95) && + !srv_is_signing_active() && + !srv_encryption_on()); } /******************************************************************* |