s4:kdc: Implement KDC plugin hardware authentication policy
[samba.git] / source3 / modules / vfs_acl_xattr.c
index efcc87740a9142c87d57381aa8fa99572a5cc1c8..1a3ab34d659d264b959875b6e340ed9ebdff5d02 100644 (file)
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-/* NOTE: This is an experimental module, not yet finished. JRA. */
-
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/xattr.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "auth.h"
+#include "vfs_acl_common.h"
+#include "lib/util/tevent_ntstatus.h"
+#include "lib/util/tevent_unix.h"
+
+/* Pull in the common functions. */
+#define ACL_MODULE_NAME "acl_xattr"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
 /*******************************************************************
- Parse out a struct security_descriptor from a DATA_BLOB.
+ Pull a security descriptor into a DATA_BLOB from a xattr.
 *******************************************************************/
 
-static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
-                               uint32 security_info,
-                               struct security_descriptor **ppdesc)
+static ssize_t getxattr_do(vfs_handle_struct *handle,
+                          files_struct *fsp,
+                          const char *xattr_name,
+                          uint8_t *val,
+                          size_t size)
 {
-       TALLOC_CTX *ctx = talloc_tos();
-       struct xattr_NTACL xacl;
-       enum ndr_err_code ndr_err;
-       size_t sd_size;
-
-       ndr_err = ndr_pull_struct_blob(pblob, ctx, NULL, &xacl,
-                       (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL);
+       ssize_t sizeret;
+       int saved_errno = 0;
 
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DEBUG(5, ("parse_acl_blob: ndr_pull_xattr_NTACL failed: %s\n",
-                       ndr_errstr(ndr_err)));
-               return ndr_map_error2ntstatus(ndr_err);;
+       become_root();
+       sizeret = SMB_VFS_FGETXATTR(fsp, xattr_name, val, size);
+       if (sizeret == -1) {
+               saved_errno = errno;
        }
+       unbecome_root();
 
-       if (xacl.version != 2) {
-               return NT_STATUS_REVISION_MISMATCH;
+       if (saved_errno != 0) {
+               errno = saved_errno;
        }
 
-       *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION, xacl.info.sd_hs->sd->type | SEC_DESC_SELF_RELATIVE,
-                       (security_info & OWNER_SECURITY_INFORMATION)
-                       ? xacl.info.sd_hs->sd->owner_sid : NULL,
-                       (security_info & GROUP_SECURITY_INFORMATION)
-                       ? xacl.info.sd_hs->sd->group_sid : NULL,
-                       (security_info & SACL_SECURITY_INFORMATION)
-                       ? xacl.info.sd_hs->sd->sacl : NULL,
-                       (security_info & DACL_SECURITY_INFORMATION)
-                       ? xacl.info.sd_hs->sd->dacl : NULL,
-                       &sd_size);
-
-       TALLOC_FREE(xacl.info.sd);
-
-       return (*ppdesc != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;
+       return sizeret;
 }
 
-/*******************************************************************
- Pull a security descriptor into a DATA_BLOB from a xattr.
-*******************************************************************/
-
-static NTSTATUS get_acl_blob(TALLOC_CTX *ctx,
+static NTSTATUS fget_acl_blob(TALLOC_CTX *ctx,
                        vfs_handle_struct *handle,
                        files_struct *fsp,
-                       const char *name,
                        DATA_BLOB *pblob)
 {
-       size_t size = 1024;
+       size_t size = 4096;
        uint8_t *val = NULL;
        uint8_t *tmp;
        ssize_t sizeret;
-       int saved_errno = 0;
 
        ZERO_STRUCTP(pblob);
 
   again:
 
-       tmp = TALLOC_REALLOC_ARRAY(ctx, val, uint8_t, size);
+       tmp = talloc_realloc(ctx, val, uint8_t, size);
        if (tmp == NULL) {
                TALLOC_FREE(val);
                return NT_STATUS_NO_MEMORY;
        }
        val = tmp;
 
-       become_root();
-       if (fsp && fsp->fh->fd != -1) {
-               sizeret = SMB_VFS_FGETXATTR(fsp, XATTR_NTACL_NAME, val, size);
-       } else {
-               sizeret = SMB_VFS_GETXATTR(handle->conn, name,
-                                       XATTR_NTACL_NAME, val, size);
-       }
-       if (sizeret == -1) {
-               saved_errno = errno;
-       }
-       unbecome_root();
+       sizeret =
+           getxattr_do(handle, fsp, XATTR_NTACL_NAME, val, size);
 
-       /* Max ACL size is 65536 bytes. */
-       if (sizeret == -1) {
-               errno = saved_errno;
-               if ((errno == ERANGE) && (size != 65536)) {
-                       /* Too small, try again. */
-                       size = 65536;
-                       goto again;
-               }
-
-               /* Real error - exit here. */
-               TALLOC_FREE(val);
-               return map_nt_error_from_unix(errno);
+       if (sizeret >= 0) {
+               pblob->data = val;
+               pblob->length = sizeret;
+               return NT_STATUS_OK;
        }
 
-       pblob->data = val;
-       pblob->length = sizeret;
-       return NT_STATUS_OK;
-}
-
-/*******************************************************************
- Create a DATA_BLOB from a security descriptor.
-*******************************************************************/
-
-static NTSTATUS create_acl_blob(const struct security_descriptor *psd, DATA_BLOB *pblob)
-{
-       struct xattr_NTACL xacl;
-       struct security_descriptor_hash sd_hs;
-       enum ndr_err_code ndr_err;
-       TALLOC_CTX *ctx = talloc_tos();
-
-       ZERO_STRUCT(xacl);
-       ZERO_STRUCT(sd_hs);
+       if (errno != ERANGE) {
+               goto err;
+       }
 
-       xacl.version = 2;
-       xacl.info.sd_hs = &sd_hs;
-       xacl.info.sd_hs->sd = CONST_DISCARD(struct security_descriptor *, psd);
-       memset(&xacl.info.sd_hs->hash[0], '\0', 16);
+       /* Too small, try again. */
+       sizeret =
+           getxattr_do(handle, fsp, XATTR_NTACL_NAME, NULL, 0);
+       if (sizeret < 0) {
+               goto err;
+       }
 
-       ndr_err = ndr_push_struct_blob(
-                       pblob, ctx, NULL, &xacl,
-                       (ndr_push_flags_fn_t)ndr_push_xattr_NTACL);
+       if (size < sizeret) {
+               size = sizeret;
+       }
 
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DEBUG(5, ("create_acl_blob: ndr_push_xattr_NTACL failed: %s\n",
-                       ndr_errstr(ndr_err)));
-               return ndr_map_error2ntstatus(ndr_err);;
+       if (size > 65536) {
+               /* Max ACL size is 65536 bytes. */
+               errno = ERANGE;
+               goto err;
        }
 
-       return NT_STATUS_OK;
+       goto again;
+  err:
+       /* Real error - exit here. */
+       TALLOC_FREE(val);
+       return map_nt_error_from_unix(errno);
 }
 
 /*******************************************************************
@@ -171,526 +130,423 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle,
        int saved_errno = 0;
 
        DEBUG(10,("store_acl_blob_fsp: storing blob length %u on file %s\n",
-                       (unsigned int)pblob->length, fsp->fsp_name));
+                 (unsigned int)pblob->length, fsp_str_dbg(fsp)));
 
        become_root();
-       if (fsp->fh->fd != -1) {
-               ret = SMB_VFS_FSETXATTR(fsp, XATTR_NTACL_NAME,
+       ret = SMB_VFS_FSETXATTR(fsp, XATTR_NTACL_NAME,
                        pblob->data, pblob->length, 0);
-       } else {
-               ret = SMB_VFS_SETXATTR(fsp->conn, fsp->fsp_name,
-                               XATTR_NTACL_NAME,
-                               pblob->data, pblob->length, 0);
-       }
        if (ret) {
                saved_errno = errno;
        }
        unbecome_root();
        if (ret) {
-               errno = saved_errno;
                DEBUG(5, ("store_acl_blob_fsp: setting attr failed for file %s"
                        "with error %s\n",
-                       fsp->fsp_name,
-                       strerror(errno) ));
-               return map_nt_error_from_unix(errno);
-       }
-       return NT_STATUS_OK;
-}
-
-/*******************************************************************
- Store a DATA_BLOB into an xattr given a pathname.
-*******************************************************************/
-
-static NTSTATUS store_acl_blob_pathname(vfs_handle_struct *handle,
-                                       const char *fname,
-                                       DATA_BLOB *pblob)
-{
-       connection_struct *conn = handle->conn;
-       int ret;
-       int saved_errno = 0;
-
-       DEBUG(10,("store_acl_blob_pathname: storing blob "
-                       "length %u on file %s\n",
-                       (unsigned int)pblob->length, fname));
-
-       become_root();
-       ret = SMB_VFS_SETXATTR(conn, fname,
-                               XATTR_NTACL_NAME,
-                               pblob->data, pblob->length, 0);
-       if (ret) {
-               saved_errno = errno;
-       }
-       unbecome_root();
-       if (ret) {
+                       fsp_str_dbg(fsp),
+                       strerror(saved_errno) ));
                errno = saved_errno;
-               DEBUG(5, ("store_acl_blob_pathname: setting attr failed "
-                       "for file %s with error %s\n",
-                       fname,
-                       strerror(errno) ));
-               return map_nt_error_from_unix(errno);
+               return map_nt_error_from_unix(saved_errno);
        }
        return NT_STATUS_OK;
 }
 
-/*******************************************************************
Store a DATA_BLOB into an xattr given a pathname.
-*******************************************************************/
+/*********************************************************************
Remove a Windows ACL - we're setting the underlying POSIX ACL.
+*********************************************************************/
 
-static NTSTATUS get_nt_acl_xattr_internal(vfs_handle_struct *handle,
-                                       files_struct *fsp,
-                                       const char *name,
-                                       uint32 security_info,
-                                       struct security_descriptor **ppdesc)
+static int sys_acl_set_fd_xattr(vfs_handle_struct *handle,
+                               files_struct *fsp,
+                               SMB_ACL_TYPE_T type,
+                               SMB_ACL_T theacl)
 {
-       TALLOC_CTX *ctx = talloc_tos();
-       DATA_BLOB blob;
-       NTSTATUS status;
+       struct acl_common_fsp_ext *ext = (struct acl_common_fsp_ext *)
+               VFS_FETCH_FSP_EXTENSION(handle, fsp);
+       int ret;
 
-       if (fsp && name == NULL) {
-               name = fsp->fsp_name;
+       ret = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle,
+                                         fsp,
+                                         type,
+                                         theacl);
+       if (ret == -1) {
+               return -1;
        }
 
-       DEBUG(10, ("get_nt_acl_xattr_internal: name=%s\n", name));
-
-       status = get_acl_blob(ctx, handle, fsp, name, &blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("get_acl_blob returned %s\n", nt_errstr(status)));
-               return status;
+       if (ext != NULL && ext->setting_nt_acl) {
+               return 0;
        }
 
-       status = parse_acl_blob(&blob, security_info, ppdesc);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("parse_acl_blob returned %s\n",
-                               nt_errstr(status)));
-               return status;
-       }
+       become_root();
+       SMB_VFS_FREMOVEXATTR(fsp, XATTR_NTACL_NAME);
+       unbecome_root();
 
-       TALLOC_FREE(blob.data);
-       return status;
+       return 0;
 }
 
