summaryrefslogtreecommitdiffstats
path: root/source3/smbd/negprot.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-03-09 18:59:16 +0000
committerGerald Carter <jerry@samba.org>2001-03-09 18:59:16 +0000
commit0bfc10011bd5cacecda8b59c36e80f676e5c7fa3 (patch)
treec697a708da79caa3291c7844eb2148bccdf869ac /source3/smbd/negprot.c
parent53a331cfb271bd64bb26d0d433439e249adbbe71 (diff)
downloadsamba-0bfc10011bd5cacecda8b59c36e80f676e5c7fa3.tar.gz
samba-0bfc10011bd5cacecda8b59c36e80f676e5c7fa3.tar.xz
samba-0bfc10011bd5cacecda8b59c36e80f676e5c7fa3.zip
merge of 'lanman auth' and 'min protocol' from 2.2
(This used to be commit 1d84da779a0fe3219d77686a493d2b2fa1f8072a)
Diffstat (limited to 'source3/smbd/negprot.c')
-rw-r--r--source3/smbd/negprot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 41e95b816df..74d8eb39833 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -411,7 +411,8 @@ int reply_negprot(connection_struct *conn,
{
p = smb_buf(inbuf)+1;
Index = 0;
- if (lp_maxprotocol() >= supported_protocols[protocol].protocol_level)
+ if ((supported_protocols[protocol].protocol_level <= lp_maxprotocol()) &&
+ (supported_protocols[protocol].protocol_level >= lp_minprotocol()))
while (p < (smb_buf(inbuf) + bcc))
{
if (strequal(p,supported_protocols[protocol].proto_name))