summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-06-08 14:26:02 -0700
committerJeremy Allison <jra@samba.org>2011-06-08 14:26:02 -0700
commitc6bc1eeb7b93fde84dae5d81eedd0610aef1726e (patch)
tree4bb076263614255120d51ea99328ec8eff3e1da3
parent0931147cbca6cd2f438b2fa49d222606246e364d (diff)
downloadsamba-c6bc1eeb7b93fde84dae5d81eedd0610aef1726e.tar.gz
samba-c6bc1eeb7b93fde84dae5d81eedd0610aef1726e.tar.bz2
samba-c6bc1eeb7b93fde84dae5d81eedd0610aef1726e.zip
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.
-rw-r--r--source3/smbd/open.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3603a81cff..b7e5276a8a 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;