Back out 1.16.2.3:

[samba.git] / source3 / lib / util_sock.c

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index daab7933daa17ec2f00d570e9882f1db0fec841d..45beb38ac9e2560bb17e065b711ae833209ddfcf 100644 (file)
--- 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"));
        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;

        }
 
        /*
        }
 
        /*