s3:locking: let is_delete_on_close_set() use share_mode_lock_access_private_data()

We should avoid dereference 'struct share_mode_lock' as much as possible.

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

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

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index f4ed19bb35f9a47b30dbbe18b0157ac57fe9d977..e90ede5f4119bc4e0d8995dd0d6e31a5f080420e 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1034,7 +1034,22 @@ bool get_delete_on_close_token(struct share_mode_lock *lck,
 
 bool is_delete_on_close_set(struct share_mode_lock *lck, uint32_t name_hash)
 {
-       return find_delete_on_close_token(lck->data, name_hash) != NULL;
+       struct share_mode_data *d = NULL;
+       NTSTATUS status;
+
+       status = share_mode_lock_access_private_data(lck, &d);
+       if (!NT_STATUS_IS_OK(status)) {
+               struct file_id id = share_mode_lock_file_id(lck);
+               struct file_id_buf id_buf;
+               /* Any error recovery possible here ? */
+               DBG_ERR("share_mode_lock_access_private_data() failed for "
+                       "%s name_hash=%"PRIu32" - %s\n",
+                       file_id_str_buf(id, &id_buf), name_hash,
+                       nt_errstr(status));
+               return false;
+       }
+
+       return find_delete_on_close_token(d, name_hash) != NULL;
 }
 
 bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)