Extra debug in open.c, fix for bad debug message in reply.c

Jeremy.

diff --git a/source/smbd/open.c b/source/smbd/open.c
index 8db440066448289d2815542d7c7164254c68117c..a88dfd5573ddeb46f318d1673076dbc8ee8db29b 100644 (file)
--- a/source/smbd/open.c
+++ b/source/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/source/smbd/reply.c b/source/smbd/reply.c
index da73a78a33751862a614727cf36733688d119b07..2f9898616c9f2fb10fd7bcc041d5f68958560ec9 100644 (file)
--- a/source/smbd/reply.c
+++ b/source/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/source/torture/torture.c b/source/torture/torture.c
index 6f4076cecba8e09abf084feb6891d6a1d690041d..a50c44b2964ad3cc0bd7051c6aec9363edda258f 100644 (file)
--- a/source/torture/torture.c
+++ b/source/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 */