r21274: As we now have POSIX opens which can unlink

with other open files we may have taken
the delete code path with more than one share mode
entry - ensure we only delete once by resetting
the delete on close flag.
Jeremy.

1 files changed, 9 insertions, 0 deletions

diff --git a/source/smbd/close.c b/source/smbd/close.c
index 7a1e97c2b6b..ef19fbb9212 100644
--- a/source/smbd/close.c
+++ b/source/smbd/close.c
@@ -287,6 +287,15 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 		status = map_nt_error_from_unix(errno);
 	}
 
+	/* As we now have POSIX opens which can unlink
+ 	 * with other open files we may have taken
+ 	 * this code path with more than one share mode
+ 	 * entry - ensure we only delete once by resetting
+ 	 * the delete on close flag. JRA.
+ 	 */
+
+	set_delete_on_close_lck(lck, False, NULL);
+
  done:
 
 	/* unbecome user. */