-/*********************************************************************
- Create a default security descriptor for a file in case no inheritance
- exists. All permissions to the owner and SYSTEM.
-*********************************************************************/
-
-static struct security_descriptor *default_file_sd(TALLOC_CTX *mem_ctx,
-                                               SMB_STRUCT_STAT *psbuf)
+static int connect_acl_xattr(struct vfs_handle_struct *handle,
+                               const char *service,
+                               const char *user)
 {
-       struct dom_sid owner_sid, group_sid;
-       size_t sd_size;
-       struct security_ace *pace = NULL;
-       struct security_acl *pacl = NULL;
-
-       uid_to_sid(&owner_sid, psbuf->st_ex_uid);
-       gid_to_sid(&group_sid, psbuf->st_ex_gid);
+       const char *security_acl_xattr_name = NULL;
+       int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+       bool ok;
+       struct acl_common_config *config = NULL;
 
-       pace = TALLOC_ARRAY(mem_ctx, struct security_ace, 2);
-       if (!pace) {
-               return NULL;
+       if (ret < 0) {
+               return ret;
        }
 
-       init_sec_ace(&pace[0], &owner_sid, SEC_ACE_TYPE_ACCESS_ALLOWED,
-                       SEC_RIGHTS_FILE_ALL, 0);
-       init_sec_ace(&pace[1], &global_sid_System, SEC_ACE_TYPE_ACCESS_ALLOWED,
-                       SEC_RIGHTS_FILE_ALL, 0);
-
-       pacl = make_sec_acl(mem_ctx,
-                               NT4_ACL_REVISION,
-                               2,
-                               pace);
-       if (!pacl) {
-               return NULL;
+       ok = init_acl_common_config(handle, ACL_MODULE_NAME);
+       if (!ok) {
+               DBG_ERR("init_acl_common_config failed\n");
+               return -1;
        }
-       return make_sec_desc(mem_ctx,
-                       SECURITY_DESCRIPTOR_REVISION_1,
-                       SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT,
-                       &owner_sid,
-                       &group_sid,
-                       NULL,
-                        pacl,
-                       &sd_size);
-}
-
-/*********************************************************************
-*********************************************************************/
-
-static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
-                                       const char *fname,
-                                       files_struct *fsp,
-                                       bool container)
-{
-       TALLOC_CTX *ctx = talloc_tos();
-       NTSTATUS status;
-       struct security_descriptor *parent_desc = NULL;
-       struct security_descriptor *psd = NULL;
-       DATA_BLOB blob;
-       size_t size;
-       char *parent_name;
 
-       if (!parent_dirname(ctx, fname, &parent_name, NULL)) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       /* Ensure we have the parameters correct if we're
+        * using this module. */
+       DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' "
+               "'dos filemode = true' and "
+               "'force unknown acl user = true' for service %s\n",
+               service ));
+
+        lp_do_parameter(SNUM(handle->conn), "inherit acls", "true");
+        lp_do_parameter(SNUM(handle->conn), "dos filemode", "true");
+        lp_do_parameter(SNUM(handle->conn), "force unknown acl user", "true");
+
+       SMB_VFS_HANDLE_GET_DATA(handle, config,
+                               struct acl_common_config,
+                               return -1);
+
+       if (config->ignore_system_acls) {
+               mode_t create_mask = lp_create_mask(SNUM(handle->conn));
+               char *create_mask_str = NULL;
+
+               if ((create_mask & 0666) != 0666) {
+                       create_mask |= 0666;
+                       create_mask_str = talloc_asprintf(handle, "0%o",
+                                                         create_mask);
+                       if (create_mask_str == NULL) {
+                               DBG_ERR("talloc_asprintf failed\n");
+                               return -1;
+                       }
 
-       DEBUG(10,("inherit_new_acl: check directory %s\n",
-                       parent_name));
+                       DBG_NOTICE("setting 'create mask = %s'\n", create_mask_str);
 
-       status = get_nt_acl_xattr_internal(handle,
-                                       NULL,
-                                       parent_name,
-                                       (OWNER_SECURITY_INFORMATION |
-                                        GROUP_SECURITY_INFORMATION |
-                                        DACL_SECURITY_INFORMATION),
-                                       &parent_desc);
-        if (NT_STATUS_IS_OK(status)) {
-               /* Create an inherited descriptor from the parent. */
+                       lp_do_parameter (SNUM(handle->conn),
+                                       "create mask", create_mask_str);
 
-               if (DEBUGLEVEL >= 10) {
-                       DEBUG(10,("inherit_new_acl: parent acl is:\n"));
-                       NDR_PRINT_DEBUG(security_descriptor, parent_desc);
+                       TALLOC_FREE(create_mask_str);
                }
 
-               status = se_create_child_secdesc(ctx,
-                               &psd,
-                               &size,
-                               parent_desc,
-                               &handle->conn->server_info->ptok->user_sids[PRIMARY_USER_SID_INDEX],
-                               &handle->conn->server_info->ptok->user_sids[PRIMARY_GROUP_SID_INDEX],
-                               container);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
-
-               if (DEBUGLEVEL >= 10) {
-                       DEBUG(10,("inherit_new_acl: child acl is:\n"));
-                       NDR_PRINT_DEBUG(security_descriptor, psd);
+               DBG_NOTICE("setting 'directory mask = 0777', "
+                          "'store dos attributes = yes' and all "
+                          "'map ...' options to 'no'\n");
+
+               lp_do_parameter(SNUM(handle->conn), "directory mask", "0777");
+               lp_do_parameter(SNUM(handle->conn), "map archive", "no");
+               lp_do_parameter(SNUM(handle->conn), "map hidden", "no");
+               lp_do_parameter(SNUM(handle->conn), "map readonly", "no");
+               lp_do_parameter(SNUM(handle->conn), "map system", "no");
+               lp_do_parameter(SNUM(handle->conn), "store dos attributes",
+                               "yes");
+       }
+
+       security_acl_xattr_name = lp_parm_const_string(SNUM(handle->conn),
+                                         "acl_xattr",
+                                         "security_acl_name",
+                                         NULL);
+       if (security_acl_xattr_name != NULL) {
+               config->security_acl_xattr_name = talloc_strdup(config, security_acl_xattr_name);
+               if (config->security_acl_xattr_name == NULL) {
+                       return -1;
                }
+       }
 
-       } else {
-               DEBUG(10,("inherit_new_acl: directory %s failed "
-                       "to get acl %s\n",
-                       parent_name,
-                       nt_errstr(status) ));
-       }
-
-       if (!psd || psd->dacl == NULL) {
-               SMB_STRUCT_STAT sbuf;
-               int ret;
-
-               TALLOC_FREE(psd);
-               if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
-                       ret = SMB_VFS_FSTAT(fsp, &sbuf);
-               } else {
-                       if (fsp && fsp->posix_open) {
-                               ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf);
-                       } else {
-                               ret = SMB_VFS_STAT(handle->conn,fname, &sbuf);
-                       }
-               }
-               if (ret == -1) {
-                       return map_nt_error_from_unix(errno);
-               }
-               psd = default_file_sd(ctx, &sbuf);
-               if (!psd) {
-                       return NT_STATUS_NO_MEMORY;
-               }
+       return 0;
+}
 
