summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-08-25 21:46:49 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-08-25 21:46:49 +0000
commitb97a387c0ff29bcafacc8109069e1c2f3cce7c1b (patch)
tree77bd610fb52c206151327d14cb53a64db586ccfc
parentf73039b2251a80020a0337da0263dffa83d380ad (diff)
downloadsamba-b97a387c0ff29bcafacc8109069e1c2f3cce7c1b.tar.gz
samba-b97a387c0ff29bcafacc8109069e1c2f3cce7c1b.tar.bz2
samba-b97a387c0ff29bcafacc8109069e1c2f3cce7c1b.zip
Patch from mimir to back out idra's attempted DOS mitigation patch.
(It broke port 139 name exchange) I've been thinking about this, and doing is properly is actually rather difficult - but I'll try and get somthing in there. (My worry is what smb_read_error should be set to, and how that interacts with the rest of samba). Andrew Bartlett (This used to be commit 3e682867bbb13dae265cb9a8acea8b7cc87d82a6)
-rw-r--r--source3/lib/util_sock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 03c780f8bf..56ef4a6ab1 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -585,8 +585,8 @@ BOOL receive_smb(int fd,char *buffer, unsigned int timeout)
memset(buffer,'\0',smb_size + 100);
len = read_smb_length_return_keepalive(fd,buffer,timeout);
- if (len < 0 || len == 0) {
- DEBUG(10,("receive_smb: length < 0 or == 0!\n"));
+ if (len < 0) {
+ DEBUG(10,("receive_smb: length < 0!\n"));
/*
* Correct fix. smb_read_error may have already been