summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-03-22 09:06:07 +0100
committerStefan Metzmacher <metze@samba.org>2010-03-22 17:15:14 +0100
commit0c77e3a1bae728de3f48bdce4a82d85007ea9b45 (patch)
treed43ba7a010ad77abc5531f3ca3192037db2cff91 /source3/smbd
parent5a069f7209855e69082a176969533cc0d0ac0f55 (diff)
downloadsamba-0c77e3a1bae728de3f48bdce4a82d85007ea9b45.tar.gz
samba-0c77e3a1bae728de3f48bdce4a82d85007ea9b45.tar.bz2
samba-0c77e3a1bae728de3f48bdce4a82d85007ea9b45.zip
s3:smbd: don't allow SMB2 if the async echo handler is active
metze
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 5b8b42d5bf..288475e183 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2311,7 +2311,8 @@ void smbd_process(void)
char remaddr[INET6_ADDRSTRLEN];
if (lp_maxprotocol() == PROTOCOL_SMB2 &&
- lp_security() != SEC_SHARE) {
+ lp_security() != SEC_SHARE &&
+ !lp_async_smb_echo_handler()) {
smbd_server_conn->allow_smb2 = true;
}