summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-05-30 05:24:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:14 -0500
commitbef4969247da237e7b50fd2abd207de92e9bc980 (patch)
tree260e8121efd90036fd550b508f55e8e16285c23f
parent41f139c0bbe02ac4abe15d1e540fe9bff8cff5a5 (diff)
downloadsamba-bef4969247da237e7b50fd2abd207de92e9bc980.tar.gz
samba-bef4969247da237e7b50fd2abd207de92e9bc980.tar.bz2
samba-bef4969247da237e7b50fd2abd207de92e9bc980.zip
r15951: oplock_request must be an int, not a BOOL. We
were getting away with mixing types. Not cool. Jeremy. (This used to be commit ad3bc112a21afd3a04449ec3f604e017d753c224)
-rw-r--r--source3/smbd/reply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 387ed4a47f..d333ebf32e 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1433,9 +1433,9 @@ int reply_open_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
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);