From 3f5a3b60e267d8342a95fff54428f0b13086ff77 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 3 Oct 2012 13:58:53 -0700 Subject: Revert "When creating a new file/directory, we need to obey the create mask/directory mask parameters." This reverts commit c251a6b0442abc13bc8be4ff8de324c1d7706a78. Remove this as we're planning to remove the security mask, directory security mask parameters and only use create mask/directory mask. --- source3/smbd/open.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'source3') diff --git a/source3/smbd/open.c b/source3/smbd/open.c index bea4d99285..d4babd40f7 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -3436,9 +3436,6 @@ static NTSTATUS inherit_new_acl(files_struct *fsp) bool inherit_owner = lp_inherit_owner(SNUM(fsp->conn)); bool inheritable_components = false; size_t size = 0; - int orig_security_mask = 0; - int orig_directory_security_mask = 0; - int snum = SNUM(fsp->conn); if (!parent_dirname(ctx, fsp->fsp_name->base_name, &parent_name, NULL)) { return NT_STATUS_NO_MEMORY; @@ -3509,14 +3506,6 @@ static NTSTATUS inherit_new_acl(files_struct *fsp) NDR_PRINT_DEBUG(security_descriptor, psd); } - /* Temporarily replace the security masks with the create masks, - as we're actually doing a create here - we only call this - when we've created a file or directory - but there's no - way for FSET_NT_ACL to know the difference. */ - - orig_security_mask = lp_set_security_mask(snum, lp_create_mask(snum)); - orig_directory_security_mask = lp_set_directory_security_mask(snum, lp_dir_mask(snum)); - if (inherit_owner) { /* We need to be root to force this. */ become_root(); @@ -3527,10 +3516,6 @@ static NTSTATUS inherit_new_acl(files_struct *fsp) if (inherit_owner) { unbecome_root(); } - - (void)lp_set_security_mask(snum, orig_security_mask); - (void)lp_set_directory_security_mask(snum, orig_directory_security_mask); - return status; } -- cgit