From: Ralph Boehme <slow@samba.org>
Date: Tue, 17 Sep 2019 02:53:43 +0000 (-0700)
Subject: s3/locking: add flags to locking_tdb_data_store()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22efe20bef59033644dca469f0a55d76a88b405e;p=thirdparty%2Fsamba.git

s3/locking: add flags to locking_tdb_data_store()

Needed to pass DBWRAP_[STORE|DROP]_PERSISTENT through the layers.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
---

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index cbf3ad49b17..80f845ca5a6 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -524,7 +524,8 @@ static NTSTATUS locking_tdb_data_store(
 	TDB_DATA key,
 	const struct locking_tdb_data *ltdb,
 	const TDB_DATA *share_mode_dbufs,
-	size_t num_share_mode_dbufs)
+	size_t num_share_mode_dbufs,
+	int flags)
 {
 	uint8_t share_mode_data_len_buf[4];
 	TDB_DATA dbufs[num_share_mode_dbufs+3];
@@ -536,7 +537,7 @@ static NTSTATUS locking_tdb_data_store(
 		/*
 		 * Nothing to write
 		 */
-		status = share_mode_g_lock_writev(key, NULL, 0, 0);
+		status = share_mode_g_lock_writev(key, NULL, 0, flags);
 		if (!NT_STATUS_IS_OK(status)) {
 			DBG_ERR("share_mode_g_lock_writev(NULL) failed: %s\n",
 				nt_errstr(status));
@@ -570,7 +571,7 @@ static NTSTATUS locking_tdb_data_store(
 		       num_share_mode_dbufs * sizeof(TDB_DATA));
 	}
 
-	status = share_mode_g_lock_writev(key, dbufs, ARRAY_SIZE(dbufs), 0);
+	status = share_mode_g_lock_writev(key, dbufs, ARRAY_SIZE(dbufs), flags);
 	if (!NT_STATUS_IS_OK(status)) {
 		DBG_ERR("share_mode_g_lock_writev() failed: %s\n",
 			nt_errstr(status));
@@ -687,7 +688,8 @@ store:
 	status = locking_tdb_data_store(key,
 					ltdb,
 					share_mode_dbufs,
-					num_share_mode_dbufs);
+					num_share_mode_dbufs,
+					0);
 	if (!NT_STATUS_IS_OK(status)) {
 		DBG_ERR("locking_tdb_data_store failed: %s\n",
 			nt_errstr(status));