-               if (DEBUGLEVEL >= 10) {
-                       DEBUG(10,("inherit_new_acl: default acl is:\n"));
-                       NDR_PRINT_DEBUG(security_descriptor, psd);
-               }
-       }
+static int acl_xattr_unlinkat(vfs_handle_struct *handle,
+                        struct files_struct *dirfsp,
+                        const struct smb_filename *smb_fname,
+                        int flags)
+{
+       int ret;
 
-       status = create_acl_blob(psd, &blob);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-       if (fsp) {
-               return store_acl_blob_fsp(handle, fsp, &blob);
+       if (flags & AT_REMOVEDIR) {
+               ret = rmdir_acl_common(handle,
+                               dirfsp,
+                               smb_fname);
        } else {
-               return store_acl_blob_pathname(handle, fname, &blob);
+               ret = unlink_acl_common(handle,
+                               dirfsp,
+                               smb_fname,
+                               flags);
        }
+       return ret;
 }
 
-/*********************************************************************
- Check ACL on open. For new files inherit from parent directory.
-*********************************************************************/
+static NTSTATUS acl_xattr_fget_nt_acl(vfs_handle_struct *handle,
+                                     files_struct *fsp,
+                                     uint32_t security_info,
+                                     TALLOC_CTX *mem_ctx,
+                                     struct security_descriptor **ppdesc)
+{
+       NTSTATUS status;
+       status = fget_nt_acl_common(fget_acl_blob, handle, fsp,
+                                  security_info, mem_ctx, ppdesc);
+       return status;
+}
 
-static int open_acl_xattr(vfs_handle_struct *handle,
-                                       struct smb_filename *smb_fname,
-                                       files_struct *fsp,
-                                       int flags,
-                                       mode_t mode)
+static NTSTATUS acl_xattr_fset_nt_acl(vfs_handle_struct *handle,
+                                     files_struct *fsp,
+                                     uint32_t security_info_sent,
+                                     const struct security_descriptor *psd)
 {
-       uint32_t access_granted = 0;
-       struct security_descriptor *pdesc = NULL;
-       bool file_existed = true;
-       char *fname = NULL;
        NTSTATUS status;
+       status = fset_nt_acl_common(fget_acl_blob, store_acl_blob_fsp,
+                                   ACL_MODULE_NAME,
+                                   handle, fsp, security_info_sent, psd);
+       return status;
+}
 
-       status = get_full_smb_filename(talloc_tos(), smb_fname,
-                                      &fname);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
+struct acl_xattr_getxattrat_state {
+       struct vfs_aio_state aio_state;
+       ssize_t xattr_size;
+       uint8_t *xattr_value;
+};
 
-       status = get_nt_acl_xattr_internal(handle,
-                                       NULL,
-                                       fname,
-                                       (OWNER_SECURITY_INFORMATION |
-                                        GROUP_SECURITY_INFORMATION |
-                                        DACL_SECURITY_INFORMATION),
-                                       &pdesc);
-        if (NT_STATUS_IS_OK(status)) {
-               /* See if we can access it. */
-               status = smb1_file_se_access_check(pdesc,
-                                       handle->conn->server_info->ptok,
-                                       fsp->access_mask,
-                                       &access_granted);
-               if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(10,("open_acl_xattr: file %s open "
-                               "refused with error %s\n",
-                               smb_fname_str_dbg(smb_fname),
-                               nt_errstr(status) ));
-                       errno = map_errno_from_nt_status(status);
-                       return -1;
-               }
-        } else if (NT_STATUS_EQUAL(status,NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
-               file_existed = false;
-       }
+static void acl_xattr_getxattrat_done(struct tevent_req *subreq);
 
-       DEBUG(10,("open_acl_xattr: get_nt_acl_attr_internal for "
-               "file %s returned %s\n",
-               smb_fname_str_dbg(smb_fname),
-               nt_errstr(status) ));
+static struct tevent_req *acl_xattr_getxattrat_send(
+                               TALLOC_CTX *mem_ctx,
+                               struct tevent_context *ev,
+                               struct vfs_handle_struct *handle,
+                               files_struct *dirfsp,
+                               const struct smb_filename *smb_fname,
+                               const char *xattr_name,
+                               size_t alloc_hint)
+{
+       struct tevent_req *req = NULL;
+       struct tevent_req *subreq = NULL;
+       struct acl_xattr_getxattrat_state *state = NULL;
+       struct acl_common_config *config = NULL;
+
+       SMB_VFS_HANDLE_GET_DATA(handle, config,
+                               struct acl_common_config,
+                               return NULL);
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct acl_xattr_getxattrat_state);
+       if (req == NULL) {
+               return NULL;
+       }
 
-       fsp->fh->fd = SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
+       if (strequal(xattr_name, config->security_acl_xattr_name)) {
+               tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
+               return tevent_req_post(req, ev);
+       }
+       if (config->security_acl_xattr_name != NULL &&
+           strequal(xattr_name, XATTR_NTACL_NAME))
+       {
+               xattr_name = config->security_acl_xattr_name;
+       }
 
-       if (!file_existed && fsp->fh->fd != -1) {
-               /* File was created. Inherit from parent directory. */
-               string_set(&fsp->fsp_name, fname);
-               inherit_new_acl(handle, fname, fsp, false);
+       subreq = SMB_VFS_NEXT_GETXATTRAT_SEND(state,
+                                             ev,
+                                             handle,
+                                             dirfsp,
+                                             smb_fname,
+                                             xattr_name,
+                                             alloc_hint);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
+       tevent_req_set_callback(subreq, acl_xattr_getxattrat_done, req);
 
-       return fsp->fh->fd;
+       return req;
 }
 
-static int mkdir_acl_xattr(vfs_handle_struct *handle, const char *path, mode_t mode)
+static void acl_xattr_getxattrat_done(struct tevent_req *subreq)
 {
-       int ret = SMB_VFS_NEXT_MKDIR(handle, path, mode);
-
-       if (ret == -1) {
-               return ret;
-       }
-       /* New directory - inherit from parent. */
-       inherit_new_acl(handle, path, NULL, true);
-       return ret;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct acl_xattr_getxattrat_state *state = tevent_req_data(
+               req, struct acl_xattr_getxattrat_state);
+
+       state->xattr_size = SMB_VFS_NEXT_GETXATTRAT_RECV(subreq,
+                                                        &state->aio_state,
+                                                        state,
+                                                        &state->xattr_value);
+       TALLOC_FREE(subreq);
+       if (state->xattr_size == -1) {
+               tevent_req_error(req, state->aio_state.error);
+               return;
+       }
+
+       tevent_req_done(req);
 }
 
-/*********************************************************************
- Fetch a security descriptor given an fsp.
-*********************************************************************/
-
-static NTSTATUS fget_nt_acl_xattr(vfs_handle_struct *handle, files_struct *fsp,
-        uint32 security_info, struct security_descriptor **ppdesc)
+static ssize_t acl_xattr_getxattrat_recv(struct tevent_req *req,
+                                        struct vfs_aio_state *aio_state,
+                                        TALLOC_CTX *mem_ctx,
+                                        uint8_t **xattr_value)
 {
-       NTSTATUS status = get_nt_acl_xattr_internal(handle, fsp,
-                               NULL, security_info, ppdesc);
-       if (NT_STATUS_IS_OK(status)) {
-               if (DEBUGLEVEL >= 10) {
-                       DEBUG(10,("fget_nt_acl_xattr: returning xattr sd for file %s\n",
-                               fsp->fsp_name));
-                       NDR_PRINT_DEBUG(security_descriptor, *ppdesc);
-               }
-               return NT_STATUS_OK;
+       struct acl_xattr_getxattrat_state *state = tevent_req_data(
+               req, struct acl_xattr_getxattrat_state);
+       ssize_t xattr_size;
+
+       if (tevent_req_is_unix_error(req, &aio_state->error)) {
+               tevent_req_received(req);
+               return -1;
        }
 
-       DEBUG(10,("fget_nt_acl_xattr: failed to get xattr sd for file %s, Error %s\n",
-                       fsp->fsp_name,
-                       nt_errstr(status) ));
+       *aio_state = state->aio_state;
+       xattr_size = state->xattr_size;
+       if (xattr_value != NULL) {
+               *xattr_value = talloc_move(mem_ctx, &state->xattr_value);
+       }
 
-       return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp,
-                       security_info, ppdesc);
+       tevent_req_received(req);
+       return xattr_size;
 }
 
-/*********************************************************************
- Fetch a security descriptor given a pathname.
-*********************************************************************/
-
-static NTSTATUS get_nt_acl_xattr(vfs_handle_struct *handle,
-        const char *name, uint32 security_info, struct security_descriptor **ppdesc)
+static ssize_t acl_xattr_fgetxattr(struct vfs_handle_struct *handle,
+                                  struct files_struct *fsp,
+                                  const char *name,
+                                  void *value,
+                                  size_t size)
 {
-       NTSTATUS status = get_nt_acl_xattr_internal(handle, NULL,
-                               name, security_info, ppdesc);
-       if (NT_STATUS_IS_OK(status)) {
-               if (DEBUGLEVEL >= 10) {
-                       DEBUG(10,("get_nt_acl_xattr: returning xattr sd for file %s\n",
-                               name));
-                       NDR_PRINT_DEBUG(security_descriptor, *ppdesc);
-               }
-               return NT_STATUS_OK;
-       }
+       struct acl_common_config *config = NULL;
 
-       DEBUG(10,("get_nt_acl_xattr: failed to get xattr sd for file %s, Error %s\n",
-                       name,
-                       nt_errstr(status) ));
+       SMB_VFS_HANDLE_GET_DATA(handle, config,
+                               struct acl_common_config,
+                               return -1);
 
-       return SMB_VFS_NEXT_GET_NT_ACL(handle, name,
-                       security_info, ppdesc);
-}
+       if (strequal(name, config->security_acl_xattr_name)) {
+               errno = EACCES;
+               return -1;
+       }
+       if (config->security_acl_xattr_name != NULL &&
+           strequal(name, XATTR_NTACL_NAME))
+       {
+               name = config->security_acl_xattr_name;
+       }
 
-/*********************************************************************
- Store a security descriptor given an fsp.
-*********************************************************************/
+       return SMB_VFS_NEXT_FGETXATTR(handle, fsp, name, value, size);
+}
 
