From d57c055478a34b9c4a0fc7ba90d20f510d0df797 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 20 Dec 1997 10:52:00 +0000 Subject: loadparm.c: Added fix for veto oplock files bug from Charles Hoch server.c, util.c: Added fix for oplock break requests blocking due to server being blocked in read call. Bug found by Charles Hoch . Jeremy. (This used to be commit 209f894fdbcfbf7a7952b6228342b86e088a9582) --- source3/smbd/server.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source3/smbd') diff --git a/source3/smbd/server.c b/source3/smbd/server.c index bf66e1ca4b..76a9fb272a 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -2595,6 +2595,8 @@ static void process_smb(char *inbuf, char *outbuf) if (msg_type == 0) show_msg(inbuf); + else if(msg_type == 0x85) + return; /* Keepalive packet. */ nread = construct_reply(inbuf,outbuf,nread,max_send); @@ -3142,6 +3144,13 @@ BOOL receive_next_smb(int smbfd, int oplockfd, char *inbuf, int bufsize, int tim process_local_message(oplock_sock, inbuf, bufsize); continue; } + + if(ret && (CVAL(inbuf,0) == 0x85)) + { + /* Keepalive packet. */ + got_smb = False; + } + } while(ret && !got_smb); -- cgit