[PATCHES] smb3 create replay (for multi-channel)

[Michael Adam]

On 2016-03-03 at 09:33 +0100, Michael Adam wrote:
> On 2016-03-02 at 16:45 -0800, Jeremy Allison wrote:
> > On Wed, Mar 02, 2016 at 10:45:11PM +0100, Michael Adam wrote:
> > > 
> > > Attached find the updated patchset.
> > > Differences with the original one:
> > > 
> > > - some cosmetic clean-up of commit messages
> > >   and test names
> > > - added three new tests:
> > >   - replay-dht2-oplock-lease
> > >     (create with oplock, replay with lease)
> > >   - replay-dht2-lease-oplock
> > >     (create with lease, replay with oplock)
> > >   - replay-dht2-lease3
> > >     (replay with a different lease key)
> > > - fixed treatment of leases in create replay
> > >   in corner cases
> > 
> > Pushing this, but autobuild is failing with:
> > 
> > [252(789)/1892 at 20m43s] samba3.blackbox.smbclient_machine_auth.plain (nt4_member:local)
> > ERROR: Testsuite[samba3.blackbox.smbclient_machine_auth.plain (nt4_member:local)]
> > REASON: unable to set up environment nt4_member:local - exiting
> 
> Attached find the 2-line patch to be squashed into the
> 'implement create replay' test to fix the crash.
> I am running a full make test with this now and will
> (given the in-retrospect obviousness) push once this has
> passed.

Attached now ...

-------------- next part --------------
From bc69eedc5dfcf21636be36b50777df05c8049070 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Thu, 3 Mar 2016 09:17:43 +0100
Subject: [PATCH] SQ: fix smbd:smb2: create replay

---
 source3/smbd/smb2_create.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 34e07ec..d50b20c 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -997,6 +997,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 		 */
 		if (replay_operation) {
 			result = op->compat;
+			result->op = op;
 			update_open = false;
 			info = op->create_action;
 		} else if (do_durable_reconnect) {
@@ -1354,7 +1355,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 	} else {
 		state->out_create_action = info;
 	}
-	op->create_action = state->out_create_action;
+	result->op->create_action = state->out_create_action;
 	state->out_file_attributes = dos_mode(result->conn,
 					   result->fsp_name);
 
-- 
2.5.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160303/e5c436a5/signature.sig>