-static NTSTATUS fset_nt_acl_xattr(vfs_handle_struct *handle, files_struct *fsp,
-        uint32 security_info_sent, const struct security_descriptor *psd)
+static ssize_t acl_xattr_flistxattr(struct vfs_handle_struct *handle,
+                                   struct files_struct *fsp,
+                                   char *listbuf,
+                                   size_t bufsize)
 {
-       NTSTATUS status;
-       DATA_BLOB blob;
+       struct acl_common_config *config = NULL;
+       ssize_t size;
+       char *p = NULL;
+       size_t nlen, consumed;
 
-       if (DEBUGLEVEL >= 10) {
-               DEBUG(10,("fset_nt_acl_xattr: incoming sd for file %s\n",
-                       fsp->fsp_name));
-               NDR_PRINT_DEBUG(security_descriptor,
-                       CONST_DISCARD(struct security_descriptor *,psd));
-       }
+       SMB_VFS_HANDLE_GET_DATA(handle, config,
+                               struct acl_common_config,
+                               return -1);
 
-       status = SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       size = SMB_VFS_NEXT_FLISTXATTR(handle, fsp, listbuf, bufsize);
+       if (size < 0) {
+               return -1;
        }
 
-       /* Ensure owner and group are set. */
-       if (!psd->owner_sid || !psd->group_sid) {
-               int ret;
-               SMB_STRUCT_STAT sbuf;
-               DOM_SID owner_sid, group_sid;
-               struct security_descriptor *nc_psd = dup_sec_desc(talloc_tos(), psd);
-
-               if (!nc_psd) {
-                       return NT_STATUS_OK;
-               }
-               if (fsp->is_directory || fsp->fh->fd == -1) {
-                       if (fsp->posix_open) {
-                               ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf);
-                       } else {
-                               ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf);
-                       }
-               } else {
-                       ret = SMB_VFS_FSTAT(fsp, &sbuf);
+       p = listbuf;
+       while (p - listbuf < size) {
+               nlen = strlen(p) + 1;
+               if (strequal(p, config->security_acl_xattr_name)) {
+                       break;
                }
-               if (ret == -1) {
-                       /* Lower level acl set succeeded,
-                        * so still return OK. */
-                       return NT_STATUS_OK;
-               }
-               create_file_sids(&sbuf, &owner_sid, &group_sid);
-               /* This is safe as nc_psd is discarded at fn exit. */
-               nc_psd->owner_sid = &owner_sid;
-               nc_psd->group_sid = &group_sid;
-               security_info_sent |= (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION);
-               psd = nc_psd;
-       }
-
-#if 0
-       if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
-                       psd->dacl != NULL &&
-                       (psd->type & (SE_DESC_DACL_AUTO_INHERITED|
-                               SE_DESC_DACL_AUTO_INHERIT_REQ))==
-                               (SE_DESC_DACL_AUTO_INHERITED|
-                               SE_DESC_DACL_AUTO_INHERIT_REQ) ) {
-               struct security_descriptor *new_psd = NULL;
-               status = append_parent_acl(fsp, psd, &new_psd);
-               if (!NT_STATUS_IS_OK(status)) {
-                       /* Lower level acl set succeeded,
-                        * so still return OK. */
-                       return NT_STATUS_OK;
-               }
-               psd = new_psd;
+               p += nlen;
+       }
+       if (p - listbuf >= size) {
+               /* No match */
+               return size;
        }
