s4-pvfs: change the handling of access checking on create
[ira/wip.git] / source4 / ntvfs / posix / pvfs_acl.c
index 7e4b07a9410b438da4a9f4cf4d57eaa26227cc31..842aced6f2f4d673a2bc9de3f311e418eacaed92 100644 (file)
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "auth/auth.h"
 #include "vfs_posix.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
+#include "librpc/gen_ndr/xattr.h"
+#include "libcli/security/security.h"
+#include "param/param.h"
+
+
+/* the list of currently registered ACL backends */
+static struct pvfs_acl_backend {
+       const struct pvfs_acl_ops *ops;
+} *backends = NULL;
+static int num_backends;
+
+/*
+  register a pvfs acl backend. 
+
+  The 'name' can be later used by other backends to find the operations
+  structure for this backend.  
+*/
+NTSTATUS pvfs_acl_register(const struct pvfs_acl_ops *ops)
+{
+       struct pvfs_acl_ops *new_ops;
+
+       if (pvfs_acl_backend_byname(ops->name) != NULL) {
+               DEBUG(0,("pvfs acl backend '%s' already registered\n", ops->name));
+               return NT_STATUS_OBJECT_NAME_COLLISION;
+       }
+
+       backends = talloc_realloc(talloc_autofree_context(), backends, struct pvfs_acl_backend, num_backends+1);
+       NT_STATUS_HAVE_NO_MEMORY(backends);
+
+       new_ops = (struct pvfs_acl_ops *)talloc_memdup(backends, ops, sizeof(*ops));
+       new_ops->name = talloc_strdup(new_ops, ops->name);
+
+       backends[num_backends].ops = new_ops;
+
+       num_backends++;
+
+       DEBUG(3,("NTVFS backend '%s' registered\n", ops->name));
+
+       return NT_STATUS_OK;
+}
+
+
+/*
+  return the operations structure for a named backend
+*/
+const struct pvfs_acl_ops *pvfs_acl_backend_byname(const char *name)
+{
+       int i;
+
+       for (i=0;i<num_backends;i++) {
+               if (strcmp(backends[i].ops->name, name) == 0) {
+                       return backends[i].ops;
+               }
+       }
+
+       return NULL;
+}
+
+NTSTATUS pvfs_acl_init(struct loadparm_context *lp_ctx)
+{
+       static bool initialized = false;
+       extern NTSTATUS pvfs_acl_nfs4_init(void);
+       extern NTSTATUS pvfs_acl_xattr_init(void);
+       init_module_fn static_init[] = { STATIC_pvfs_acl_MODULES };
+       init_module_fn *shared_init;
+
+       if (initialized) return NT_STATUS_OK;
+       initialized = true;
+
+       shared_init = load_samba_modules(NULL, lp_ctx, "pvfs_acl");
+
+       run_init_functions(static_init);
+       run_init_functions(shared_init);
+
+       talloc_free(shared_init);
+
+       return NT_STATUS_OK;
+}
 
 
 /*
@@ -51,6 +127,8 @@ static void pvfs_translate_generic_bits(struct security_acl *acl)
 {
        unsigned i;
 
+       if (!acl) return;
+
        for (i=0;i<acl->num_aces;i++) {
                struct security_ace *ace = &acl->aces[i];
                ace->access_mask = pvfs_translate_mask(ace->access_mask);
@@ -62,29 +140,50 @@ static void pvfs_translate_generic_bits(struct security_acl *acl)
   setup a default ACL for a file
 */
 static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs,
-                                struct smbsrv_request *req,
+                                struct ntvfs_request *req,
                                 struct pvfs_filename *name, int fd, 
