r23100: Implement the delete on close semantics I've just tested for

in Samba4 smbtorture. Fix rename on an open file handle.
Needed for 3.0.25a.
Jeremy.
(This used to be commit a301467d5f645dada27093ddfd74890b88bb4ce8)

1 files changed, 45 insertions, 1 deletions

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 56ff3b9790..17c6d3e9c3 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1001,10 +1001,13 @@ static void add_share_mode_entry(struct share_mode_lock *lck,
 }
 
 void set_share_mode(struct share_mode_lock *lck, files_struct *fsp,
-			uid_t uid, uint16 mid, uint16 op_type)
+			uid_t uid, uint16 mid, uint16 op_type, BOOL initial_delete_on_close_allowed)
 {
 	struct share_mode_entry entry;
 	fill_share_mode_entry(&entry, fsp, uid, mid, op_type);
+	if (initial_delete_on_close_allowed) {
+		entry.flags |= SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE;
+	}
 	add_share_mode_entry(lck, &entry);
 }
 
@@ -1204,6 +1207,22 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, BOOL delete_on_close,
 	return NT_STATUS_OK;
 }
 
+/****************************************************************************
+ Do we have an open file handle that created this entry ?
+****************************************************************************/
+
+BOOL can_set_initial_delete_on_close(const struct share_mode_lock *lck)
+{
+	int i;
+
+	for (i=0; i<lck->num_share_modes; i++) {
+		if (lck->share_modes[i].flags & SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE) {
+			return True;
+		}
+	}
+	return False;
+}
+
 /*************************************************************************
  Return a talloced copy of a UNIX_USER_TOKEN. NULL on fail.
  (Should this be in locking.c.... ?).
@@ -1304,6 +1323,31 @@ BOOL set_delete_on_close(files_struct *fsp, BOOL delete_on_close, UNIX_USER_TOKE
 	return True;
 }
 
+/****************************************************************************
+ Sets the allow initial delete on close flag for this share mode.
+****************************************************************************/
+
+BOOL set_allow_initial_delete_on_close(struct share_mode_lock *lck, files_struct *fsp, BOOL delete_on_close)
+{
+	struct share_mode_entry entry, *e;
+
+	/* Don't care about the pid owner being correct here - just a search. */
+	fill_share_mode_entry(&entry, fsp, (uid_t)-1, 0, NO_OPLOCK);
+
+	e = find_share_mode_entry(lck, &entry);
+	if (e == NULL) {
+		return False;
+	}
+
+	if (delete_on_close) {
+		e->flags |= SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE;
+	} else {
+		e->flags &= ~SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE;
+	}
+	lck->modified = True;
+	return True;
+}
+
 struct forall_state {
 	void (*fn)(const struct share_mode_entry *entry,
 		   const char *sharepath,