s3: VFS: acl_common: Remove get_nt_acl_common_at().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 0615c06c81b49d3e1c8f8626fa8bc76a897f877f..01a687cdcb255001aca9d15c7b0513781a90599f 100644 (file)
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -744,175 +744,6 @@ fail:
        return status;
 }
 
-/*******************************************************************
- Pull a DATA_BLOB from an xattr given a pathname.
- If the hash doesn't match, or doesn't exist - return the underlying
- filesystem sd.
-*******************************************************************/
-
-NTSTATUS get_nt_acl_common_at(
-       NTSTATUS (*get_acl_blob_at_fn)(TALLOC_CTX *ctx,
-                                   vfs_handle_struct *handle,
-                                   struct files_struct *dirfsp,
-                                   const struct smb_filename *smb_fname,
-                                   DATA_BLOB *pblob),
-       vfs_handle_struct *handle,
-       struct files_struct *dirfsp,
-       const struct smb_filename *smb_fname_in,
-       uint32_t security_info,
-       TALLOC_CTX *mem_ctx,
-       struct security_descriptor **ppdesc)
-{
-       DATA_BLOB blob = data_blob_null;
-       NTSTATUS status;
-       struct security_descriptor *psd = NULL;
-       bool psd_is_from_fs = false;
-       struct acl_common_config *config = NULL;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, config,
-                               struct acl_common_config,
-                               return NT_STATUS_UNSUCCESSFUL);
-
-       DBG_DEBUG("name=%s\n", smb_fname_in->base_name);
-
-       status = get_acl_blob_at_fn(mem_ctx,
-                               handle,
-                               dirfsp,
-                               smb_fname_in,
-                               &blob);
-       if (NT_STATUS_IS_OK(status)) {
-               status = validate_nt_acl_blob(mem_ctx,
-                                       handle,
-                                       NULL,
-                                       dirfsp,
-                                       smb_fname_in,
-                                       &blob,
-                                       &psd,
-                                       &psd_is_from_fs);
-               TALLOC_FREE(blob.data);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DBG_DEBUG("ACL validation for [%s] failed\n",
-                                 smb_fname_in->base_name);
-                       goto fail;
-               }
-       }
-
-       if (psd == NULL) {
-               /* Get the full underlying sd, as we failed to get the
-                * blob for the hash, or the revision/hash type wasn't
-                * known */
-
-               if (config->ignore_system_acls) {
-                       SMB_STRUCT_STAT sbuf;
-                       int ret;
-
-                       ret = vfs_stat_smb_basename(handle->conn,
-                                       smb_fname_in,
-                                       &sbuf);
-                       if (ret == -1) {
-                               status = map_nt_error_from_unix(errno);
-                               goto fail;
-                       }
-
-                       status = make_default_filesystem_acl(
-                               mem_ctx,
-                               config->default_acl_style,
-                               smb_fname_in->base_name,
-                               &sbuf,
-                               &psd);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               goto fail;
-                       }
-               } else {
-                       status = SMB_VFS_NEXT_GET_NT_ACL_AT(handle,
-                                               dirfsp,
-                                               smb_fname_in,
-                                               security_info,
-                                               mem_ctx,
-                                               &psd);
-
-                       if (!NT_STATUS_IS_OK(status)) {
-                               DBG_DEBUG("get_next_acl for file %s "
-                                         "returned %s\n",
-                                         smb_fname_in->base_name,
-                                         nt_errstr(status));
-                               goto fail;
-                       }
-
-                       psd_is_from_fs = true;
-               }
-       }
-
-       if (psd_is_from_fs) {
-               SMB_STRUCT_STAT sbuf;
-               bool is_directory = false;
-               int ret;
-
-               /*
-                * We're returning the underlying ACL from the
-                * filesystem. If it's a directory, and has no
-                * inheritable ACE entries we have to fake them.
-                */
-
-               ret = vfs_stat_smb_basename(handle->conn,
-                               smb_fname_in,
-                               &sbuf);
-               if (ret == -1) {
-                       status = map_nt_error_from_unix(errno);
-                       goto fail;
-               }
-
-               is_directory = S_ISDIR(sbuf.st_ex_mode);
-
-               if (is_directory && !sd_has_inheritable_components(psd, true)) {
-                       status = add_directory_inheritable_components(
-                               handle,
-                               smb_fname_in->base_name,
-                               &sbuf,
-                               psd);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               goto fail;
-                       }
-               }
-
-               /*
-                * The underlying POSIX module always sets the
-                * ~SEC_DESC_DACL_PROTECTED bit, as ACLs can't be inherited in
-                * this way under POSIX. Remove it for Windows-style ACLs.
-                */
-               psd->type &= ~SEC_DESC_DACL_PROTECTED;
-       }
-
-       if (!(security_info & SECINFO_OWNER)) {
-               psd->owner_sid = NULL;
-       }
-       if (!(security_info & SECINFO_GROUP)) {
-               psd->group_sid = NULL;
-       }
-       if (!(security_info & SECINFO_DACL)) {
-               psd->type &= ~SEC_DESC_DACL_PRESENT;
-               psd->dacl = NULL;
-       }
-       if (!(security_info & SECINFO_SACL)) {
-               psd->type &= ~SEC_DESC_SACL_PRESENT;
-               psd->sacl = NULL;
-       }
-
-       if (DEBUGLEVEL >= 10) {
-               DBG_DEBUG("returning acl for %s is:\n",
-                         smb_fname_in->base_name);
-               NDR_PRINT_DEBUG(security_descriptor, psd);
-       }
-
-       *ppdesc = psd;
-
-       return NT_STATUS_OK;
-
-fail:
-       TALLOC_FREE(psd);
-       return status;
-}
-
 /*********************************************************************
  Set the underlying ACL (e.g. POSIX ACLS, POSIX owner, etc)
 *********************************************************************/