summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2002-02-15 22:20:08 +0000
committerMartin Pool <mbp@samba.org>2002-02-15 22:20:08 +0000
commitae9bac99fa9cda2e480afa10a7c00b37ad4fd255 (patch)
tree5d8cfcbc5dd88a44a9a5fffebba376915da91422
parent62ee445422bf38a9049cb84a99321055bfec8d0b (diff)
downloadsamba-ae9bac99fa9cda2e480afa10a7c00b37ad4fd255.tar.gz
samba-ae9bac99fa9cda2e480afa10a7c00b37ad4fd255.tar.bz2
samba-ae9bac99fa9cda2e480afa10a7c00b37ad4fd255.zip
Back out 1.16.2.3:
receive_smb: You might think that we ought to set smb_read_error here, but apparently that breaks the recursive main loop in oplock.c. Global variables suck. :-/ (This used to be commit b6d5d02aa1bf0caa28343dc87444f049c5fd8ce5)
-rw-r--r--source3/lib/util_sock.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index daab7933da..45beb38ac9 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -663,7 +663,11 @@ BOOL receive_smb(int fd,char *buffer, unsigned int timeout)
len = read_smb_length_return_keepalive(fd,buffer,timeout);
if (len < 0) {
DEBUG(10,("receive_smb: length < 0!\n"));
- return(False);
+ /* XXX: You might think that we ought to set
+ * smb_read_error here, but apparently that breaks the
+ * recursive main loop in oplock.c. Global variables
+ * suck. */
+ return False;
}
/*