Fix the build of nfsv4_acls.c
[ira/wip.git] / source3 / modules / nfs4_acls.c
index 200f87a559822341f5b0aa5f500195504d01d814..462e59313ab471884e0770ba9a61aa6ab67c9860 100644 (file)
 #include "includes.h"
 #include "nfs4_acls.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_ACLS
+
 #define SMBACL4_PARAM_TYPE_NAME "nfs4"
 
+extern const struct generic_mapping file_generic_mapping;
+
 #define SMB_ACE4_INT_MAGIC 0x76F8A967
 typedef struct _SMB_ACE4_INT_T
 {
@@ -39,15 +44,10 @@ typedef struct _SMB_ACL4_INT_T
        SMB_ACE4_INT_T  *last;
 } SMB_ACL4_INT_T;
 
-extern struct current_user current_user;
-extern int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid);
-extern NTSTATUS unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp,
-       uint32 security_info_sent, SEC_DESC *psd);
-
-static SMB_ACL4_INT_T *get_validated_aclint(SMB4ACL_T *acl)
+static SMB_ACL4_INT_T *get_validated_aclint(SMB4ACL_T *theacl)
 {
-       SMB_ACL4_INT_T *aclint = (SMB_ACL4_INT_T *)acl;
-       if (acl==NULL)
+       SMB_ACL4_INT_T *aclint = (SMB_ACL4_INT_T *)theacl;
+       if (theacl==NULL)
        {
                DEBUG(2, ("acl is NULL\n"));
                errno = EINVAL;
@@ -82,23 +82,23 @@ static SMB_ACE4_INT_T *get_validated_aceint(SMB4ACE_T *ace)
 
 SMB4ACL_T *smb_create_smb4acl(void)
 {
-       TALLOC_CTX *mem_ctx = main_loop_talloc_get();
-       SMB_ACL4_INT_T  *acl = (SMB_ACL4_INT_T *)TALLOC_ZERO_SIZE(mem_ctx, sizeof(SMB_ACL4_INT_T));
-       if (acl==NULL)
+       TALLOC_CTX *mem_ctx = talloc_tos();
+       SMB_ACL4_INT_T  *theacl = (SMB_ACL4_INT_T *)TALLOC_ZERO_SIZE(mem_ctx, sizeof(SMB_ACL4_INT_T));
+       if (theacl==NULL)
        {
                DEBUG(0, ("TALLOC_SIZE failed\n"));
                errno = ENOMEM;
                return NULL;
        }
-       acl->magic = SMB_ACL4_INT_MAGIC;
-       /* acl->first, last = NULL not needed */
-       return (SMB4ACL_T *)acl;
+       theacl->magic = SMB_ACL4_INT_MAGIC;
+       /* theacl->first, last = NULL not needed */
+       return (SMB4ACL_T *)theacl;
 }
 
-SMB4ACE_T *smb_add_ace4(SMB4ACL_T *acl, SMB_ACE4PROP_T *prop)
+SMB4ACE_T *smb_add_ace4(SMB4ACL_T *theacl, SMB_ACE4PROP_T *prop)
 {
-       SMB_ACL4_INT_T *aclint = get_validated_aclint(acl);
-       TALLOC_CTX *mem_ctx = main_loop_talloc_get();
+       SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
+       TALLOC_CTX *mem_ctx = talloc_tos();
        SMB_ACE4_INT_T *ace;
 
        ace = (SMB_ACE4_INT_T *)TALLOC_ZERO_SIZE(mem_ctx, sizeof(SMB_ACE4_INT_T));
@@ -143,63 +143,75 @@ SMB4ACE_T *smb_next_ace4(SMB4ACE_T *ace)
        return (SMB4ACE_T *)aceint->next;
 }
 
-SMB4ACE_T *smb_first_ace4(SMB4ACL_T *acl)
+SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl)
 {
-       SMB_ACL4_INT_T *aclint = get_validated_aclint(acl);
+       SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
        if (aclint==NULL)
                return NULL;
 
        return (SMB4ACE_T *)aclint->first;
 }
 
-uint32 smb_get_naces(SMB4ACL_T *acl)
+uint32 smb_get_naces(SMB4ACL_T *theacl)
 {
-       SMB_ACL4_INT_T *aclint = get_validated_aclint(acl);
+       SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
        if (aclint==NULL)
                return 0;
 
        return aclint->naces;
 }
 
-static int smbacl4_GetFileOwner(files_struct *fsp, SMB_STRUCT_STAT *psbuf)
+static int smbacl4_GetFileOwner(struct connection_struct *conn,
+                               const char *filename,
+                               SMB_STRUCT_STAT *psbuf)
+{
+       memset(psbuf, 0, sizeof(SMB_STRUCT_STAT));
+
+       /* Get the stat struct for the owner info. */
+       if (SMB_VFS_STAT(conn, filename, psbuf) != 0)
+       {
+               DEBUG(8, ("SMB_VFS_STAT failed with error %s\n",
+                       strerror(errno)));
+               return -1;
+       }
+
+       return 0;
+}
+
+static int smbacl4_fGetFileOwner(files_struct *fsp, SMB_STRUCT_STAT *psbuf)
 {
        memset(psbuf, 0, sizeof(SMB_STRUCT_STAT));
+
        if (fsp->is_directory || fsp->fh->fd == -1) {
-               /* Get the stat struct for the owner info. */
-               if (SMB_VFS_STAT(fsp->conn,fsp->fsp_name, psbuf) != 0)
-               {
-                       DEBUG(8, ("SMB_VFS_STAT failed with error %s\n",
-                               strerror(errno)));
-                       return -1;
-               }
-       } else {
-               if (SMB_VFS_FSTAT(fsp,fsp->fh->fd, psbuf) != 0)
-               {
-                       DEBUG(8, ("SMB_VFS_FSTAT failed with error %s\n",
-                               strerror(errno)));
-                       return -1;
-               }
+               return smbacl4_GetFileOwner(fsp->conn, fsp->fsp_name, psbuf);
+       }
+       if (SMB_VFS_FSTAT(fsp, psbuf) != 0)
+       {
+               DEBUG(8, ("SMB_VFS_FSTAT failed with error %s\n",
+                       strerror(errno)));
+               return -1;
        }
 
        return 0;
 }
 
-static BOOL smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *acl, /* in */
+static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
        DOM_SID *psid_owner, /* in */
        DOM_SID *psid_group, /* in */
+       bool is_directory, /* in */
        SEC_ACE **ppnt_ace_list, /* out */
        int *pgood_aces /* out */
 )
 {
-       SMB_ACL4_INT_T *aclint = (SMB_ACL4_INT_T *)acl;
+       SMB_ACL4_INT_T *aclint = (SMB_ACL4_INT_T *)theacl;
        SMB_ACE4_INT_T *aceint;
        SEC_ACE *nt_ace_list = NULL;
        int good_aces = 0;
 
        DEBUG(10, ("smbacl_nfs42win entered"));
 
-       aclint = get_validated_aclint(acl);
-       /* We do not check for naces being 0 or acl being NULL here because it is done upstream */
+       aclint = get_validated_aclint(theacl);
+       /* We do not check for naces being 0 or theacl being NULL here because it is done upstream */
        /* in smb_get_nt_acl_nfs4(). */
        nt_ace_list = (SEC_ACE *)TALLOC_ZERO_SIZE(mem_ctx, aclint->naces * sizeof(SEC_ACE));
        if (nt_ace_list==NULL)
@@ -210,7 +222,7 @@ static BOOL smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *acl, /* in */
        }
 
        for (aceint=aclint->first; aceint!=NULL; aceint=(SMB_ACE4_INT_T *)aceint->next) {
-               SEC_ACCESS mask;
+               uint32_t mask;
                DOM_SID sid;
                SMB_ACE4PROP_T  *ace = &aceint->prop;
 
@@ -243,9 +255,13 @@ static BOOL smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *acl, /* in */
                        }
                }
                DEBUG(10, ("mapped %d to %s\n", ace->who.id,
-                       sid_string_static(&sid)));
+                          sid_string_dbg(&sid)));
 