-#endif
 
-       if (DEBUGLEVEL >= 10) {
-               DEBUG(10,("fset_nt_acl_xattr: storing xattr sd for file %s\n",
-                       fsp->fsp_name));
-               NDR_PRINT_DEBUG(security_descriptor,
-                       CONST_DISCARD(struct security_descriptor *,psd));
+       /*
+        * The consumed helper variable just makes the math
+        * a bit more digestible.
+        */
+       consumed = p - listbuf;
+       if (consumed + nlen < size) {
+               /* If not the last name move, else just skip */
+               memmove(p, p + nlen, size - consumed - nlen);
        }
-       create_acl_blob(psd, &blob);
-       store_acl_blob_fsp(handle, fsp, &blob);
+       size -= nlen;
 
-       return NT_STATUS_OK;
+       return size;
 }
 
-/*********************************************************************
- Remove a Windows ACL - we're setting the underlying POSIX ACL.
-*********************************************************************/
-
-static int sys_acl_set_file_xattr(vfs_handle_struct *handle,
-                              const char *name,
-                              SMB_ACL_TYPE_T type,
-                              SMB_ACL_T theacl)
+static int acl_xattr_fremovexattr(struct vfs_handle_struct *handle,
+                                 struct files_struct *fsp,
+                                 const char *name)
 {
-       int ret = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle,
-                                               name,
-                                               type,
-                                               theacl);
-       if (ret == -1) {
-               return -1;
-       }
+       struct acl_common_config *config = NULL;
 