-                                struct xattr_NTACL *acl)
+                                struct security_descriptor **psd)
 {
        struct security_descriptor *sd;
        NTSTATUS status;
        struct security_ace ace;
        mode_t mode;
+       struct id_mapping *ids;
+       struct composite_context *ctx;
 
-       sd = security_descriptor_initialise(req);
-       if (sd == NULL) {
+       *psd = security_descriptor_initialise(req);
+       if (*psd == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
+       sd = *psd;
 
-       status = sidmap_uid_to_sid(pvfs->sidmap, sd, name->st.st_uid, &sd->owner_sid);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-       status = sidmap_gid_to_sid(pvfs->sidmap, sd, name->st.st_gid, &sd->group_sid);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       ids = talloc_zero_array(sd, struct id_mapping, 2);
+       NT_STATUS_HAVE_NO_MEMORY(ids);
+
+       ids[0].unixid = talloc(ids, struct unixid);
+       NT_STATUS_HAVE_NO_MEMORY(ids[0].unixid);
+
+       ids[0].unixid->id = name->st.st_uid;
+       ids[0].unixid->type = ID_TYPE_UID;
+       ids[0].sid = NULL;
+
+       ids[1].unixid = talloc(ids, struct unixid);
+       NT_STATUS_HAVE_NO_MEMORY(ids[1].unixid);
+
+       ids[1].unixid->id = name->st.st_gid;
+       ids[1].unixid->type = ID_TYPE_GID;
+       ids[1].sid = NULL;
+
+       ctx = wbc_xids_to_sids_send(pvfs->wbc_ctx, ids, 2, ids);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
 
+       status = wbc_xids_to_sids_recv(ctx, &ids);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       sd->owner_sid = talloc_steal(sd, ids[0].sid);
+       sd->group_sid = talloc_steal(sd, ids[1].sid);
+
+       talloc_free(ids);
        sd->type |= SEC_DESC_DACL_PRESENT;
 
        mode = name->st.st_mode;
@@ -151,9 +250,6 @@ static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs,
        ace.access_mask = SEC_RIGHTS_FILE_ALL;
        security_descriptor_dacl_add(sd, &ace);
        
-       acl->version = 1;
-       acl->info.sd = sd;
-
        return NT_STATUS_OK;
 }
                                 
@@ -182,83 +278,114 @@ static void normalise_sd_flags(struct security_descriptor *sd, uint32_t secinfo_
   answer a setfileinfo for an ACL
 */
 NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs, 
-                     struct smbsrv_request *req,
+                     struct ntvfs_request *req,
                      struct pvfs_filename *name, int fd, 
                      uint32_t access_mask,
                      union smb_setfileinfo *info)
 {
-       struct xattr_NTACL *acl;
        uint32_t secinfo_flags = info->set_secdesc.in.secinfo_flags;
        struct security_descriptor *new_sd, *sd, orig_sd;
-       NTSTATUS status;
-       uid_t uid = -1;
-       gid_t gid = -1;
+       NTSTATUS status = NT_STATUS_NOT_FOUND;
+       uid_t old_uid = -1;
+       gid_t old_gid = -1;
+       uid_t new_uid = -1;
+       gid_t new_gid = -1;
+       struct id_mapping *ids;
+       struct composite_context *ctx;
 
-       acl = talloc(req, struct xattr_NTACL);
-       if (acl == NULL) {
-               return NT_STATUS_NO_MEMORY;
+       if (pvfs->acl_ops != NULL) {
+               status = pvfs->acl_ops->acl_load(pvfs, name, fd, req, &sd);
        }
-
-       status = pvfs_acl_load(pvfs, name, fd, acl);
        if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
-               status = pvfs_default_acl(pvfs, req, name, fd, acl);
+               status = pvfs_default_acl(pvfs, req, name, fd, &sd);
        }
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       switch (acl->version) {
-       case 1:
-               sd = acl->info.sd;
-               break;
-       default:
-               return NT_STATUS_INVALID_ACL;
-       }
+       ids = talloc(req, struct id_mapping);
+       NT_STATUS_HAVE_NO_MEMORY(ids);
+       ids->unixid = NULL;
+       ids->sid = NULL;
+       ids->status = NT_STATUS_NONE_MAPPED;
 
        new_sd = info->set_secdesc.in.sd;
        orig_sd = *sd;
 
-       uid = name->st.st_uid;
-       gid = name->st.st_gid;
+       old_uid = name->st.st_uid;
+       old_gid = name->st.st_gid;
 
        /* only set the elements that have been specified */
-       if ((secinfo_flags & SECINFO_OWNER) && 
-           !dom_sid_equal(sd->owner_sid, new_sd->owner_sid)) {
+       if (secinfo_flags & SECINFO_OWNER) {
                if (!(access_mask & SEC_STD_WRITE_OWNER)) {
                        return NT_STATUS_ACCESS_DENIED;
                }
-               sd->owner_sid = new_sd->owner_sid;
-               status = sidmap_sid_to_unixuid(pvfs->sidmap, sd->owner_sid, &uid);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+               if (!dom_sid_equal(sd->owner_sid, new_sd->owner_sid)) {
+                       ids->sid = new_sd->owner_sid;
+                       ctx = wbc_sids_to_xids_send(pvfs->wbc_ctx, ids, 1, ids);
+                       NT_STATUS_HAVE_NO_MEMORY(ctx);
+                       status = wbc_sids_to_xids_recv(ctx, &ids);
+                       NT_STATUS_NOT_OK_RETURN(status);
+
+                       if (ids->unixid->type == ID_TYPE_BOTH ||
+                           ids->unixid->type == ID_TYPE_UID) {
+                               new_uid = ids->unixid->id;
+                       }
                }
+               sd->owner_sid = new_sd->owner_sid;
        }
-       if ((secinfo_flags & SECINFO_GROUP) &&
-           !dom_sid_equal(sd->group_sid, new_sd->group_sid)) {
-               sd->group_sid = new_sd->group_sid;
-               status = sidmap_sid_to_unixgid(pvfs->sidmap, sd->owner_sid, &gid);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+       if (secinfo_flags & SECINFO_GROUP) {
+               if (!(access_mask & SEC_STD_WRITE_OWNER)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
+               if (!dom_sid_equal(sd->group_sid, new_sd->group_sid)) {
+                       ids->sid = new_sd->group_sid;
+                       ctx = wbc_sids_to_xids_send(pvfs->wbc_ctx, ids, 1, ids);
+                       NT_STATUS_HAVE_NO_MEMORY(ctx);
+                       status = wbc_sids_to_xids_recv(ctx, &ids);
+                       NT_STATUS_NOT_OK_RETURN(status);
+
+                       if (ids->unixid->type == ID_TYPE_BOTH ||
+                           ids->unixid->type == ID_TYPE_GID) {
+                               new_gid = ids->unixid->id;
+                       }
+
                }
+               sd->group_sid = new_sd->group_sid;
        }
        if (secinfo_flags & SECINFO_DACL) {
+               if (!(access_mask & SEC_STD_WRITE_DAC)) {
+                       return NT_STATUS_ACCESS_DENIED;
+               }
                sd->dacl = new_sd->dacl;
                pvfs_translate_generic_bits(sd->dacl);
        }
        if (secinfo_flags & SECINFO_SACL) {
-               sd->sacl = new_sd->sacl;
                if (!(access_mask & SEC_FLAG_SYSTEM_SECURITY)) {
                        return NT_STATUS_ACCESS_DENIED;
                }
+               sd->sacl = new_sd->sacl;
                pvfs_translate_generic_bits(sd->sacl);
        }
 
-       if (uid != -1 || gid != -1) {
+       if (new_uid == old_uid) {
+               new_uid = -1;
+       }
+
+       if (new_gid == old_gid) {
+               new_gid = -1;
+       }
+
+       /* if there's something to change try it */
+       if (new_uid != -1 || new_gid != -1) {
                int ret;
                if (fd == -1) {
-                       ret = chown(name->full_name, uid, gid);
+                       ret = chown(name->full_name, new_uid, new_gid);
                } else {
-                       ret = fchown(fd, uid, gid);
+                       ret = fchown(fd, new_uid, new_gid);
+               }
+               if (errno == EPERM && uwrap_enabled()) {
+                       ret = 0;
                }
                if (ret == -1) {
                        return pvfs_map_errno(pvfs, errno);
@@ -268,8 +395,8 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs,
        /* we avoid saving if the sd is the same. This means when clients
           copy files and end up copying the default sd that we don't
           needlessly use xattrs */
-       if (!security_descriptor_equal(sd, &orig_sd)) {
-               status = pvfs_acl_save(pvfs, name, fd, acl);
+       if (!security_descriptor_equal(sd, &orig_sd) && pvfs->acl_ops) {
+               status = pvfs->acl_ops->acl_save(pvfs, name, fd, sd);
        }
 
        return status;
@@ -280,35 +407,23 @@ NTSTATUS pvfs_acl_set(struct pvfs_state *pvfs,
   answer a fileinfo query for the ACL
 */
 NTSTATUS pvfs_acl_query(struct pvfs_state *pvfs, 
-                       struct smbsrv_request *req,
+                       struct ntvfs_request *req,
                        struct pvfs_filename *name, int fd, 
                        union smb_fileinfo *info)
 {
-       struct xattr_NTACL *acl;
-       NTSTATUS status;
+       NTSTATUS status = NT_STATUS_NOT_FOUND;
        struct security_descriptor *sd;
 
-       acl = talloc(req, struct xattr_NTACL);
-       if (acl == NULL) {
-               return NT_STATUS_NO_MEMORY;
+       if (pvfs->acl_ops) {
+               status = pvfs->acl_ops->acl_load(pvfs, name, fd, req, &sd);
        }
-
-       status = pvfs_acl_load(pvfs, name, fd, acl);
        if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
-               status = pvfs_default_acl(pvfs, req, name, fd, acl);
+               status = pvfs_default_acl(pvfs, req, name, fd, &sd);
        }
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       switch (acl->version) {
-       case 1:
-               sd = acl->info.sd;
-               break;
-       default:
-               return NT_STATUS_INVALID_ACL;
-       }
-
        normalise_sd_flags(sd, info->query_secdesc.in.secinfo_flags);
 
        info->query_secdesc.out.sd = sd;
@@ -317,35 +432,126 @@ NTSTATUS pvfs_acl_query(struct pvfs_state *pvfs,
 }
 
 
+/*
+  check the read only bit against any of the write access bits
+*/
+static bool pvfs_read_only(struct pvfs_state *pvfs, uint32_t access_mask)
+{
+       if ((pvfs->flags & PVFS_FLAG_READONLY) &&
+           (access_mask & (SEC_FILE_WRITE_DATA |
+                           SEC_FILE_APPEND_DATA | 
+                           SEC_FILE_WRITE_EA | 
+                           SEC_FILE_WRITE_ATTRIBUTE | 
+                           SEC_STD_DELETE | 
+                           SEC_STD_WRITE_DAC | 
+                           SEC_STD_WRITE_OWNER | 
+                           SEC_DIR_DELETE_CHILD))) {
+               return true;
+       }
+       return false;
+}
+
+/*
+  see if we are a member of the appropriate unix group
+ */
+static bool pvfs_group_member(struct pvfs_state *pvfs, gid_t gid)
+{
+       int i, ngroups;
+       gid_t *groups;
+       if (getegid() == gid) {
+               return true;
+       }
+       ngroups = getgroups(0, NULL);
+       if (ngroups == 0) {
+               return false;
+       }
+       groups = talloc_array(pvfs, gid_t, ngroups);
+       if (groups == NULL) {
+               return false;
+       }
+       if (getgroups(ngroups, groups) != ngroups) {
+               talloc_free(groups);
+               return false;
+       }
+       for (i=0; i<ngroups; i++) {
+               if (groups[i] == gid) break;
+       }
+       talloc_free(groups);
+       return i < ngroups;
+}
+
 /*
   default access check function based on unix permissions
   doing this saves on building a full security descriptor
   for the common case of access check on files with no 
   specific NT ACL
+
+  If name is NULL then treat as a new file creation
 */
 NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs, 
-                               struct smbsrv_request *req,
+                               struct ntvfs_request *req,
                                struct pvfs_filename *name,
                                uint32_t *access_mask)
 {
        uid_t uid = geteuid();
        uint32_t max_bits = SEC_RIGHTS_FILE_READ | SEC_FILE_ALL;
+       struct security_token *token = req->session_info->security_token;
 
-       /* owner and root get extra permissions */
-       if (uid == 0 || uid == name->st.st_uid) {
+       if (pvfs_read_only(pvfs, *access_mask)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       if (name == NULL || uid == name->st.st_uid) {
                max_bits |= SEC_STD_ALL;
+       } else if (security_token_has_privilege(token, SEC_PRIV_RESTORE)) {
+               max_bits |= SEC_STD_DELETE;
        }
 
-       if (*access_mask == SEC_FLAG_MAXIMUM_ALLOWED) {
-               *access_mask = max_bits;
-               return NT_STATUS_OK;
+       if (name == NULL ||
+           (name->st.st_mode & S_IWOTH) ||
+           ((name->st.st_mode & S_IWGRP) && 
+            pvfs_group_member(pvfs, name->st.st_gid))) {
+               max_bits |= SEC_STD_ALL;
+       }
+
+       if (uwrap_enabled()) {
+               /* when running with the uid wrapper, files will be created
+                  owned by the ruid, but we may have a different simulated 
+                  euid. We need to force the permission bits as though the 
+                  files owner matches the euid */
+               max_bits |= SEC_STD_ALL;
+       }
+
+       if (*access_mask & SEC_FLAG_MAXIMUM_ALLOWED) {
+               *access_mask |= max_bits;
+               *access_mask &= ~SEC_FLAG_MAXIMUM_ALLOWED;
+       }
+
+       if ((*access_mask & SEC_FLAG_SYSTEM_SECURITY) &&
+           security_token_has_privilege(token, SEC_PRIV_SECURITY)) {
+               max_bits |= SEC_FLAG_SYSTEM_SECURITY;
+       }
+       
+       if (((*access_mask & ~max_bits) & SEC_RIGHTS_PRIV_RESTORE) &&
+           security_token_has_privilege(token, SEC_PRIV_RESTORE)) {
+               max_bits |= ~(SEC_RIGHTS_PRIV_RESTORE);
+       }
+       if (((*access_mask & ~max_bits) & SEC_RIGHTS_PRIV_BACKUP) &&
+           security_token_has_privilege(token, SEC_PRIV_BACKUP)) {
+               max_bits |= ~(SEC_RIGHTS_PRIV_BACKUP);
        }
 
        if (*access_mask & ~max_bits) {
+               DEBUG(0,(__location__ " denied access to '%s' - wanted 0x%08x but got 0x%08x (missing 0x%08x)\n",
+                        name?name->full_name:"(new file)", *access_mask, max_bits, *access_mask & ~max_bits));
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       *access_mask |= SEC_FILE_READ_ATTRIBUTE;
+       if (pvfs->ntvfs->ctx->protocol != PROTOCOL_SMB2) {
+               /* on SMB, this bit is always granted, even if not
+                  asked for */
+               *access_mask |= SEC_FILE_READ_ATTRIBUTE;
+       }
 
        return NT_STATUS_OK;
 }
@@ -357,15 +563,25 @@ NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs,
   *access_mask is modified with the access actually granted
 */
 NTSTATUS pvfs_access_check(struct pvfs_state *pvfs, 
-                          struct smbsrv_request *req,
+                          struct ntvfs_request *req,
                           struct pvfs_filename *name,
                           uint32_t *access_mask)
 {
-       struct security_token *token = req->session->session_info->security_token;
+       struct security_token *token = req->session_info->security_token;
        struct xattr_NTACL *acl;
        NTSTATUS status;
        struct security_descriptor *sd;
 
+       /* on SMB2 a blank access mask is always denied */
+       if (pvfs->ntvfs->ctx->protocol == PROTOCOL_SMB2 &&
+           *access_mask == 0) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       if (pvfs_read_only(pvfs, *access_mask)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
        acl = talloc(req, struct xattr_NTACL);
        if (acl == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -373,7 +589,9 @@ NTSTATUS pvfs_access_check(struct pvfs_state *pvfs,
 
        /* expand the generic access bits to file specific bits */
        *access_mask = pvfs_translate_mask(*access_mask);
-       *access_mask &= ~SEC_FILE_READ_ATTRIBUTE;
+       if (pvfs->ntvfs->ctx->protocol != PROTOCOL_SMB2) {
+               *access_mask &= ~SEC_FILE_READ_ATTRIBUTE;
+       }
 
        status = pvfs_acl_load(pvfs, name, -1, acl);
        if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
@@ -395,8 +613,11 @@ NTSTATUS pvfs_access_check(struct pvfs_state *pvfs,
        /* check the acl against the required access mask */
        status = sec_access_check(sd, token, *access_mask, access_mask);
 
-       /* this bit is always granted, even if not asked for */
-       *access_mask |= SEC_FILE_READ_ATTRIBUTE;
+       if (pvfs->ntvfs->ctx->protocol != PROTOCOL_SMB2) {
+               /* on SMB, this bit is always granted, even if not
+                  asked for */
+               *access_mask |= SEC_FILE_READ_ATTRIBUTE;
+       }
 
        talloc_free(acl);
        
@@ -409,7 +630,7 @@ NTSTATUS pvfs_access_check(struct pvfs_state *pvfs,
   do not take or return an access check mask
 */
 NTSTATUS pvfs_access_check_simple(struct pvfs_state *pvfs, 
-                                 struct smbsrv_request *req,
+                                 struct ntvfs_request *req,
                                  struct pvfs_filename *name,
                                  uint32_t access_needed)
 {
@@ -423,35 +644,56 @@ NTSTATUS pvfs_access_check_simple(struct pvfs_state *pvfs,
   access check for creating a new file/directory
 */
 NTSTATUS pvfs_access_check_create(struct pvfs_state *pvfs, 
-                                 struct smbsrv_request *req,
+                                 struct ntvfs_request *req,
                                  struct pvfs_filename *name,
-                                 uint32_t *access_mask)
+                                 uint32_t *access_mask,
+                                 bool container,
+                                 struct security_descriptor **sd)
 {
        struct pvfs_filename *parent;
        NTSTATUS status;
+       struct security_token *token = req->session_info->security_token;
+
+       if (pvfs_read_only(pvfs, *access_mask)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
 
        status = pvfs_resolve_parent(pvfs, req, name, &parent);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       status = pvfs_access_check(pvfs, req, parent, access_mask);
+       status = pvfs_access_check_simple(pvfs, req, parent, SEC_DIR_ADD_FILE);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
-       if (! ((*access_mask) & SEC_DIR_ADD_FILE)) {
-               return pvfs_access_check_simple(pvfs, req, parent, SEC_DIR_ADD_FILE);
+       if (*sd == NULL) {
+               status = pvfs_acl_inherited_sd(pvfs, req, req, parent, container, sd);
        }
 
-       return status;
+       talloc_free(parent);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       /* expand the generic access bits to file specific bits */
+       *access_mask = pvfs_translate_mask(*access_mask);
+       if (pvfs->ntvfs->ctx->protocol != PROTOCOL_SMB2) {
+               *access_mask &= ~SEC_FILE_READ_ATTRIBUTE;
+       }
+
+       if (*sd == NULL) {
+               return pvfs_access_check_unix(pvfs, req, NULL, access_mask);
+       }
+       return sec_access_check(*sd, token, *access_mask, access_mask);
 }
 
 /*
   access check for creating a new file/directory - no access mask supplied
 */
 NTSTATUS pvfs_access_check_parent(struct pvfs_state *pvfs, 
-                                 struct smbsrv_request *req,
+                                 struct ntvfs_request *req,
                                  struct pvfs_filename *name,
                                  uint32_t access_mask)
 {
@@ -470,24 +712,24 @@ NTSTATUS pvfs_access_check_parent(struct pvfs_state *pvfs,
 /*
   determine if an ACE is inheritable
 */
-static BOOL pvfs_inheritable_ace(struct pvfs_state *pvfs,
+static bool pvfs_inheritable_ace(struct pvfs_state *pvfs,
                                 const struct security_ace *ace,
-                                BOOL container)
+                                bool container)
 {
        if (!container) {
                return (ace->flags & SEC_ACE_FLAG_OBJECT_INHERIT) != 0;
        }
 
        if (ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) {
-               return True;
+               return true;
        }
 
        if ((ace->flags & SEC_ACE_FLAG_OBJECT_INHERIT) &&
            !(ace->flags & SEC_ACE_FLAG_NO_PROPAGATE_INHERIT)) {
-               return True;
+               return true;
        }
 
-       return False;
+       return false;
 }
 
 /*
@@ -498,7 +740,7 @@ static BOOL pvfs_inheritable_ace(struct pvfs_state *pvfs,
 static NTSTATUS pvfs_acl_inherit_aces(struct pvfs_state *pvfs, 
                                      struct security_descriptor *parent_sd,
                                      struct security_descriptor *sd,
-                                     BOOL container)
+                                     bool container)
 {
        int i;
        
@@ -572,45 +814,42 @@ static NTSTATUS pvfs_acl_inherit_aces(struct pvfs_state *pvfs,
 
 
 /*
-  setup an ACL on a new file/directory based on the inherited ACL from
-  the parent. If there is no inherited ACL then we don't set anything,
-  as the default ACL applies anyway
+  calculate the ACL on a new file/directory based on the inherited ACL
+  from the parent. If there is no inherited ACL then return a NULL
+  ACL, which means the default ACL should be used
 */
-NTSTATUS pvfs_acl_inherit(struct pvfs_state *pvfs, 
-                         struct smbsrv_request *req,
-                         struct pvfs_filename *name,
-                         int fd)
+NTSTATUS pvfs_acl_inherited_sd(struct pvfs_state *pvfs, 
+                              TALLOC_CTX *mem_ctx,
+                              struct ntvfs_request *req,
+                              struct pvfs_filename *parent,
+                              bool container,
+                              struct security_descriptor **ret_sd)
 {
        struct xattr_NTACL *acl;
        NTSTATUS status;
-       struct pvfs_filename *parent;
        struct security_descriptor *parent_sd, *sd;
-       BOOL container;
+       struct id_mapping *ids;
+       struct composite_context *ctx;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
 
-       /* form the parents path */
-       status = pvfs_resolve_parent(pvfs, req, name, &parent);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       *ret_sd = NULL;
 
        acl = talloc(req, struct xattr_NTACL);
-       if (acl == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(acl, tmp_ctx);
 
        status = pvfs_acl_load(pvfs, parent, -1, acl);
        if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+               talloc_free(tmp_ctx);
                return NT_STATUS_OK;
        }
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       NT_STATUS_NOT_OK_RETURN_AND_FREE(status, tmp_ctx);
 
        switch (acl->version) {
        case 1:
                parent_sd = acl->info.sd;
                break;
        default:
+               talloc_free(tmp_ctx);
                return NT_STATUS_INVALID_ACL;
        }
 
@@ -618,43 +857,110 @@ NTSTATUS pvfs_acl_inherit(struct pvfs_state *pvfs,
            parent_sd->dacl == NULL ||
            parent_sd->dacl->num_aces == 0) {
                /* go with the default ACL */
+               talloc_free(tmp_ctx);
                return NT_STATUS_OK;
        }
 
        /* create the new sd */
        sd = security_descriptor_initialise(req);
-       if (sd == NULL) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sd, tmp_ctx);
 
-       status = sidmap_uid_to_sid(pvfs->sidmap, sd, name->st.st_uid, &sd->owner_sid);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-       status = sidmap_gid_to_sid(pvfs->sidmap, sd, name->st.st_gid, &sd->group_sid);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       ids = talloc_array(sd, struct id_mapping, 2);
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(ids, tmp_ctx);
 
-       sd->type |= SEC_DESC_DACL_PRESENT;
+       ids[0].unixid = talloc(ids, struct unixid);
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(ids[0].unixid, tmp_ctx);
+       ids[0].unixid->id = geteuid();
+       ids[0].unixid->type = ID_TYPE_UID;
+       ids[0].sid = NULL;
+       ids[0].status = NT_STATUS_NONE_MAPPED;
+
+       ids[1].unixid = talloc(ids, struct unixid);
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(ids[1].unixid, tmp_ctx);
+       ids[1].unixid->id = getegid();
+       ids[1].unixid->type = ID_TYPE_GID;
+       ids[1].sid = NULL;
+       ids[1].status = NT_STATUS_NONE_MAPPED;
+
+       ctx = wbc_xids_to_sids_send(pvfs->wbc_ctx, ids, 2, ids);
+       NT_STATUS_HAVE_NO_MEMORY_AND_FREE(ctx, tmp_ctx);
+
+       status = wbc_xids_to_sids_recv(ctx, &ids);
+       NT_STATUS_NOT_OK_RETURN_AND_FREE(status, tmp_ctx);
 
-       container = (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) ? True:False;
+       sd->owner_sid = talloc_steal(sd, ids[0].sid);
+       sd->group_sid = talloc_steal(sd, ids[1].sid);
+
+       sd->type |= SEC_DESC_DACL_PRESENT;
 
        /* fill in the aces from the parent */
        status = pvfs_acl_inherit_aces(pvfs, parent_sd, sd, container);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       NT_STATUS_NOT_OK_RETURN_AND_FREE(status, tmp_ctx);
 
        /* if there is nothing to inherit then we fallback to the
           default acl */
        if (sd->dacl == NULL || sd->dacl->num_aces == 0) {
+               talloc_free(tmp_ctx);
                return NT_STATUS_OK;
        }
 
-       acl->info.sd = sd;
+       *ret_sd = talloc_steal(mem_ctx, sd);
+
+       talloc_free(tmp_ctx);
+       return NT_STATUS_OK;
+}
+
+
+/*
+  setup an ACL on a new file/directory based on the inherited ACL from
+  the parent. If there is no inherited ACL then we don't set anything,
+  as the default ACL applies anyway
+*/
+NTSTATUS pvfs_acl_inherit(struct pvfs_state *pvfs, 
+                         struct ntvfs_request *req,
+                         struct pvfs_filename *name,
+                         int fd)
+{
+       struct xattr_NTACL acl;
+       NTSTATUS status;
+       struct security_descriptor *sd;
+       struct pvfs_filename *parent;
+       bool container;
+
+       /* form the parents path */
+       status = pvfs_resolve_parent(pvfs, req, name, &parent);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       container = (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) ? true:false;
+
+       status = pvfs_acl_inherited_sd(pvfs, req, req, parent, container, &sd);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(parent);
+               return status;
+       }
+
+       if (sd == NULL) {
+               return NT_STATUS_OK;
+       }
+
+       acl.version = 1;
+       acl.info.sd = sd;
+
+       status = pvfs_acl_save(pvfs, name, fd, &acl);
+       talloc_free(sd);
+       talloc_free(parent);
 
-       status = pvfs_acl_save(pvfs, name, fd, acl);
-       
        return status;
 }
+
+/*
+  return the maximum allowed access mask
+*/
+NTSTATUS pvfs_access_maximal_allowed(struct pvfs_state *pvfs, 
+                                    struct ntvfs_request *req,
+                                    struct pvfs_filename *name,
+                                    uint32_t *maximal_access)
+{
+       *maximal_access = SEC_FLAG_MAXIMUM_ALLOWED;
+       return pvfs_access_check(pvfs, req, name, maximal_access);
+}