From: Ralph Boehme <slow@samba.org>
Date: Tue, 28 Jan 2025 05:13:15 +0000 (+0100)
Subject: s3/locking: simplify get_static_share_mode_data_fn()
X-Git-Tag: tevent-0.17.0~408
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c826af38b0903f4b3c0260e380bc4630e60e5020;p=thirdparty%2Fsamba.git

s3/locking: simplify get_static_share_mode_data_fn()

One if less and tighter coupling of logic. No change in behaviour.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 96ba71b1a38..291a30df0fa 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -824,9 +824,17 @@ static void get_static_share_mode_data_fn(
 			state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
 			return;
 		}
-	}
 
-	if (ltdb.share_mode_data_len == 0) {
+		d = parse_share_mode_data(
+			lock_ctx,
+			state->id,
+			ltdb.share_mode_data_buf,
+			ltdb.share_mode_data_len);
+		if (d == NULL) {
+			state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+			return;
+		}
+	} else {
 		if (state->smb_fname == NULL) {
 			state->status = NT_STATUS_NOT_FOUND;
 			return;
@@ -839,16 +847,6 @@ static void get_static_share_mode_data_fn(
 			state->status = NT_STATUS_NO_MEMORY;
 			return;
 		}
-	} else {
-		d = parse_share_mode_data(
-			lock_ctx,
-			state->id,
-			ltdb.share_mode_data_buf,
-			ltdb.share_mode_data_len);
-		if (d == NULL) {
-			state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
-			return;
-		}
 	}
 
 	d->id = state->id;