summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-01-01 15:59:22 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:06:00 -0500
commit1032aa890f53097f87fa97689cb21d908b32093c (patch)
treea8577556ef4fa5189cc06c30e33bd04acea56a10 /source
parentdc167037b0f3bada390dfdb820cb84ed9a4cfdcf (diff)
downloadsamba-1032aa890f53097f87fa97689cb21d908b32093c.tar.gz
samba-1032aa890f53097f87fa97689cb21d908b32093c.tar.xz
samba-1032aa890f53097f87fa97689cb21d908b32093c.zip
r12653: Patch from SATOH Fumiyasu <fumiyas@miraclelinux.com>
for bug #3348. Don't assume owning sticky bit directory means write access allowed. Jeremy.
Diffstat (limited to 'source')
-rw-r--r--source/smbd/posix_acls.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 1b8e1d62143..f49f80f006f 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -4149,8 +4149,13 @@ BOOL can_delete_file_in_directory(connection_struct *conn, const char *fname)
if(SMB_VFS_STAT(conn, fname, &sbuf_file) != 0) {
return False;
}
- if (current_user.uid == sbuf_file.st_uid) {
- return True;
+ /*
+ * Patch from SATOH Fumiyasu <fumiyas@miraclelinux.com>
+ * for bug #3348. Don't assume owning sticky bit
+ * directory means write access allowed.
+ */
+ if (current_user.uid != sbuf_file.st_uid) {
+ return False;
}
return False;
}