Attachment 3976 Details for Bug 6154 – Third part of patch.

[patch] Third part of patch.

look (text/plain), 3.56 KB, created by Jeremy Allison on 2009-03-05 13:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-03-05 13:10:16 UTC

Size: 3.56 KB

patch

obsolete

>diff --git a/source/include/proto.h b/source/include/proto.h
>index c008843..c3df0ae 100644
>--- a/source/include/proto.h
>+++ b/source/include/proto.h
>@@ -5202,9 +5202,9 @@ bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp);
> bool downgrade_share_oplock(struct share_mode_lock *lck, files_struct *fsp);
> NTSTATUS can_set_delete_on_close(files_struct *fsp, bool delete_on_close,
> 				 uint32 dosmode);
>-void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok);
>-void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, UNIX_USER_TOKEN *tok);
>-bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok);
>+void set_delete_on_close_token(struct share_mode_lock *lck, const UNIX_USER_TOKEN *tok);
>+void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, const UNIX_USER_TOKEN *tok);
>+bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USER_TOKEN *tok);
> bool set_sticky_write_time(struct file_id fileid, struct timespec write_time);
> bool set_write_time(struct file_id fileid, struct timespec write_time);
> int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *,
>diff --git a/source/locking/locking.c b/source/locking/locking.c
>index d679d88..9bd5361 100644
>--- a/source/locking/locking.c
>+++ b/source/locking/locking.c
>@@ -1282,7 +1282,7 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, bool delete_on_close,
>  (Should this be in locking.c.... ?).
> *************************************************************************/
> 
>-static UNIX_USER_TOKEN *copy_unix_token(TALLOC_CTX *ctx, UNIX_USER_TOKEN *tok)
>+static UNIX_USER_TOKEN *copy_unix_token(TALLOC_CTX *ctx, const UNIX_USER_TOKEN *tok)
> {
> 	UNIX_USER_TOKEN *cpy;
> 
>@@ -1313,7 +1313,7 @@ static UNIX_USER_TOKEN *copy_unix_token(TALLOC_CTX *ctx, UNIX_USER_TOKEN *tok)
>  Replace the delete on close token.
> ****************************************************************************/
> 
>-void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok)
>+void set_delete_on_close_token(struct share_mode_lock *lck, const UNIX_USER_TOKEN *tok)
> {
> 	TALLOC_FREE(lck->delete_token); /* Also deletes groups... */
> 
>@@ -1333,7 +1333,7 @@ void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok
>  lck entry. This function is used when the lock is already granted.
> ****************************************************************************/
> 
>-void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, UNIX_USER_TOKEN *tok)
>+void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, const UNIX_USER_TOKEN *tok)
> {
> 	if (lck->delete_on_close != delete_on_close) {
> 		set_delete_on_close_token(lck, tok);
>@@ -1345,8 +1345,9 @@ void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close,
> 	}
> }
> 
>-bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok)
>+bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USER_TOKEN *tok)
> {
>+	UNIX_USER_TOKEN *tok_copy = NULL;
> 	struct share_mode_lock *lck;
> 	
> 	DEBUG(10,("set_delete_on_close: %s delete on close flag for "
>@@ -1360,6 +1361,16 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKE
> 		return False;
> 	}
> 
>+	if (fsp->conn->admin_user) {
>+		tok_copy = copy_unix_token(lck, tok);
>+		tok_copy->uid = (uid_t)0;
>+		if (tok_copy == NULL) {
>+			TALLOC_FREE(lck);
>+			return false;
>+		}
>+		tok = tok_copy;
>+	}
>+
> 	set_delete_on_close_lck(lck, delete_on_close, tok);
> 
> 	if (fsp->is_directory) {

Actions: View

Attachments on bug 6154: 3966 | 3967 | 3969 | 3971 | 3972 | 3973 | 3975 | 3976