svn commit: samba r8165 - in trunk/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-07-05 11:21:15 +0000 (Tue, 05 Jul 2005)
New Revision: 8165

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8165

Log:
Two fixes for process_local_message:

If we can not parse the kernel oplock message, return. Otherwise we will end
up reading uninitialized variables inode, dev and file_id.

If we don't have counted oplocks, actually return. This is not a bugfix in its
strictest sense, but we should match the comment.

Volker

Modified:
   trunk/source/smbd/oplock.c


Changeset:
Modified: trunk/source/smbd/oplock.c
===================================================================
--- trunk/source/smbd/oplock.c	2005-07-05 10:57:39 UTC (rev 8164)
+++ trunk/source/smbd/oplock.c	2005-07-05 11:21:15 UTC (rev 8165)
@@ -366,6 +366,7 @@
 			} 
 			if (!koplocks->parse_message(msg_start, msg_len, &inode, &dev, &file_id)) {
 				DEBUG(0,("kernel oplock break parse failure!\n"));
+				return False;
 			}
 			break;
 
@@ -463,6 +464,7 @@
 		 */
 		DEBUG(3,("process_local_message: oplock break requested with no outstanding \
 oplocks. Returning success.\n"));
+		return True;
 	}
 
 	/*