sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r20344: Move the calls to inherit_access_acls and change_owner_to_parent together.

Browse Source 
Jeremy, I'm 100% sure you watch me closely here, I count on you :-)

Volker
(This used to be commit 02f85265f21607c950639da33bc8fe5d5ffd3cf9)
This commit is contained in:
Volker Lendecke 2006-12-24 16:37:22 +00:00 committed by Gerald (Jerry) Carter
parent a67757ef9c
commit e8e5c17f2e
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/smbd/open.c
View File

@ -293,11 +293,17 @@ static NTSTATUS open_file(files_struct *fsp,
return map_nt_error_from_unix(errno);
}
/* Inherit the ACL if the file was created. */
if ((local_flags & O_CREAT)
&& !file_existed
&& lp_inherit_perms(SNUM(conn))) {
inherit_access_acl(conn, fname, unx_mode);
if ((local_flags & O_CREAT) && !file_existed) {
/* Inherit the ACL if required */
if (lp_inherit_perms(SNUM(conn))) {
inherit_access_acl(conn, fname, unx_mode);
}
/* Change the owner if required. */
if (lp_inherit_owner(SNUM(conn))) {
change_fd_owner_to_parent(conn, fsp);
}
}
} else {
@ -1702,10 +1708,6 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
}
} else {
info = FILE_WAS_CREATED;
/* Change the owner if required. */
if (lp_inherit_owner(SNUM(conn))) {
change_fd_owner_to_parent(conn, fsp);
}
}
if (pinfo) {
@ -1913,6 +1915,11 @@ static NTSTATUS mkdir_internal(connection_struct *conn, const char *name,
psbuf->st_mode | (mode & ~psbuf->st_mode));
}
/* Change the owner if required. */
if (lp_inherit_owner(SNUM(conn))) {
change_owner_to_parent(conn, name, psbuf);
}
return NT_STATUS_OK;
}
@ -2086,11 +2093,6 @@ NTSTATUS open_directory(connection_struct *conn,
TALLOC_FREE(lck);
/* Change the owner if required. */
if ((info == FILE_WAS_CREATED) && lp_inherit_owner(SNUM(conn))) {
change_owner_to_parent(conn, fsp->fsp_name, psbuf);
}
if (pinfo) {
*pinfo = info;
}