samba-cvs.cvs
[Top] [All Lists]

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

Subject: svn commit: samba r15952 - in trunk/source/smbd: .
From:
Date: Tue, 30 May 2006 05:24:24 +0000 GMT
Author: jra
Date: 2006-05-30 05:24:21 +0000 (Tue, 30 May 2006)
New Revision: 15952

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

Log:
oplock_request must be an int, not a BOOL. We
were getting away with mixing types. Not cool.
Jeremy.

Modified:
   trunk/source/smbd/reply.c


Changeset:
Modified: trunk/source/smbd/reply.c
===================================================================
--- trunk/source/smbd/reply.c   2006-05-30 05:24:21 UTC (rev 15951)
+++ trunk/source/smbd/reply.c   2006-05-30 05:24:21 UTC (rev 15952)
@@ -1433,9 +1433,9 @@
        uint32 smb_attr = SVAL(inbuf,smb_vwv5);
        /* Breakout the oplock request bits so we can set the
                reply bits separately. */
-       BOOL ex_oplock_request = EXTENDED_OPLOCK_REQUEST(inbuf);
-       BOOL core_oplock_request = CORE_OPLOCK_REQUEST(inbuf);
-       BOOL oplock_request = ex_oplock_request | core_oplock_request;
+       int ex_oplock_request = EXTENDED_OPLOCK_REQUEST(inbuf);
+       int core_oplock_request = CORE_OPLOCK_REQUEST(inbuf);
+       int oplock_request = ex_oplock_request | core_oplock_request;
 #if 0
        int smb_sattr = SVAL(inbuf,smb_vwv4); 
        uint32 smb_time = make_unix_date3(inbuf+smb_vwv6);

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r15952 - in trunk/source/smbd: ., jra <=