summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/open.c4
-rw-r--r--source3/smbd/reply.c2
-rw-r--r--source3/torture/torture.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8db4400664..a88dfd5573 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -492,8 +492,8 @@ static int open_mode_check(connection_struct *conn, const char *fname, SMB_DEV_T
BOOL opb_ret;
- DEBUG(5,("open_mode_check: breaking oplock (%x) on file %s, \
-dev = %x, inode = %.0f\n", share_entry->op_type, fname, (unsigned int)dev, (double)inode));
+ DEBUG(5,("open_mode_check: oplock_request = %d, breaking oplock (%x) on file %s, \
+dev = %x, inode = %.0f\n", *p_oplock_request, share_entry->op_type, fname, (unsigned int)dev, (double)inode));
/* Oplock break - unlock to request it. */
unlock_share_entry(conn, dev, inode);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index da73a78a33..2f9898616c 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4343,7 +4343,7 @@ int reply_lockingX(connection_struct *conn, char *inbuf,char *outbuf,int length,
BOOL break_to_none = (oplocklevel == 0);
DEBUG(5,("reply_lockingX: oplock break reply (%u) from client for fnum = %d\n",
- fsp->fnum, (unsigned int)oplocklevel ));
+ (unsigned int)oplocklevel, fsp->fnum ));
/*
* Make sure we have granted an exclusive or batch oplock on this file.
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 6f4076cecb..a50c44b296 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -2156,6 +2156,8 @@ static void run_oplock3(int dummy)
if (fork() == 0) {
/* Child code */
+ use_oplocks = True;
+ use_level_II_oplocks = True;
if (!open_connection(&cli)) return;
sleep(2);
/* try to trigger a oplock break in parent */