Attachment 6549 Details for Bug 8211 – git-am fix for 3.6.0-final

[patch] git-am fix for 3.6.0-final

bug-8211-3.6.0.patch (text/plain), 7.31 KB, created by Jeremy Allison on 2011-06-08 21:40:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-06-08 21:40:49 UTC

Size: 7.31 KB

patch

obsolete

>From 625ca6790006f8cb5d2922d73e3a49679aead675 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 8 Jun 2011 12:54:33 -0700
>Subject: [PATCH 1/4] Part 2 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
>
>When changing ownership on a new file make sure we
>also change the returned stat struct to have the correct uid.
>---
> source3/smbd/open.c |    8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index f230a32..4447bb3 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -237,11 +237,13 @@ void change_file_owner_to_parent(connection_struct *conn,
> 			 "was %s\n", fsp_str_dbg(fsp),
> 			 (unsigned int)smb_fname_parent->st.st_ex_uid,
> 			 strerror(errno) ));
>-	}
>-
>-	DEBUG(10,("change_file_owner_to_parent: changed new file %s to "
>+	} else {
>+		DEBUG(10,("change_file_owner_to_parent: changed new file %s to "
> 		  "parent directory uid %u.\n", fsp_str_dbg(fsp),
> 		  (unsigned int)smb_fname_parent->st.st_ex_uid));
>+		/* Ensure the uid entry is updated. */
>+		fsp->fsp_name->st.st_ex_uid = smb_fname_parent->st.st_ex_uid;
>+	}
> 
> 	TALLOC_FREE(smb_fname_parent);
> }
>-- 
>1.7.3.1
>
>
>From 85a12f7f3514b622de502f27ff34fd5dae0d3804 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 7 Jun 2011 16:55:20 -0700
>Subject: [PATCH 2/4] Part 3 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
>
>When changing ownership on a new file make sure we
>must have a valid stat struct before making the inheritance
>calls (as they may look at it), and if we make changes we
>must have a valid stat struct after them.
>
>Autobuild-User: Jeremy Allison <jra@samba.org>
>Autobuild-Date: Wed Jun  8 03:07:04 CEST 2011 on sn-devel-104
>(cherry picked from commit 5fb27814ad5566b264acf0f014d1721afc39b176)
>---
> source3/smbd/open.c |   60 ++++++++++++++++++++++++++++++++++++--------------
> 1 files changed, 43 insertions(+), 17 deletions(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index 4447bb3..710707c 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -384,6 +384,7 @@ static NTSTATUS open_file(files_struct *fsp,
> 	int accmode = (flags & O_ACCMODE);
> 	int local_flags = flags;
> 	bool file_existed = VALID_STAT(fsp->fsp_name->st);
>+	bool file_created = false;
> 
> 	fsp->fh->fd = -1;
> 	errno = EPERM;
>@@ -483,23 +484,7 @@ static NTSTATUS open_file(files_struct *fsp,
> 		}
> 
> 		if ((local_flags & O_CREAT) && !file_existed) {
>-
>-			/* Inherit the ACL if required */
>-			if (lp_inherit_perms(SNUM(conn))) {
>-				inherit_access_posix_acl(conn, parent_dir,
>-							 smb_fname->base_name,
>-							 unx_mode);
>-			}
>-
>-			/* Change the owner if required. */
>-			if (lp_inherit_owner(SNUM(conn))) {
>-				change_file_owner_to_parent(conn, parent_dir,
>-							    fsp);
>-			}
>-
>-			notify_fname(conn, NOTIFY_ACTION_ADDED,
>-				     FILE_NOTIFY_CHANGE_FILE_NAME,
>-				     smb_fname->base_name);
>+			file_created = true;
> 		}
> 
> 	} else {
>@@ -609,6 +594,47 @@ static NTSTATUS open_file(files_struct *fsp,
> 			fd_close(fsp);
> 			return status;
> 		}
>+
>+		if (file_created) {
>+			bool need_re_stat = false;
>+			/* Do all inheritance work after we've
>+			   done a successful stat call and filled
>+			   in the stat struct in fsp->fsp_name. */
>+
>+			/* Inherit the ACL if required */
>+			if (lp_inherit_perms(SNUM(conn))) {
>+				inherit_access_posix_acl(conn, parent_dir,
>+							 smb_fname->base_name,
>+							 unx_mode);
>+				need_re_stat = true;
>+			}
>+
>+			/* Change the owner if required. */
>+			if (lp_inherit_owner(SNUM(conn))) {
>+				change_file_owner_to_parent(conn, parent_dir,
>+							    fsp);
>+				need_re_stat = true;
>+			}
>+
>+			if (need_re_stat) {
>+				if (fsp->fh->fd == -1) {
>+					ret = SMB_VFS_STAT(conn, smb_fname);
>+				} else {
>+					ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
>+					/* If we have an fd, this stat should succeed. */
>+					if (ret == -1) {
>+						DEBUG(0,("Error doing fstat on open file %s "
>+							 "(%s)\n",
>+							 smb_fname_str_dbg(smb_fname),
>+							 strerror(errno) ));
>+					}
>+				}
>+			}
>+
>+			notify_fname(conn, NOTIFY_ACTION_ADDED,
>+				     FILE_NOTIFY_CHANGE_FILE_NAME,
>+				     smb_fname->base_name);
>+		}
> 	}
> 
> 	/*
>-- 
>1.7.3.1
>
>
>From e5deb616114d1258e5496ea02ec8f8fd9ab9bbf1 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 8 Jun 2011 14:26:30 -0700
>Subject: [PATCH 3/4] Part 4 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
>
>We don't need to check mode bits as well as dev/ino to
>ensure we're in the same place.
>---
> source3/smbd/open.c |    5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index 710707c..376fab2 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -318,10 +318,9 @@ NTSTATUS change_dir_owner_to_parent(connection_struct *conn,
> 
> 	/* Ensure we're pointing at the same place. */
> 	if (smb_fname_cwd->st.st_ex_dev != psbuf->st_ex_dev ||
>-	    smb_fname_cwd->st.st_ex_ino != psbuf->st_ex_ino ||
>-	    smb_fname_cwd->st.st_ex_mode != psbuf->st_ex_mode ) {
>+	    smb_fname_cwd->st.st_ex_ino != psbuf->st_ex_ino) {
> 		DEBUG(0,("change_dir_owner_to_parent: "
>-			 "device/inode/mode on directory %s changed. "
>+			 "device/inode on directory %s changed. "
> 			 "Refusing to chown !\n", fname ));
> 		status = NT_STATUS_ACCESS_DENIED;
> 		goto chdir;
>-- 
>1.7.3.1
>
>
>From a1b9553012ea82ad2f64c5cd3856414b3aacbf95 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 8 Jun 2011 14:38:09 -0700
>Subject: [PATCH 4/4] Part 5 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
>
>Ensure when creating a directory, if we make any changes due to inheritance parameters, we update the stat returned.
>---
> source3/smbd/open.c |   12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
>diff --git a/source3/smbd/open.c b/source3/smbd/open.c
>index 376fab2..d581949 100644
>--- a/source3/smbd/open.c
>+++ b/source3/smbd/open.c
>@@ -2573,6 +2573,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
> 	char *parent_dir;
> 	NTSTATUS status;
> 	bool posix_open = false;
>+	bool need_re_stat = false;
> 
> 	if(!CAN_WRITE(conn)) {
> 		DEBUG(5,("mkdir_internal: failing create on read-only share "
>@@ -2627,6 +2628,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
> 	if (lp_inherit_perms(SNUM(conn))) {
> 		inherit_access_posix_acl(conn, parent_dir,
> 					 smb_dname->base_name, mode);
>+		need_re_stat = true;
> 	}
> 
> 	if (!posix_open) {
>@@ -2641,6 +2643,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
> 			SMB_VFS_CHMOD(conn, smb_dname->base_name,
> 				      (smb_dname->st.st_ex_mode |
> 					  (mode & ~smb_dname->st.st_ex_mode)));
>+			need_re_stat = true;
> 		}
> 	}
> 
>@@ -2649,6 +2652,15 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
> 		change_dir_owner_to_parent(conn, parent_dir,
> 					   smb_dname->base_name,
> 					   &smb_dname->st);
>+		need_re_stat = true;
>+	}
>+
>+	if (need_re_stat) {
>+		if (SMB_VFS_LSTAT(conn, smb_dname) == -1) {
>+			DEBUG(2, ("Could not stat directory '%s' just created: %s\n",
>+			  smb_fname_str_dbg(smb_dname), strerror(errno)));
>+			return map_nt_error_from_unix(errno);
>+		}
> 	}
> 
> 	notify_fname(conn, NOTIFY_ACTION_ADDED, FILE_NOTIFY_CHANGE_DIR_NAME,
>-- 
>1.7.3.1
>

Flags:

bjacke: review+

Actions: View

Attachments on bug 8211: 6543 | 6544 | 6546 | 6547 | 6548 | 6549