-       become_root();
-       SMB_VFS_REMOVEXATTR(handle->conn, name, XATTR_NTACL_NAME);
-       unbecome_root();
-
-       return ret;
-}
+       SMB_VFS_HANDLE_GET_DATA(handle, config,
+                               struct acl_common_config,
+                               return -1);
 
-/*********************************************************************
- Remove a Windows ACL - we're setting the underlying POSIX ACL.
-*********************************************************************/
-
-static int sys_acl_set_fd_xattr(vfs_handle_struct *handle,
-                            files_struct *fsp,
-                            SMB_ACL_T theacl)
-{
-       int ret = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle,
-                                               fsp,
-                                               theacl);
-       if (ret == -1) {
+       if (strequal(name, config->security_acl_xattr_name)) {
+               errno = EACCES;
                return -1;
        }
+       if (config->security_acl_xattr_name != NULL &&
+           strequal(name, XATTR_NTACL_NAME))
+       {
+               name = config->security_acl_xattr_name;
+       }
 
-       become_root();
-       SMB_VFS_FREMOVEXATTR(fsp, XATTR_NTACL_NAME);
-       unbecome_root();
-
-       return ret;
+       return SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name);
 }
 
-/* VFS operations structure */
-
-static vfs_op_tuple skel_op_tuples[] =
+static int acl_xattr_fsetxattr(struct vfs_handle_struct *handle,
+                              struct files_struct *fsp,
+                              const char *name,
+                              const void *value,
+                              size_t size,
+                              int flags)
 {
-       {SMB_VFS_OP(mkdir_acl_xattr), SMB_VFS_OP_MKDIR, SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(open_acl_xattr),  SMB_VFS_OP_OPEN,  SMB_VFS_LAYER_TRANSPARENT},
+       struct acl_common_config *config = NULL;
 
-        /* NT File ACL operations */
+       SMB_VFS_HANDLE_GET_DATA(handle, config,
+                               struct acl_common_config,
+                               return -1);
 
-       {SMB_VFS_OP(fget_nt_acl_xattr),SMB_VFS_OP_FGET_NT_ACL,SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(get_nt_acl_xattr), SMB_VFS_OP_GET_NT_ACL, SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(fset_nt_acl_xattr),SMB_VFS_OP_FSET_NT_ACL,SMB_VFS_LAYER_TRANSPARENT},
+       if (strequal(name, config->security_acl_xattr_name)) {
+               errno = EACCES;
+               return -1;
+       }
+       if (config->security_acl_xattr_name != NULL &&
+           strequal(name, XATTR_NTACL_NAME))
+       {
+               name = config->security_acl_xattr_name;
+       }
 
-       /* POSIX ACL operations. */
-       {SMB_VFS_OP(sys_acl_set_file_xattr), SMB_VFS_OP_SYS_ACL_SET_FILE, SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(sys_acl_set_fd_xattr), SMB_VFS_OP_SYS_ACL_SET_FD, SMB_VFS_LAYER_TRANSPARENT},
+       return SMB_VFS_NEXT_FSETXATTR(handle, fsp, name, value, size, flags);
+}
 
-       {SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
+static struct vfs_fn_pointers vfs_acl_xattr_fns = {
+       .connect_fn = connect_acl_xattr,
+       .unlinkat_fn = acl_xattr_unlinkat,
+       .fchmod_fn = fchmod_acl_module_common,
+       .fget_nt_acl_fn = acl_xattr_fget_nt_acl,
+       .fset_nt_acl_fn = acl_xattr_fset_nt_acl,
+       .sys_acl_set_fd_fn = sys_acl_set_fd_xattr,
+       .getxattrat_send_fn = acl_xattr_getxattrat_send,
+       .getxattrat_recv_fn = acl_xattr_getxattrat_recv,
+       .fgetxattr_fn = acl_xattr_fgetxattr,
+       .flistxattr_fn = acl_xattr_flistxattr,
+       .fremovexattr_fn = acl_xattr_fremovexattr,
+       .fsetxattr_fn = acl_xattr_fsetxattr,
 };
 
-NTSTATUS vfs_acl_xattr_init(void)
+static_decl_vfs;
+NTSTATUS vfs_acl_xattr_init(TALLOC_CTX *ctx)
 {
-       return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "acl_xattr", skel_op_tuples);
+       return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "acl_xattr",
+                               &vfs_acl_xattr_fns);
 }