summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-02-11 04:37:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:53 -0500
commit985a26118a3d5411e62c34aa0d62efa68465b352 (patch)
tree2c1a223aec0fdce3ed12c3d8a1fe56dd8e578012
parent763a553046bfb6e28998adfb671c473485e9f5dc (diff)
downloadsamba-985a26118a3d5411e62c34aa0d62efa68465b352.tar.gz
samba-985a26118a3d5411e62c34aa0d62efa68465b352.tar.bz2
samba-985a26118a3d5411e62c34aa0d62efa68465b352.zip
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. (This used to be commit 429dff31663e71556b5193b25d5b8e7e09fa5b9c)
-rw-r--r--source3/smbd/close.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 05a45cc14f..eea8fa01d5 100644
--- a/source3/smbd/close.c
+++ b/source3/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. */