-               init_sec_access(&mask, ace->aceMask);
+               if (is_directory && (ace->aceMask & SMB_ACE4_ADD_FILE)) {
+                       ace->aceMask |= SMB_ACE4_DELETE_CHILD;
+               }
+
+               mask = ace->aceMask;
                init_sec_ace(&nt_ace_list[good_aces++], &sid,
                        ace->aceType, mask,
                        ace->aceFlags & 0xf);
@@ -257,38 +273,35 @@ static BOOL smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *acl, /* in */
        return True;
 }
 
-size_t smb_get_nt_acl_nfs4(files_struct *fsp,
+static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
        uint32 security_info,
-       SEC_DESC **ppdesc, SMB4ACL_T *acl)
+       SEC_DESC **ppdesc, SMB4ACL_T *theacl)
 {
        int     good_aces = 0;
-       SMB_STRUCT_STAT sbuf;
        DOM_SID sid_owner, sid_group;
        size_t sd_size = 0;
        SEC_ACE *nt_ace_list = NULL;
        SEC_ACL *psa = NULL;
-       TALLOC_CTX *mem_ctx = main_loop_talloc_get();
+       TALLOC_CTX *mem_ctx = talloc_tos();
 
-       DEBUG(10, ("smb_get_nt_acl_nfs4 invoked for %s\n", fsp->fsp_name));
+       if (theacl==NULL || smb_get_naces(theacl)==0)
+               return NT_STATUS_ACCESS_DENIED; /* special because we
+                                                * shouldn't alloc 0 for
+                                                * win */
 
-       if (acl==NULL || smb_get_naces(acl)==0)
-               return 0; /* special because we shouldn't alloc 0 for win */
+       uid_to_sid(&sid_owner, sbuf->st_uid);
+       gid_to_sid(&sid_group, sbuf->st_gid);
 
-       if (smbacl4_GetFileOwner(fsp, &sbuf))
-               return 0;
-
-       uid_to_sid(&sid_owner, sbuf.st_uid);
-       gid_to_sid(&sid_group, sbuf.st_gid);
-
-       if (smbacl4_nfs42win(mem_ctx, acl, &sid_owner, &sid_group, &nt_ace_list, &good_aces)==False) {
+       if (smbacl4_nfs42win(mem_ctx, theacl, &sid_owner, &sid_group, S_ISDIR(sbuf->st_mode),
+                               &nt_ace_list, &good_aces)==False) {
                DEBUG(8,("smbacl4_nfs42win failed\n"));
-               return 0;
+               return map_nt_error_from_unix(errno);
        }
 
        psa = make_sec_acl(mem_ctx, NT4_ACL_REVISION, good_aces, nt_ace_list);
        if (psa == NULL) {
                DEBUG(2,("make_sec_acl failed\n"));
-               return 0;
+               return NT_STATUS_NO_MEMORY;
        }
 
        DEBUG(10,("after make sec_acl\n"));
@@ -298,11 +311,44 @@ size_t smb_get_nt_acl_nfs4(files_struct *fsp,
                                NULL, psa, &sd_size);
        if (*ppdesc==NULL) {
                DEBUG(2,("make_sec_desc failed\n"));
-               return 0;
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       DEBUG(10, ("smb_get_nt_acl_nfs4_common successfully exited with sd_size %d\n",
+                  ndr_size_security_descriptor(*ppdesc, NULL, 0)));
+
+       return NT_STATUS_OK;
+}
+
+NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
+                              uint32 security_info,
+                              SEC_DESC **ppdesc, SMB4ACL_T *theacl)
+{
+       SMB_STRUCT_STAT sbuf;
+
+       DEBUG(10, ("smb_fget_nt_acl_nfs4 invoked for %s\n", fsp->fsp_name));
+
+       if (smbacl4_fGetFileOwner(fsp, &sbuf)) {
+               return map_nt_error_from_unix(errno);
        }
 
-       DEBUG(10, ("smb_get_nt_acl_nfs4 successfully exited with sd_size %d\n", sd_size));
-       return sd_size;
+       return smb_get_nt_acl_nfs4_common(&sbuf, security_info, ppdesc, theacl);
+}
+
+NTSTATUS smb_get_nt_acl_nfs4(struct connection_struct *conn,
+                             const char *name,
+                             uint32 security_info,
+                             SEC_DESC **ppdesc, SMB4ACL_T *theacl)
+{
+       SMB_STRUCT_STAT sbuf;
+
+       DEBUG(10, ("smb_get_nt_acl_nfs4 invoked for %s\n", name));
+
+       if (smbacl4_GetFileOwner(conn, name, &sbuf)) {
+               return map_nt_error_from_unix(errno);
+       }
+
+       return smb_get_nt_acl_nfs4_common(&sbuf, security_info, ppdesc, theacl);
 }
 
 enum smbacl4_mode_enum {e_simple=0, e_special=1};
@@ -310,8 +356,9 @@ enum smbacl4_acedup_enum {e_dontcare=0, e_reject=1, e_ignore=2, e_merge=3};
 
 typedef struct _smbacl4_vfs_params {
        enum smbacl4_mode_enum mode;
-       BOOL do_chown;
+       bool do_chown;
        enum smbacl4_acedup_enum acedup;
+       struct db_context *sid_mapping_table;
 } smbacl4_vfs_params;
 
 /*
@@ -352,9 +399,9 @@ static int smbacl4_get_vfs_params(
        return 0;
 }
 
-static void smbacl4_dump_nfs4acl(int level, SMB4ACL_T *acl)
+static void smbacl4_dump_nfs4acl(int level, SMB4ACL_T *theacl)
 {
-       SMB_ACL4_INT_T *aclint = get_validated_aclint(acl);
+       SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
        SMB_ACE4_INT_T *aceint;
 
        DEBUG(level, ("NFS4ACL: size=%d\n", aclint->naces));
@@ -376,10 +423,10 @@ static void smbacl4_dump_nfs4acl(int level, SMB4ACL_T *acl)
  * return ace if found matching; otherwise NULL
  */
 static SMB_ACE4PROP_T *smbacl4_find_equal_special(
-       SMB4ACL_T *acl,
+       SMB4ACL_T *theacl,
        SMB_ACE4PROP_T *aceNew)
 {
-       SMB_ACL4_INT_T *aclint = get_validated_aclint(acl);
+       SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
        SMB_ACE4_INT_T *aceint;
 
        for(aceint = aclint->first; aceint!=NULL; aceint=(SMB_ACE4_INT_T *)aceint->next) {
@@ -411,22 +458,73 @@ static SMB_ACE4PROP_T *smbacl4_find_equal_special(
        return NULL;
 }
 
-static int smbacl4_fill_ace4(
+static bool nfs4_map_sid(smbacl4_vfs_params *params, const DOM_SID *src,
+                        DOM_SID *dst)
+{
+       static struct db_context *mapping_db = NULL;
+       TDB_DATA data;
+       
+       if (mapping_db == NULL) {
+               const char *dbname = lp_parm_const_string(
+                       -1, SMBACL4_PARAM_TYPE_NAME, "sidmap", NULL);
+               
+               if (dbname == NULL) {
+                       DEBUG(10, ("%s:sidmap not defined\n",
+                                  SMBACL4_PARAM_TYPE_NAME));
+                       return False;
+               }
+               
+               become_root();
+               mapping_db = db_open(NULL, dbname, 0, TDB_DEFAULT,
+                                    O_RDONLY, 0600);
+               unbecome_root();
+               
+               if (mapping_db == NULL) {
+                       DEBUG(1, ("could not open sidmap: %s\n",
+                                 strerror(errno)));
+                       return False;
+               }
+       }
+       
+       if (mapping_db->fetch(mapping_db, NULL,
+                             string_term_tdb_data(sid_string_tos(src)),
+                             &data) == -1) {
+               DEBUG(10, ("could not find mapping for SID %s\n",
+                          sid_string_dbg(src)));
+               return False;
+       }
+       
+       if ((data.dptr == NULL) || (data.dsize <= 0)
+           || (data.dptr[data.dsize-1] != '\0')) {
+               DEBUG(5, ("invalid mapping for SID %s\n",
+                         sid_string_dbg(src)));
+               TALLOC_FREE(data.dptr);
+               return False;
+       }
+       
+       if (!string_to_sid(dst, (char *)data.dptr)) {
+               DEBUG(1, ("invalid mapping %s for SID %s\n",
+                         (char *)data.dptr, sid_string_dbg(src)));
+               TALLOC_FREE(data.dptr);
+               return False;
+       }
+
+       TALLOC_FREE(data.dptr);
+       
+       return True;
+}
+
+static bool smbacl4_fill_ace4(
        TALLOC_CTX *mem_ctx,
+       const char *filename,
        smbacl4_vfs_params *params,
        uid_t ownerUID,
        gid_t ownerGID,
-       SEC_ACE *ace_nt, /* input */
+       const SEC_ACE *ace_nt, /* input */
        SMB_ACE4PROP_T *ace_v4 /* output */
 )
 {
-       const char *dom, *name;
-       enum lsa_SidType type;
-       uid_t uid;
-       gid_t gid;
-
-       DEBUG(10, ("got ace for %s\n",
-               sid_string_static(&ace_nt->trustee)));
+       DEBUG(10, ("got ace for %s\n", sid_string_dbg(&ace_nt->trustee)));
 
        memset(ace_v4, 0, sizeof(SMB_ACE4PROP_T));
        ace_v4->aceType = ace_nt->type; /* only ACCESS|DENY supported right now */
@@ -434,6 +532,8 @@ static int smbacl4_fill_ace4(
        ace_v4->aceMask = ace_nt->access_mask &
                (STD_RIGHT_ALL_ACCESS | SA_RIGHT_FILE_ALL_ACCESS);
 
+       se_map_generic(&ace_v4->aceMask, &file_generic_mapping);
+
        if (ace_v4->aceFlags!=ace_nt->flags)
                DEBUG(9, ("ace_v4->aceFlags(0x%x)!=ace_nt->flags(0x%x)\n",
                        ace_v4->aceFlags, ace_nt->flags));
@@ -446,18 +546,46 @@ static int smbacl4_fill_ace4(
                ace_v4->who.special_id = SMB_ACE4_WHO_EVERYONE;
                ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
        } else {
-               if (!lookup_sid(mem_ctx, &ace_nt->trustee, &dom, &name, &type)) {
-                       DEBUG(8, ("Could not find %s' type\n",
-                               sid_string_static(&ace_nt->trustee)));
-                       errno = EINVAL;
-                       return -1;
+               const char *dom, *name;
+               enum lsa_SidType type;
+               uid_t uid;
+               gid_t gid;
+               DOM_SID sid;
+               
+               sid_copy(&sid, &ace_nt->trustee);
+               
+               if (!lookup_sid(mem_ctx, &sid, &dom, &name, &type)) {
+                       
+                       DOM_SID mapped;
+                       
+                       if (!nfs4_map_sid(params, &sid, &mapped)) {
+                               DEBUG(1, ("nfs4_acls.c: file [%s]: SID %s "
+                                         "unknown\n", filename, sid_string_dbg(&sid)));
+                               errno = EINVAL;
+                               return False;
+                       }
+                       
+                       DEBUG(2, ("nfs4_acls.c: file [%s]: mapped SID %s "
+                                 "to %s\n", filename, sid_string_dbg(&sid), sid_string_dbg(&mapped)));
+                       
+                       if (!lookup_sid(mem_ctx, &mapped, &dom,
+                                       &name, &type)) {
+                               DEBUG(1, ("nfs4_acls.c: file [%s]: SID %s "
+                                         "mapped from %s is unknown\n",
+                                         filename, sid_string_dbg(&mapped), sid_string_dbg(&sid)));
+                               errno = EINVAL;
+                               return False;
+                       }
+                       
+                       sid_copy(&sid, &mapped);
                }
-
+               
                if (type == SID_NAME_USER) {
-                       if (!sid_to_uid(&ace_nt->trustee, &uid)) {
-                               DEBUG(2, ("Could not convert %s to uid\n",
-                                       sid_string_static(&ace_nt->trustee)));
-                               return -1;
+                       if (!sid_to_uid(&sid, &uid)) {
+                               DEBUG(1, ("nfs4_acls.c: file [%s]: could not "
+                                         "convert %s to uid\n", filename,
+                                         sid_string_dbg(&sid)));
+                               return False;
                        }
 
                        if (params->mode==e_special && uid==ownerUID) {
@@ -467,11 +595,13 @@ static int smbacl4_fill_ace4(
                                ace_v4->who.uid = uid;
                        }
                } else { /* else group? - TODO check it... */
-                       if (!sid_to_gid(&ace_nt->trustee, &gid)) {
-                               DEBUG(2, ("Could not convert %s to gid\n",
-                                       sid_string_static(&ace_nt->trustee)));
-                               return -1;
+                       if (!sid_to_gid(&sid, &gid)) {
+                               DEBUG(1, ("nfs4_acls.c: file [%s]: could not "
+                                         "convert %s to gid\n", filename,
+                                         sid_string_dbg(&sid)));
+                               return False;
                        }
+                               
                        ace_v4->aceFlags |= SMB_ACE4_IDENTIFIER_GROUP;
 
                        if (params->mode==e_special && gid==ownerGID) {
@@ -483,19 +613,19 @@ static int smbacl4_fill_ace4(
                }
        }
 
-       return 0; /* OK */
+       return True; /* OK */
 }
 
 static int smbacl4_MergeIgnoreReject(
        enum smbacl4_acedup_enum acedup,
-       SMB4ACL_T *acl, /* may modify it */
+       SMB4ACL_T *theacl, /* may modify it */
        SMB_ACE4PROP_T *ace, /* the "new" ACE */
-       BOOL    *paddNewACE,
+       bool    *paddNewACE,
        int     i
 )
 {
        int     result = 0;
-       SMB_ACE4PROP_T *ace4found = smbacl4_find_equal_special(acl, ace);
+       SMB_ACE4PROP_T *ace4found = smbacl4_find_equal_special(theacl, ace);
        if (ace4found)
        {
                switch(acedup)
@@ -521,55 +651,63 @@ static int smbacl4_MergeIgnoreReject(
 }
 
 static SMB4ACL_T *smbacl4_win2nfs4(
-       SEC_ACL *dacl,
+       const char *filename,
+       const SEC_ACL *dacl,
        smbacl4_vfs_params *pparams,
        uid_t ownerUID,
        gid_t ownerGID
 )
 {
-       SMB4ACL_T *acl;
+       SMB4ACL_T *theacl;
        uint32  i;
-       TALLOC_CTX *mem_ctx = main_loop_talloc_get();
+       TALLOC_CTX *mem_ctx = talloc_tos();
 
        DEBUG(10, ("smbacl4_win2nfs4 invoked\n"));
 
-       acl = smb_create_smb4acl();
-       if (acl==NULL)
+       theacl = smb_create_smb4acl();
+       if (theacl==NULL)
                return NULL;
 
        for(i=0; i<dacl->num_aces; i++) {
                SMB_ACE4PROP_T  ace_v4;
-               BOOL    addNewACE = True;
-
-               if (smbacl4_fill_ace4(mem_ctx, pparams, ownerUID, ownerGID,
-                       dacl->aces + i, &ace_v4))
-                       return NULL;
+               bool    addNewACE = True;
+
+               if (!smbacl4_fill_ace4(mem_ctx, filename, pparams,
+                                      ownerUID, ownerGID,
+                                      dacl->aces + i, &ace_v4)) {
+                       DEBUG(3, ("Could not fill ace for file %s, SID %s\n",
+                                 filename,
+                                 sid_string_dbg(&((dacl->aces+i)->trustee))));
+                       continue;
+               }
 
                if (pparams->acedup!=e_dontcare) {
-                       if (smbacl4_MergeIgnoreReject(pparams->acedup, acl,
+                       if (smbacl4_MergeIgnoreReject(pparams->acedup, theacl,
                                &ace_v4, &addNewACE, i))
                                return NULL;
                }
 
                if (addNewACE)
-                       smb_add_ace4(acl, &ace_v4);
+                       smb_add_ace4(theacl, &ace_v4);
        }
 
-       return acl;
+       return theacl;
 }
 
 NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
        uint32 security_info_sent,
-       SEC_DESC *psd,
+       const SEC_DESC *psd,
        set_nfs4acl_native_fn_t set_nfs4_native)
 {
        smbacl4_vfs_params params;
-       SMB4ACL_T *acl = NULL;
-       BOOL    result;
+       SMB4ACL_T *theacl = NULL;
+       bool    result;
 
        SMB_STRUCT_STAT sbuf;
+       bool set_acl_as_root = false;
        uid_t newUID = (uid_t)-1;
        gid_t newGID = (gid_t)-1;
+       int saved_errno;
 
        DEBUG(10, ("smb_set_nt_acl_nfs4 invoked for %s\n", fsp->fsp_name));
 
@@ -585,7 +723,7 @@ NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
        if (smbacl4_get_vfs_params(SMBACL4_PARAM_TYPE_NAME, fsp, &params))
                return NT_STATUS_NO_MEMORY;
 
-       if (smbacl4_GetFileOwner(fsp, &sbuf))
+       if (smbacl4_fGetFileOwner(fsp, &sbuf))
                return map_nt_error_from_unix(errno);
 
        if (params.do_chown) {
@@ -596,38 +734,50 @@ NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
                        return status;
                }
                if (((newUID != (uid_t)-1) && (sbuf.st_uid != newUID)) ||
-                               ((newGID != (gid_t)-1) && (sbuf.st_gid != newGID))) {
+                   ((newGID != (gid_t)-1) && (sbuf.st_gid != newGID))) {
                        if(try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
                                DEBUG(3,("chown %s, %u, %u failed. Error = %s.\n",
-                                       fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID, strerror(errno) ));
-                               if (errno == EPERM) {
-                                       return NT_STATUS_INVALID_OWNER;
-                               }
+                                        fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID, 
+                                        strerror(errno)));
                                return map_nt_error_from_unix(errno);
                        }
+
                        DEBUG(10,("chown %s, %u, %u succeeded.\n",
-                               fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
-                       if (smbacl4_GetFileOwner(fsp, &sbuf))
+                                 fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
+                       if (smbacl4_GetFileOwner(fsp->conn, fsp->fsp_name, &sbuf))
                                return map_nt_error_from_unix(errno);
+
+                       /* If we successfully chowned, we know we must
+                        * be able to set the acl, so do it as root.
+                        */
+                       set_acl_as_root = true;
                }
        }
 
-       if ((security_info_sent & DACL_SECURITY_INFORMATION)!=0 && psd->dacl!=NULL)
-       {
-               acl = smbacl4_win2nfs4(psd->dacl, &params, sbuf.st_uid, sbuf.st_gid);
-               if (!acl)
-                       return map_nt_error_from_unix(errno);
+       if (!(security_info_sent & DACL_SECURITY_INFORMATION) || psd->dacl ==NULL) {
+               DEBUG(10, ("no dacl found; security_info_sent = 0x%x\n", security_info_sent));
+               return NT_STATUS_OK;
+       }
 
-               smbacl4_dump_nfs4acl(10, acl);
+       theacl = smbacl4_win2nfs4(fsp->fsp_name, psd->dacl, &params, sbuf.st_uid, sbuf.st_gid);
+       if (!theacl)
+               return map_nt_error_from_unix(errno);
 
-               result = set_nfs4_native(fsp, acl);
-               if (result!=True)
-               {
-                       DEBUG(10, ("set_nfs4_native failed with %s\n", strerror(errno)));
-                       return map_nt_error_from_unix(errno);
-               }
-       } else
-               DEBUG(10, ("no dacl found; security_info_sent = 0x%x\n", security_info_sent));
+       smbacl4_dump_nfs4acl(10, theacl);
+
+       if (set_acl_as_root) {
+               become_root();
+       }
+       result = set_nfs4_native(fsp, theacl);
+       saved_errno = errno;
+       if (set_acl_as_root) {
+               unbecome_root();
+       }
+       if (result!=True) {
+               errno = saved_errno;
+               DEBUG(10, ("set_nfs4_native failed with %s\n", strerror(errno)));
+               return map_nt_error_from_unix(errno);
+       }
 
        DEBUG(10, ("smb_set_nt_acl_nfs4 succeeded\n"));
        return NT_STATUS_OK;