From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 22 Mar 2021 23:53:08 +0000 (+0100)
Subject: s4:torture/smb2: make use of torture_reset_lease_break_info() in lease.c
X-Git-Tag: tevent-0.11.0~1376
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e63651cfd6d92805bd44c1245f4534bdcfdf3a7e;p=thirdparty%2Fsamba.git

s4:torture/smb2: make use of torture_reset_lease_break_info() in lease.c

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14449

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c
index e820cd8b97a..d4374d33c8f 100644
--- a/source4/torture/smb2/lease.c
+++ b/source4/torture/smb2/lease.c
@@ -473,7 +473,7 @@ static bool test_lease_upgrade3(struct torture_context *tctx,
 
 		smb2_util_unlink(tree, fname);
 
-		ZERO_STRUCT(lease_break_info);
+		torture_reset_lease_break_info(tctx, &lease_break_info);
 
 		/* grab first lease */
 		smb2_lease_create(&io, &ls, false, fname, LEASE1, smb2_util_lease_state(t.held1));
@@ -591,7 +591,7 @@ static bool test_lease_break(struct torture_context *tctx,
 		    held, smb2_util_lease_state(held), contend, smb2_util_lease_state(contend),
 		    brokento, smb2_util_lease_state(brokento), granted, smb2_util_lease_state(granted));
 
-		ZERO_STRUCT(lease_break_info);
+		torture_reset_lease_break_info(tctx, &lease_break_info);
 
 		/* Grab lease. */
 		smb2_lease_create(&io, &ls, false, fname, LEASE1, smb2_util_lease_state(held));
@@ -615,7 +615,7 @@ static bool test_lease_break(struct torture_context *tctx,
 			CHECK_NO_BREAK(tctx);
 		}
 
-		ZERO_STRUCT(lease_break_info);
+		torture_reset_lease_break_info(tctx, &lease_break_info);
 
 		/*
 		  Now verify that an attempt to upgrade LEASE1 results in no
@@ -687,7 +687,7 @@ static bool test_lease_nobreakself(struct torture_context *tctx,
 	h2 = io.out.file.handle;
 	CHECK_LEASE(&io, "R", true, LEASE2, 0);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	tree->session->transport->lease.handler	= torture_lease_handler;
 	tree->session->transport->lease.private_data = tree;
@@ -709,14 +709,14 @@ static bool test_lease_nobreakself(struct torture_context *tctx,
 
 	/* Now break LEASE1 via h2 */
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	status = smb2_util_write(tree, h2, &c, 0, 1);
 	CHECK_STATUS(status, NT_STATUS_OK);
 	CHECK_BREAK_INFO("R", "", LEASE1);
 
 	/* .. and break LEASE2 via h1 */
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	status = smb2_util_write(tree, h1, &c, 0, 1);
 	CHECK_STATUS(status, NT_STATUS_OK);
 	CHECK_BREAK_INFO("R", "", LEASE2);
@@ -769,7 +769,7 @@ static bool test_lease_statopen(struct torture_context *tctx,
 	h2 = io.out.file.handle;
 	CHECK_LEASE(&io, "RWH", true, LEASE1, 0);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	tree->session->transport->lease.handler	= torture_lease_handler;
 	tree->session->transport->lease.private_data = tree;
@@ -827,7 +827,7 @@ static bool test_lease_statopen2(struct torture_context *tctx,
 	}
 
 	smb2_util_unlink(tree, fname);
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	tree->session->transport->lease.handler	= torture_lease_handler;
 	tree->session->transport->lease.private_data = tree;
 
@@ -908,7 +908,7 @@ static bool test_lease_statopen3(struct torture_context *tctx,
 	}
 
 	smb2_util_unlink(tree, fname);
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	tree->session->transport->lease.handler	= torture_lease_handler;
 	tree->session->transport->lease.private_data = tree;
 
@@ -1115,7 +1115,7 @@ static bool test_lease_statopen4(struct torture_context *tctx,
 	ZERO_STRUCT(h1);
 
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
-		ZERO_STRUCT(lease_break_info);
+		torture_reset_lease_break_info(tctx, &lease_break_info);
 
 		ret = test_lease_statopen4_do(tctx,
 					      tree,
@@ -1249,7 +1249,7 @@ static bool test_lease_oplock(struct torture_context *tctx,
 		    held, smb2_util_lease_state(held), contend, smb2_util_oplock_level(contend),
 		    brokento, smb2_util_lease_state(brokento), granted, smb2_util_oplock_level(granted));
 
-		ZERO_STRUCT(lease_break_info);
+		torture_reset_lease_break_info(tctx, &lease_break_info);
 
 		/* Grab lease. */
 		smb2_lease_create(&io, &ls, false, fname, LEASE1, smb2_util_lease_state(held));
@@ -1291,7 +1291,7 @@ static bool test_lease_oplock(struct torture_context *tctx,
 		    held, smb2_util_oplock_level(held), contend, smb2_util_lease_state(contend),
 		    brokento, smb2_util_oplock_level(brokento), granted, smb2_util_lease_state(granted));
 
-		ZERO_STRUCT(lease_break_info);
+		torture_reset_lease_break_info(tctx, &lease_break_info);
 
 		/* Grab an oplock. */
 		smb2_oplock_create(&io, fname, smb2_util_oplock_level(held));
@@ -1361,7 +1361,7 @@ static bool test_lease_multibreak(struct torture_context *tctx,
 
 	smb2_util_unlink(tree, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Grab lease, upgrade to RHW .. */
 	smb2_lease_create(&io, &ls, false, fname, LEASE1, smb2_util_lease_state("RH"));
@@ -1397,7 +1397,7 @@ static bool test_lease_multibreak(struct torture_context *tctx,
 	status = smb2_util_close(tree, h3);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Grab an R lease. */
 	smb2_lease_create(&io, &ls, false, fname, LEASE1, smb2_util_lease_state("R"));
@@ -1484,7 +1484,7 @@ static bool test_lease_v2_request_parent(struct torture_context *tctx,
 
 	smb2_util_unlink(tree, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(io);
 	smb2_lease_v2_create_share(&io, &ls, false, fname,
@@ -1537,7 +1537,7 @@ static bool test_lease_break_twice(struct torture_context *tctx,
 
 	smb2_util_unlink(tree, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	ZERO_STRUCT(io);
 
 	smb2_lease_v2_create_share(
@@ -1553,7 +1553,7 @@ static bool test_lease_break_twice(struct torture_context *tctx,
 	tree->session->transport->lease.handler = torture_lease_handler;
 	tree->session->transport->lease.private_data = tree;
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	smb2_lease_v2_create_share(
 		&io, &ls2, false, fname, smb2_util_share_access("R"),
@@ -1568,7 +1568,7 @@ static bool test_lease_break_twice(struct torture_context *tctx,
 		&io, &ls2, false, fname, smb2_util_share_access("RWD"),
 		LEASE2, NULL, smb2_util_lease_state("RWH"), 0x22);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	status = smb2_create(tree, mem_ctx, &io);
 	CHECK_STATUS(status, NT_STATUS_OK);
@@ -1625,7 +1625,7 @@ static bool test_lease_v2_request(struct torture_context *tctx,
 	tree->session->transport->oplock.handler = torture_oplock_handler;
 	tree->session->transport->oplock.private_data = tree;
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(io);
 	smb2_lease_v2_create_share(&io, &ls1, false, fname,
@@ -1683,7 +1683,7 @@ static bool test_lease_v2_request(struct torture_context *tctx,
 	CHECK_BREAK_INFO_V2(tree->session->transport,
 			    "RH", "", LEASE2, ls2.lease_epoch + 2);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(io);
 	smb2_lease_v2_create_share(&io, &ls2t, true, dname,
@@ -1768,7 +1768,7 @@ static bool test_lease_v2_epoch1(struct torture_context *tctx,
 	tree->session->transport->oplock.handler = torture_oplock_handler;
 	tree->session->transport->oplock.private_data = tree;
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(io);
 	smb2_lease_v2_create_share(&io, &ls, false, fname,
@@ -1833,7 +1833,7 @@ static bool test_lease_v2_epoch2(struct torture_context *tctx,
 	tree->session->transport->oplock.handler = torture_oplock_handler;
 	tree->session->transport->oplock.private_data = tree;
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(io);
 	smb2_lease_v2_create_share(&io, &ls1v2, false, fname,
@@ -1938,7 +1938,7 @@ static bool test_lease_v2_epoch3(struct torture_context *tctx,
 	tree->session->transport->oplock.handler = torture_oplock_handler;
 	tree->session->transport->oplock.private_data = tree;
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(io);
 	smb2_lease_create_share(&io, &ls1v1, false, fname,
@@ -2043,7 +2043,7 @@ static bool test_lease_breaking1(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	smb2_lease_create_share(&io1, &ls1, false, fname,
@@ -2075,7 +2075,7 @@ static bool test_lease_breaking1(struct torture_context *tctx,
 		lease_break_info.lease_break.current_lease.lease_key;
 	ack.in.lease.lease_state =
 		lease_break_info.lease_break.new_lease_state;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * a open using the same lease key is still works,
@@ -2150,7 +2150,7 @@ static bool test_lease_breaking2(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	smb2_lease_create_share(&io1, &ls1, false, fname,
@@ -2181,7 +2181,7 @@ static bool test_lease_breaking2(struct torture_context *tctx,
 
 	ack.in.lease.lease_key =
 		lease_break_info.lease_break.current_lease.lease_key;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * a open using the same lease key is still works,
@@ -2305,7 +2305,7 @@ static bool test_lease_breaking3(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	smb2_lease_create_share(&io1, &ls1, false, fname,
@@ -2349,7 +2349,7 @@ static bool test_lease_breaking3(struct torture_context *tctx,
 	 * doesn't trigger an immediate lease break to none.
 	 */
 	lease_break_info_tmp = lease_break_info;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	smb2_oplock_create(&io3, fname, SMB2_OPLOCK_LEVEL_NONE);
 	io3.in.create_disposition = NTCREATEX_DISP_OVERWRITE;
 	req3 = smb2_create_send(tree, &io3);
@@ -2363,7 +2363,7 @@ static bool test_lease_breaking3(struct torture_context *tctx,
 		lease_break_info.lease_break.current_lease.lease_key;
 	ack.in.lease.lease_state =
 		lease_break_info.lease_break.new_lease_state;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * a open using the same lease key is still works,
@@ -2396,7 +2396,7 @@ static bool test_lease_breaking3(struct torture_context *tctx,
 		lease_break_info.lease_break.current_lease.lease_key;
 	ack.in.lease.lease_state =
 		lease_break_info.lease_break.new_lease_state;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * a open using the same lease key is still works,
@@ -2431,7 +2431,7 @@ static bool test_lease_breaking3(struct torture_context *tctx,
 	torture_assert(tctx, req3->cancel.can_cancel,
 		       "req3 can_cancel");
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	status = smb2_create_recv(req2, tctx, &io2);
 	CHECK_STATUS(status, NT_STATUS_OK);
@@ -2499,7 +2499,7 @@ static bool test_lease_v2_breaking3(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	smb2_lease_v2_create_share(&io1, &ls1, false, fname,
@@ -2550,7 +2550,7 @@ static bool test_lease_v2_breaking3(struct torture_context *tctx,
 	 * doesn't trigger an immediate lease break to none.
 	 */
 	lease_break_info_tmp = lease_break_info;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	smb2_oplock_create(&io3, fname, SMB2_OPLOCK_LEVEL_NONE);
 	io3.in.create_disposition = NTCREATEX_DISP_OVERWRITE;
 	req3 = smb2_create_send(tree, &io3);
@@ -2564,7 +2564,7 @@ static bool test_lease_v2_breaking3(struct torture_context *tctx,
 		lease_break_info.lease_break.current_lease.lease_key;
 	ack.in.lease.lease_state =
 		lease_break_info.lease_break.new_lease_state;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * a open using the same lease key is still works,
@@ -2600,7 +2600,7 @@ static bool test_lease_v2_breaking3(struct torture_context *tctx,
 		lease_break_info.lease_break.current_lease.lease_key;
 	ack.in.lease.lease_state =
 		lease_break_info.lease_break.new_lease_state;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * a open using the same lease key is still works,
@@ -2636,7 +2636,7 @@ static bool test_lease_v2_breaking3(struct torture_context *tctx,
 	torture_assert(tctx, req3->cancel.can_cancel,
 		       "req3 can_cancel");
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	status = smb2_create_recv(req2, tctx, &io2);
 	CHECK_STATUS(status, NT_STATUS_OK);
@@ -2698,7 +2698,7 @@ static bool test_lease_breaking4(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	smb2_lease_create_share(&io1, &ls1, false, fname,
@@ -2729,7 +2729,7 @@ static bool test_lease_breaking4(struct torture_context *tctx,
 	CHECK_BREAK_INFO("RH", "", LEASE1);
 
 	lease_break_info_tmp = lease_break_info;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	CHECK_NO_BREAK(tctx);
 
 	torture_assert(tctx, req2->state == SMB2_REQUEST_DONE, "req2 done");
@@ -2789,7 +2789,7 @@ static bool test_lease_breaking4(struct torture_context *tctx,
 		lease_break_info.lease_break.current_lease.lease_key;
 	ack.in.lease.lease_state =
 		lease_break_info.lease_break.new_lease_state;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	status = smb2_lease_break_ack(tree, &ack);
@@ -2843,7 +2843,7 @@ static bool test_lease_breaking5(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	smb2_lease_create_share(&io1, &ls1, false, fname,
@@ -2874,7 +2874,7 @@ static bool test_lease_breaking5(struct torture_context *tctx,
 	CHECK_BREAK_INFO("R", "", LEASE1);
 
 	lease_break_info_tmp = lease_break_info;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	CHECK_NO_BREAK(tctx);
 
 	torture_assert(tctx, req2->state == SMB2_REQUEST_DONE, "req2 done");
@@ -2911,7 +2911,7 @@ static bool test_lease_breaking5(struct torture_context *tctx,
 		lease_break_info.lease_break.current_lease.lease_key;
 	ack.in.lease.lease_state =
 		lease_break_info.lease_break.new_lease_state;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	status = smb2_lease_break_ack(tree, &ack);
 	CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL);
 
@@ -2959,7 +2959,7 @@ static bool test_lease_breaking6(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	smb2_lease_create_share(&io1, &ls1, false, fname,
@@ -2989,7 +2989,7 @@ static bool test_lease_breaking6(struct torture_context *tctx,
 
 	ack.in.lease.lease_key =
 		lease_break_info.lease_break.current_lease.lease_key;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * a open using the same lease key is still works,
@@ -3089,7 +3089,7 @@ static bool test_lease_lock1(struct torture_context *tctx,
 
 	smb2_util_unlink(tree1a, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	ZERO_STRUCT(lck);
 
 	/* Open a handle on tree1a. */
@@ -3115,7 +3115,7 @@ static bool test_lease_lock1(struct torture_context *tctx,
 	CHECK_LEASE(&io2, "RH", true, LEASE2, 0);
 	/* And LEASE1 got broken to RH. */
 	CHECK_BREAK_INFO("RWH", "RH", LEASE1);
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Now open a lease on a different client guid. */
 	smb2_lease_create_share(&io3, &ls3, false, fname,
@@ -3177,7 +3177,7 @@ static bool test_lease_lock1(struct torture_context *tctx,
 	CHECK_LEASE(&io3, "", true, LEASE3, 0);
 	smb2_util_close(tree2, io3.out.file.handle);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/*
 	 * Try and get get an exclusive byte
@@ -3194,7 +3194,7 @@ static bool test_lease_lock1(struct torture_context *tctx,
 	CHECK_STATUS(status, NT_STATUS_OK);
 	/* LEASE1 got broken to NONE. */
 	CHECK_BREAK_INFO("RH", "", LEASE1);
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 done:
 	smb2_util_close(tree1a, h1);
@@ -3251,7 +3251,7 @@ static bool test_lease_complex1(struct torture_context *tctx,
 
 	smb2_util_unlink(tree1a, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Grab R lease over connection 1a */
 	smb2_lease_create(&io1, &ls1, false, fname, LEASE1, smb2_util_lease_state("R"));
@@ -3296,7 +3296,7 @@ static bool test_lease_complex1(struct torture_context *tctx,
 	status = smb2_util_close(tree1b, h2);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(w);
 	w.in.file.handle = h;
@@ -3309,7 +3309,7 @@ static bool test_lease_complex1(struct torture_context *tctx,
 	ls2.lease_epoch += 1;
 	CHECK_BREAK_INFO("R", "", LEASE2);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(w);
 	w.in.file.handle = h3;
@@ -3385,7 +3385,7 @@ static bool test_lease_v2_complex1(struct torture_context *tctx,
 
 	smb2_util_unlink(tree1a, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Grab R lease over connection 1a */
 	smb2_lease_v2_create(&io1, &ls1, false, fname, LEASE1, NULL,
@@ -3441,7 +3441,7 @@ static bool test_lease_v2_complex1(struct torture_context *tctx,
 	status = smb2_util_close(tree1b, h2);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(w);
 	w.in.file.handle = h;
@@ -3455,7 +3455,7 @@ static bool test_lease_v2_complex1(struct torture_context *tctx,
 	CHECK_BREAK_INFO_V2(tree1a->session->transport,
 			    "R", "", LEASE2, ls2.lease_epoch);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(w);
 	w.in.file.handle = h3;
@@ -3532,7 +3532,7 @@ static bool test_lease_v2_complex2(struct torture_context *tctx,
 
 	smb2_util_unlink(tree1a, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Grab RWH lease over connection 1a */
 	smb2_lease_v2_create(&io1, &ls1, false, fname, LEASE1, NULL,
@@ -3548,7 +3548,7 @@ static bool test_lease_v2_complex2(struct torture_context *tctx,
 	/*
 	 * we defer acking the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	/* Ask for RWH on connection 1b, different lease. */
@@ -3571,7 +3571,7 @@ static bool test_lease_v2_complex2(struct torture_context *tctx,
 	CHECK_STATUS(status, NT_STATUS_OK);
 	CHECK_LEASE_BREAK_ACK(&ack, "RH", LEASE1);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	status = smb2_create_recv(req2, tctx, &io2);
 	CHECK_STATUS(status, NT_STATUS_OK);
@@ -3633,7 +3633,7 @@ static bool test_lease_timeout(struct torture_context *tctx,
 	/*
 	 * Just don't ack the lease break.
 	 */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	lease_break_info.lease_skip_ack = true;
 
 	/* Break with a RWH request. */
@@ -3669,7 +3669,7 @@ static bool test_lease_timeout(struct torture_context *tctx,
 	smb2_util_close(tree, io.out.file.handle);
 
 	/* Write on the original handle and make sure it's still valid. */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	ZERO_STRUCT(w);
 	w.in.file.handle = h;
 	w.in.offset      = 0;
@@ -3682,7 +3682,7 @@ static bool test_lease_timeout(struct torture_context *tctx,
 	CHECK_BREAK_INFO("RH", "", LEASE2);
 
 	/* Write on the new handle. */
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 	ZERO_STRUCT(w);
 	w.in.file.handle = hnew;
 	w.in.offset      = 0;
@@ -3758,7 +3758,7 @@ static bool test_lease_v2_rename(struct torture_context *tctx,
 	tree->session->transport->oplock.handler = torture_oplock_handler;
 	tree->session->transport->oplock.private_data = tree;
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	ZERO_STRUCT(io);
 	smb2_lease_v2_create_share(&io, &ls1, false, fname,
@@ -3813,7 +3813,7 @@ static bool test_lease_v2_rename(struct torture_context *tctx,
 	CHECK_BREAK_INFO_V2(tree->session->transport,
 			    "RWH", "RH", LEASE1, ls1.lease_epoch + 1);
 	ls1.lease_epoch += 1;
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Now rename back. */
 	ZERO_STRUCT(sinfo);
@@ -3937,7 +3937,7 @@ static bool test_lease_dynamic_share(struct torture_context *tctx,
 
 	smb2_util_unlink(tree_3, fname);
 
-	ZERO_STRUCT(lease_break_info);
+	torture_reset_lease_break_info(tctx, &lease_break_info);
 
 	/* Get RWH lease over connection 2 */
 	smb2_lease_create(&io, &ls1, false, fname, LEASE1, smb2_util_lease_state("RWH"));