r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need
[vlendec/samba-autobuild/.git] / source3 / smbd / posix_acls.c
index 01e3c31ba78b63dd560b981945041a2ad45b7181..73744cf26e77b0e7e66416b2863db07ca2e5fa8a 100644 (file)
 
 #include "includes.h"
 
+extern struct current_user current_user;
+extern struct generic_mapping file_generic_mapping;
+
+#undef  DBGC_CLASS
+#define DBGC_CLASS DBGC_ACLS
+
 /****************************************************************************
  Data structures representing the internal ACE format.
 ****************************************************************************/
@@ -42,10 +48,449 @@ typedef struct canon_ace {
        enum ace_owner owner_type;
        enum ace_attribute attr;
        posix_id unix_ug; 
+       BOOL inherited;
 } canon_ace;
 
 #define ALL_ACE_PERMS (S_IRUSR|S_IWUSR|S_IXUSR)
 
+/*
+ * EA format of user.SAMBA_PAI (Samba_Posix_Acl_Interitance)
+ * attribute on disk.
+ *
+ * |  1   |  1   |   2         |         2           |  .... 
+ * +------+------+-------------+---------------------+-------------+--------------------+
+ * | vers | flag | num_entries | num_default_entries | ..entries.. | default_entries... |
+ * +------+------+-------------+---------------------+-------------+--------------------+
+ */
+
+#define PAI_VERSION_OFFSET     0
+#define PAI_FLAG_OFFSET                1
+#define PAI_NUM_ENTRIES_OFFSET 2
+#define PAI_NUM_DEFAULT_ENTRIES_OFFSET 4
+#define PAI_ENTRIES_BASE       6
+
+#define PAI_VERSION            1
+#define PAI_ACL_FLAG_PROTECTED 0x1
+#define PAI_ENTRY_LENGTH       5
+
+/*
+ * In memory format of user.SAMBA_PAI attribute.
+ */
+
+struct pai_entry {
+       struct pai_entry *next, *prev;
+       enum ace_owner owner_type;
+       posix_id unix_ug; 
+};
+       
+struct pai_val {
+       BOOL pai_protected;
+       unsigned int num_entries;
+       struct pai_entry *entry_list;
+       unsigned int num_def_entries;
+       struct pai_entry *def_entry_list;
+};
+
+/************************************************************************
+ Return a uint32 of the pai_entry principal.
+************************************************************************/
+
+static uint32 get_pai_entry_val(struct pai_entry *paie)
+{
+       switch (paie->owner_type) {
+               case UID_ACE:
+                       DEBUG(10,("get_pai_entry_val: uid = %u\n", (unsigned int)paie->unix_ug.uid ));
+                       return (uint32)paie->unix_ug.uid;
+               case GID_ACE:
+                       DEBUG(10,("get_pai_entry_val: gid = %u\n", (unsigned int)paie->unix_ug.gid ));
+                       return (uint32)paie->unix_ug.gid;
+               case WORLD_ACE:
+               default:
+                       DEBUG(10,("get_pai_entry_val: world ace\n"));
+                       return (uint32)-1;
+       }
+}
+
+/************************************************************************
+ Return a uint32 of the entry principal.
+************************************************************************/
+
+static uint32 get_entry_val(canon_ace *ace_entry)
+{
+       switch (ace_entry->owner_type) {
+               case UID_ACE:
+                       DEBUG(10,("get_entry_val: uid = %u\n", (unsigned int)ace_entry->unix_ug.uid ));
+                       return (uint32)ace_entry->unix_ug.uid;
+               case GID_ACE:
+                       DEBUG(10,("get_entry_val: gid = %u\n", (unsigned int)ace_entry->unix_ug.gid ));
+                       return (uint32)ace_entry->unix_ug.gid;
+               case WORLD_ACE:
+               default:
+                       DEBUG(10,("get_entry_val: world ace\n"));
+                       return (uint32)-1;
+       }
+}
+
+/************************************************************************
+ Count the inherited entries.
+************************************************************************/
+
+static unsigned int num_inherited_entries(canon_ace *ace_list)
+{
+       unsigned int num_entries = 0;
+
+       for (; ace_list; ace_list = ace_list->next)
+               if (ace_list->inherited)
+                       num_entries++;
+       return num_entries;
+}
+
+/************************************************************************
+ Create the on-disk format. Caller must free.
+************************************************************************/
+
+static char *create_pai_buf(canon_ace *file_ace_list, canon_ace *dir_ace_list, BOOL pai_protected, size_t *store_size)
+{
+       char *pai_buf = NULL;
+       canon_ace *ace_list = NULL;
+       char *entry_offset = NULL;
+       unsigned int num_entries = 0;
+       unsigned int num_def_entries = 0;
+
+       for (ace_list = file_ace_list; ace_list; ace_list = ace_list->next)
+               if (ace_list->inherited)
+                       num_entries++;
+
+       for (ace_list = dir_ace_list; ace_list; ace_list = ace_list->next)
+               if (ace_list->inherited)
+                       num_def_entries++;
+
+       DEBUG(10,("create_pai_buf: num_entries = %u, num_def_entries = %u\n", num_entries, num_def_entries ));
+
+       *store_size = PAI_ENTRIES_BASE + ((num_entries + num_def_entries)*PAI_ENTRY_LENGTH);
+
+       pai_buf = SMB_MALLOC(*store_size);
+       if (!pai_buf) {
+               return NULL;
+       }
+
+       /* Set up the header. */
+       memset(pai_buf, '\0', PAI_ENTRIES_BASE);
+       SCVAL(pai_buf,PAI_VERSION_OFFSET,PAI_VERSION);
+       SCVAL(pai_buf,PAI_FLAG_OFFSET,(pai_protected ? PAI_ACL_FLAG_PROTECTED : 0));
+       SSVAL(pai_buf,PAI_NUM_ENTRIES_OFFSET,num_entries);
+       SSVAL(pai_buf,PAI_NUM_DEFAULT_ENTRIES_OFFSET,num_def_entries);
+
+       entry_offset = pai_buf + PAI_ENTRIES_BASE;
+
+       for (ace_list = file_ace_list; ace_list; ace_list = ace_list->next) {
+               if (ace_list->inherited) {
+                       uint8 type_val = (unsigned char)ace_list->owner_type;
+                       uint32 entry_val = get_entry_val(ace_list);
+
+                       SCVAL(entry_offset,0,type_val);
+                       SIVAL(entry_offset,1,entry_val);
+                       entry_offset += PAI_ENTRY_LENGTH;
+               }
+       }
+
+       for (ace_list = dir_ace_list; ace_list; ace_list = ace_list->next) {
+               if (ace_list->inherited) {
+                       uint8 type_val = (unsigned char)ace_list->owner_type;
+                       uint32 entry_val = get_entry_val(ace_list);
+
+                       SCVAL(entry_offset,0,type_val);
+                       SIVAL(entry_offset,1,entry_val);
+                       entry_offset += PAI_ENTRY_LENGTH;
+               }
+       }
+
+       return pai_buf;
+}
+
+/************************************************************************
+ Store the user.SAMBA_PAI attribute on disk.
+************************************************************************/
+
+static void store_inheritance_attributes(files_struct *fsp, canon_ace *file_ace_list,
+                                       canon_ace *dir_ace_list, BOOL pai_protected)
+{
+       int ret;
+       size_t store_size;
+       char *pai_buf;
+
+       if (!lp_map_acl_inherit(SNUM(fsp->conn)))
+               return;
+
+       /*
+        * Don't store if this ACL isn't protected and
+        * none of the entries in it are marked as inherited.
+        */
+
+       if (!pai_protected && num_inherited_entries(file_ace_list) == 0 && num_inherited_entries(dir_ace_list) == 0) {
+               /* Instead just remove the attribute if it exists. */
+               if (fsp->fh->fd != -1)
+                       SMB_VFS_FREMOVEXATTR(fsp, fsp->fh->fd, SAMBA_POSIX_INHERITANCE_EA_NAME);
+               else
+                       SMB_VFS_REMOVEXATTR(fsp->conn, fsp->fsp_name, SAMBA_POSIX_INHERITANCE_EA_NAME);
+               return;
+       }
+
+       pai_buf = create_pai_buf(file_ace_list, dir_ace_list, pai_protected, &store_size);
+
+       if (fsp->fh->fd != -1)
+               ret = SMB_VFS_FSETXATTR(fsp, fsp->fh->fd, SAMBA_POSIX_INHERITANCE_EA_NAME,
+                               pai_buf, store_size, 0);
+       else
+               ret = SMB_VFS_SETXATTR(fsp->conn,fsp->fsp_name, SAMBA_POSIX_INHERITANCE_EA_NAME,
+                               pai_buf, store_size, 0);
+
+       SAFE_FREE(pai_buf);
+
+       DEBUG(10,("store_inheritance_attribute:%s for file %s\n", pai_protected ? " (protected)" : "", fsp->fsp_name));
+       if (ret == -1 && !no_acl_syscall_error(errno))
+               DEBUG(1,("store_inheritance_attribute: Error %s\n", strerror(errno) ));
+}
+
+/************************************************************************
+ Delete the in memory inheritance info.
+************************************************************************/
+
+static void free_inherited_info(struct pai_val *pal)
+{
+       if (pal) {
+               struct pai_entry *paie, *paie_next;
+               for (paie = pal->entry_list; paie; paie = paie_next) {
+                       paie_next = paie->next;
+                       SAFE_FREE(paie);
+               }
+               for (paie = pal->def_entry_list; paie; paie = paie_next) {
+                       paie_next = paie->next;
+                       SAFE_FREE(paie);
+               }
+               SAFE_FREE(pal);
+       }
+}
+
+/************************************************************************
+ Was this ACL protected ?
+************************************************************************/
+
+static BOOL get_protected_flag(struct pai_val *pal)
+{
+       if (!pal)
+               return False;
+       return pal->pai_protected;
+}
+
+/************************************************************************
+ Was this ACE inherited ?
+************************************************************************/
+
+static BOOL get_inherited_flag(struct pai_val *pal, canon_ace *ace_entry, BOOL default_ace)
+{
+       struct pai_entry *paie;
+
+       if (!pal)
+               return False;
+
+       /* If the entry exists it is inherited. */
+       for (paie = (default_ace ? pal->def_entry_list : pal->entry_list); paie; paie = paie->next) {
+               if (ace_entry->owner_type == paie->owner_type &&
+                               get_entry_val(ace_entry) == get_pai_entry_val(paie))
+                       return True;
+       }
+       return False;
+}
+
+/************************************************************************
+ Ensure an attribute just read is valid.
+************************************************************************/
+
+static BOOL check_pai_ok(char *pai_buf, size_t pai_buf_data_size)
+{
+       uint16 num_entries;
+       uint16 num_def_entries;
+
+       if (pai_buf_data_size < PAI_ENTRIES_BASE) {
+               /* Corrupted - too small. */
+               return False;
+       }
+
+       if (CVAL(pai_buf,PAI_VERSION_OFFSET) != PAI_VERSION)
+               return False;
+
+       num_entries = SVAL(pai_buf,PAI_NUM_ENTRIES_OFFSET);
+       num_def_entries = SVAL(pai_buf,PAI_NUM_DEFAULT_ENTRIES_OFFSET);
+
+       /* Check the entry lists match. */
+       /* Each entry is 5 bytes (type plus 4 bytes of uid or gid). */
+
+       if (((num_entries + num_def_entries)*PAI_ENTRY_LENGTH) + PAI_ENTRIES_BASE != pai_buf_data_size)
+               return False;
+
+       return True;
+}
+
+
+/************************************************************************
+ Convert to in-memory format.
+************************************************************************/
+
+static struct pai_val *create_pai_val(char *buf, size_t size)
+{
+       char *entry_offset;
+       struct pai_val *paiv = NULL;
+       int i;
+
+       if (!check_pai_ok(buf, size))
+               return NULL;
+
+       paiv = SMB_MALLOC_P(struct pai_val);
+       if (!paiv)
+               return NULL;
+
+       memset(paiv, '\0', sizeof(struct pai_val));
+
+       paiv->pai_protected = (CVAL(buf,PAI_FLAG_OFFSET) == PAI_ACL_FLAG_PROTECTED);
+
+       paiv->num_entries = SVAL(buf,PAI_NUM_ENTRIES_OFFSET);
+       paiv->num_def_entries = SVAL(buf,PAI_NUM_DEFAULT_ENTRIES_OFFSET);
+
+       entry_offset = buf + PAI_ENTRIES_BASE;
+
+       DEBUG(10,("create_pai_val:%s num_entries = %u, num_def_entries = %u\n",
+                       paiv->pai_protected ? " (pai_protected)" : "", paiv->num_entries, paiv->num_def_entries ));
+
+       for (i = 0; i < paiv->num_entries; i++) {
+               struct pai_entry *paie;
+
+               paie = SMB_MALLOC_P(struct pai_entry);
+               if (!paie) {
+                       free_inherited_info(paiv);
+                       return NULL;
+               }
+
+               paie->owner_type = (enum ace_owner)CVAL(entry_offset,0);
+               switch( paie->owner_type) {
+                       case UID_ACE:
+                               paie->unix_ug.uid = (uid_t)IVAL(entry_offset,1);
+                               DEBUG(10,("create_pai_val: uid = %u\n", (unsigned int)paie->unix_ug.uid ));
+                               break;
+                       case GID_ACE:
+                               paie->unix_ug.gid = (gid_t)IVAL(entry_offset,1);
+                               DEBUG(10,("create_pai_val: gid = %u\n", (unsigned int)paie->unix_ug.gid ));
+                               break;
+                       case WORLD_ACE:
+                               paie->unix_ug.world = -1;
+                               DEBUG(10,("create_pai_val: world ace\n"));
+                               break;
+                       default:
+                               free_inherited_info(paiv);
+                               return NULL;
+               }
+               entry_offset += PAI_ENTRY_LENGTH;
+               DLIST_ADD(paiv->entry_list, paie);
+       }
+
+       for (i = 0; i < paiv->num_def_entries; i++) {
+               struct pai_entry *paie;
+
+               paie = SMB_MALLOC_P(struct pai_entry);
+               if (!paie) {
+                       free_inherited_info(paiv);
+                       return NULL;
+               }
+
+               paie->owner_type = (enum ace_owner)CVAL(entry_offset,0);
+               switch( paie->owner_type) {
+                       case UID_ACE:
+                               paie->unix_ug.uid = (uid_t)IVAL(entry_offset,1);
+                               DEBUG(10,("create_pai_val: (def) uid = %u\n", (unsigned int)paie->unix_ug.uid ));
+                               break;
+                       case GID_ACE:
+                               paie->unix_ug.gid = (gid_t)IVAL(entry_offset,1);
+                               DEBUG(10,("create_pai_val: (def) gid = %u\n", (unsigned int)paie->unix_ug.gid ));
+                               break;
+                       case WORLD_ACE:
+                               paie->unix_ug.world = -1;
+                               DEBUG(10,("create_pai_val: (def) world ace\n"));
+                               break;
+                       default:
+                               free_inherited_info(paiv);
+                               return NULL;
+               }
+               entry_offset += PAI_ENTRY_LENGTH;
+               DLIST_ADD(paiv->def_entry_list, paie);
+       }
+
+       return paiv;
+}
+
+/************************************************************************
+ Load the user.SAMBA_PAI attribute.
+************************************************************************/
+
+static struct pai_val *load_inherited_info(files_struct *fsp)
+{
+       char *pai_buf;
+       size_t pai_buf_size = 1024;
+       struct pai_val *paiv = NULL;
+       ssize_t ret;
+
+       if (!lp_map_acl_inherit(SNUM(fsp->conn)))
+               return NULL;
+
+       if ((pai_buf = SMB_MALLOC(pai_buf_size)) == NULL)
+               return NULL;
+
+       do {
+               if (fsp->fh->fd != -1)
+                       ret = SMB_VFS_FGETXATTR(fsp, fsp->fh->fd, SAMBA_POSIX_INHERITANCE_EA_NAME,
+                                       pai_buf, pai_buf_size);
+               else
+                       ret = SMB_VFS_GETXATTR(fsp->conn,fsp->fsp_name,SAMBA_POSIX_INHERITANCE_EA_NAME,
+                                       pai_buf, pai_buf_size);
+
+               if (ret == -1) {
+                       if (errno != ERANGE) {
+                               break;
+                       }
+                       /* Buffer too small - enlarge it. */
+                       pai_buf_size *= 2;
+                       SAFE_FREE(pai_buf);
+                       if (pai_buf_size > 1024*1024) {
+                               return NULL; /* Limit malloc to 1mb. */
+                       }
+                       if ((pai_buf = SMB_MALLOC(pai_buf_size)) == NULL)
+                               return NULL;
+               }
+       } while (ret == -1);
+
+       DEBUG(10,("load_inherited_info: ret = %lu for file %s\n", (unsigned long)ret, fsp->fsp_name));
+
+       if (ret == -1) {
+               /* No attribute or not supported. */
+#if defined(ENOATTR)
+               if (errno != ENOATTR)
+                       DEBUG(10,("load_inherited_info: Error %s\n", strerror(errno) ));
+#else
+               if (errno != ENOSYS)
+                       DEBUG(10,("load_inherited_info: Error %s\n", strerror(errno) ));
+#endif
+               SAFE_FREE(pai_buf);
+               return NULL;
+       }
+
+       paiv = create_pai_val(pai_buf, ret);
+
+       if (paiv && paiv->pai_protected)
+               DEBUG(10,("load_inherited_info: ACL is protected for file %s\n", fsp->fsp_name));
+
+       SAFE_FREE(pai_buf);
+       return paiv;
+}
+
 /****************************************************************************
  Functions to manipulate the internal ACE format.
 ****************************************************************************/
@@ -71,10 +516,12 @@ static size_t count_canon_ace_list( canon_ace *list_head )
 
 static void free_canon_ace_list( canon_ace *list_head )
 {
-       while (list_head) {
-               canon_ace *old_head = list_head;
-               DLIST_REMOVE(list_head, list_head);
-               SAFE_FREE(old_head);
+       canon_ace *list, *next;
+
+       for (list = list_head; list; list = next) {
+               next = list->next;
+               DLIST_REMOVE(list_head, list);
+               SAFE_FREE(list);
        }
 }
 
@@ -84,7 +531,7 @@ static void free_canon_ace_list( canon_ace *list_head )
 
 static canon_ace *dup_canon_ace( canon_ace *src_ace)
 {
-       canon_ace *dst_ace = (canon_ace *)malloc(sizeof(canon_ace));
+       canon_ace *dst_ace = SMB_MALLOC_P(canon_ace);
 
        if (dst_ace == NULL)
                return NULL;
@@ -106,10 +553,10 @@ static void print_canon_ace(canon_ace *pace, int num)
        dbgtext( "SID = %s ", sid_to_string( str, &pace->trustee));
        if (pace->owner_type == UID_ACE) {
                const char *u_name = uidtoname(pace->unix_ug.uid);
-               dbgtext( "uid %u (%s) ", (unsigned int)pace->unix_ug.uid, u_name);
+               dbgtext( "uid %u (%s) ", (unsigned int)pace->unix_ug.uid, u_name );
        } else if (pace->owner_type == GID_ACE) {
                char *g_name = gidtoname(pace->unix_ug.gid);
-               dbgtext( "gid %u (%s) ", (unsigned int)pace->unix_ug.gid, g_name);
+               dbgtext( "gid %u (%s) ", (unsigned int)pace->unix_ug.gid, g_name );
        } else
                dbgtext( "other ");
        switch (pace->type) {
@@ -129,6 +576,8 @@ static void print_canon_ace(canon_ace *pace, int num)
                        dbgtext( "SMB_ACL_OTHER ");
                        break;
        }
+       if (pace->inherited)
+               dbgtext( "(inherited) ");
        dbgtext( "perms ");
        dbgtext( "%c", pace->perms & S_IRUSR ? 'r' : '-');
        dbgtext( "%c", pace->perms & S_IWUSR ? 'w' : '-');
@@ -158,9 +607,9 @@ static mode_t convert_permset_to_mode_t(connection_struct *conn, SMB_ACL_PERMSET
 {
        mode_t ret = 0;
 
-       ret |= (conn->vfs_ops.sys_acl_get_perm(conn, permset, SMB_ACL_READ) ? S_IRUSR : 0);
-       ret |= (conn->vfs_ops.sys_acl_get_perm(conn, permset, SMB_ACL_WRITE) ? S_IWUSR : 0);
-       ret |= (conn->vfs_ops.sys_acl_get_perm(conn, permset, SMB_ACL_EXECUTE) ? S_IXUSR : 0);
+       ret |= (SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_READ) ? S_IRUSR : 0);
+       ret |= (SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_WRITE) ? S_IWUSR : 0);
+       ret |= (SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_EXECUTE) ? S_IXUSR : 0);
 
        return ret;
 }
@@ -190,18 +639,18 @@ static mode_t unix_perms_to_acl_perms(mode_t mode, int r_mask, int w_mask, int x
 
 static int map_acl_perms_to_permset(connection_struct *conn, mode_t mode, SMB_ACL_PERMSET_T *p_permset)
 {
-       if (conn->vfs_ops.sys_acl_clear_perms(conn, *p_permset) ==  -1)
+       if (SMB_VFS_SYS_ACL_CLEAR_PERMS(conn, *p_permset) ==  -1)
                return -1;
        if (mode & S_IRUSR) {
-               if (conn->vfs_ops.sys_acl_add_perm(conn, *p_permset, SMB_ACL_READ) == -1)
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_READ) == -1)
                        return -1;
        }
        if (mode & S_IWUSR) {
-               if (conn->vfs_ops.sys_acl_add_perm(conn, *p_permset, SMB_ACL_WRITE) == -1)
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_WRITE) == -1)
                        return -1;
        }
        if (mode & S_IXUSR) {
-               if (conn->vfs_ops.sys_acl_add_perm(conn, *p_permset, SMB_ACL_EXECUTE) == -1)
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_EXECUTE) == -1)
                        return -1;
        }
        return 0;
@@ -336,15 +785,15 @@ static void merge_aces( canon_ace **pp_list_head )
 
 static BOOL nt4_compatible_acls(void)
 {
-       const char *compat = lp_acl_compatibility();
+       int compat = lp_acl_compatibility();
 
-       if (*compat == '\0') {
+       if (compat == ACL_COMPAT_AUTO) {
                enum remote_arch_types ra_type = get_remote_arch();
 
                /* Automatically adapt to client */
                return (ra_type <= RA_WINNT);
        } else
-               return (strequal(compat, "winnt"));
+               return (compat == ACL_COMPAT_WINNT);
 }
 
 
@@ -354,15 +803,19 @@ static BOOL nt4_compatible_acls(void)
  not get. Deny entries are implicit on get with ace->perms = 0.
 ****************************************************************************/
 
-static SEC_ACCESS map_canon_ace_perms(int *pacl_type, DOM_SID *powner_sid, canon_ace *ace)
+static SEC_ACCESS map_canon_ace_perms(int snum, int *pacl_type, DOM_SID *powner_sid, canon_ace *ace, BOOL directory_ace)
 {
        SEC_ACCESS sa;
        uint32 nt_mask = 0;
 
        *pacl_type = SEC_ACE_TYPE_ACCESS_ALLOWED;
 
-       if ((ace->perms & ALL_ACE_PERMS) == ALL_ACE_PERMS) {
+       if (lp_acl_map_full_control(snum) && ((ace->perms & ALL_ACE_PERMS) == ALL_ACE_PERMS)) {
+               if (directory_ace) {
+                       nt_mask = UNIX_DIRECTORY_ACCESS_RWX;
+               } else {
                        nt_mask = UNIX_ACCESS_RWX;
+               }
        } else if ((ace->perms & ALL_ACE_PERMS) == (mode_t)0) {
                /*
                 * Windows NT refuses to display ACEs with no permissions in them (but
@@ -378,9 +831,15 @@ static SEC_ACCESS map_canon_ace_perms(int *pacl_type, DOM_SID *powner_sid, canon
                else
                        nt_mask = 0;
        } else {
-               nt_mask |= ((ace->perms & S_IRUSR) ? UNIX_ACCESS_R : 0 );
-               nt_mask |= ((ace->perms & S_IWUSR) ? UNIX_ACCESS_W : 0 );
-               nt_mask |= ((ace->perms & S_IXUSR) ? UNIX_ACCESS_X : 0 );
+               if (directory_ace) {
+                       nt_mask |= ((ace->perms & S_IRUSR) ? UNIX_DIRECTORY_ACCESS_R : 0 );
+                       nt_mask |= ((ace->perms & S_IWUSR) ? UNIX_DIRECTORY_ACCESS_W : 0 );
+                       nt_mask |= ((ace->perms & S_IXUSR) ? UNIX_DIRECTORY_ACCESS_X : 0 );
+               } else {
+                       nt_mask |= ((ace->perms & S_IRUSR) ? UNIX_ACCESS_R : 0 );
+                       nt_mask |= ((ace->perms & S_IWUSR) ? UNIX_ACCESS_W : 0 );
+                       nt_mask |= ((ace->perms & S_IXUSR) ? UNIX_ACCESS_X : 0 );
+               }
        }
 
        DEBUG(10,("map_canon_ace_perms: Mapped (UNIX) %x to (NT) %x\n",
@@ -439,11 +898,10 @@ static mode_t map_nt_perms( SEC_ACCESS sec_access, int type)
  Unpack a SEC_DESC into a UNIX owner and group.
 ****************************************************************************/
 
-static BOOL unpack_nt_owners(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *pgrp, uint32 security_info_sent, SEC_DESC *psd)
+static BOOL unpack_nt_owners(int snum, SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *pgrp, uint32 security_info_sent, SEC_DESC *psd)
 {
        DOM_SID owner_sid;
        DOM_SID grp_sid;
-       enum SID_NAME_USE sid_type;
 
        *puser = (uid_t)-1;
        *pgrp = (gid_t)-1;
@@ -469,16 +927,17 @@ static BOOL unpack_nt_owners(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *pgrp,
 
        if (security_info_sent & OWNER_SECURITY_INFORMATION) {
                sid_copy(&owner_sid, psd->owner_sid);
-               if (!sid_to_uid( &owner_sid, puser, &sid_type)) {
-#if ACL_FORCE_UNMAPPABLE
-                       /* this allows take ownership to work reasonably */
-                       extern struct current_user current_user;
-                       *puser = current_user.uid;
-#else
-                       DEBUG(3,("unpack_nt_owners: unable to validate owner sid for %s\n",
-                                sid_string_static(&owner_sid)));
-                       return False;
-#endif
+               if (!sid_to_uid(&owner_sid, puser)) {
+                       if (lp_force_unknown_acl_user(snum)) {
+                               /* this allows take ownership to work
+                                * reasonably */
+                               *puser = current_user.ut.uid;
+                       } else {
+                               DEBUG(3,("unpack_nt_owners: unable to validate"
+                                        " owner sid for %s\n",
+                                        sid_string_static(&owner_sid)));
+                               return False;
+                       }
                }
        }
 
@@ -489,15 +948,16 @@ static BOOL unpack_nt_owners(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *pgrp,
 
        if (security_info_sent & GROUP_SECURITY_INFORMATION) {
                sid_copy(&grp_sid, psd->grp_sid);
-               if (!sid_to_gid( &grp_sid, pgrp, &sid_type)) {
-#if ACL_FORCE_UNMAPPABLE
-                       /* this allows take group ownership to work reasonably */
-                       extern struct current_user current_user;
-                       *pgrp = current_user.gid;
-#else
-                       DEBUG(3,("unpack_nt_owners: unable to validate group sid.\n"));
-                       return False;
-#endif
+               if (!sid_to_gid( &grp_sid, pgrp)) {
+                       if (lp_force_unknown_acl_user(snum)) {
+                               /* this allows take group ownership to work
+                                * reasonably */
+                               *pgrp = current_user.ut.gid;
+                       } else {
+                               DEBUG(3,("unpack_nt_owners: unable to validate"
+                                        " group sid.\n"));
+                               return False;
+                       }
                }
        }
 
@@ -556,10 +1016,7 @@ static void apply_default_perms(files_struct *fsp, canon_ace *pace, mode_t type)
 
 static BOOL uid_entry_in_group( canon_ace *uid_ace, canon_ace *group_ace )
 {
-       extern DOM_SID global_sid_World;
        fstring u_name;
-       fstring g_name;
-       extern struct current_user current_user;
 
        /* "Everyone" always matches every uid. */
 
@@ -568,18 +1025,11 @@ static BOOL uid_entry_in_group( canon_ace *uid_ace, canon_ace *group_ace )
 
        /* Assume that the current user is in the current group (force group) */
 
-       if (uid_ace->unix_ug.uid == current_user.uid && group_ace->unix_ug.gid == current_user.gid)
+       if (uid_ace->unix_ug.uid == current_user.ut.uid && group_ace->unix_ug.gid == current_user.ut.gid)
                return True;
 
        fstrcpy(u_name, uidtoname(uid_ace->unix_ug.uid));
-       fstrcpy(g_name, gidtoname(group_ace->unix_ug.gid));
-
-       /*
-        * Due to the winbind interfaces we need to do this via names,
-        * not uids/gids.
-        */
-
-       return user_in_group_list(u_name, g_name, NULL, 0);
+       return user_in_group_sid(u_name, &group_ace->trustee);
 }
 
 /****************************************************************************
@@ -594,26 +1044,16 @@ static BOOL uid_entry_in_group( canon_ace *uid_ace, canon_ace *group_ace )
 
 static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
                                                        files_struct *fsp,
-                                                       DOM_SID *pfile_owner_sid,
-                                                       DOM_SID *pfile_grp_sid,
+                                                       const DOM_SID *pfile_owner_sid,
+                                                       const DOM_SID *pfile_grp_sid,
                                                        SMB_STRUCT_STAT *pst,
                                                        BOOL setting_acl)
 {
-       extern DOM_SID global_sid_World;
        canon_ace *pace;
        BOOL got_user = False;
        BOOL got_grp = False;
        BOOL got_other = False;
        canon_ace *pace_other = NULL;
-       canon_ace *pace_group = NULL;
-       connection_struct *conn = fsp->conn;
-       SMB_ACL_T current_posix_acl = NULL;
-       mode_t current_user_perms = 0;
-       mode_t current_grp_perms = 0;
-       mode_t current_other_perms = 0;
-       BOOL got_current_user = False;
-       BOOL got_current_grp = False;
-       BOOL got_current_other = False;
 
        for (pace = *pp_ace; pace; pace = pace->next) {
                if (pace->type == SMB_ACL_USER_OBJ) {
@@ -631,7 +1071,6 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
                        if (setting_acl)
                                apply_default_perms(fsp, pace, S_IRGRP);
                        got_grp = True;
-                       pace_group = pace;
 
                } else if (pace->type == SMB_ACL_OTHER) {
 
@@ -646,64 +1085,8 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
                }
        }
 
-       /*
-        * When setting ACLs and missing one out of SMB_ACL_USER_OBJ,
-        * SMB_ACL_GROUP_OBJ, SMB_ACL_OTHER, try to retrieve current
-        * values. For user and other a simple vfs_stat would do, but
-        * we would get mask instead of group. Let's do it via ACL.
-        */
-
-       if (setting_acl && (!got_user || !got_grp || !got_other)) {
-
-               SMB_ACL_ENTRY_T entry;
-               int entry_id = SMB_ACL_FIRST_ENTRY;
-
-               if(fsp->is_directory || fsp->fd == -1) {
-                       current_posix_acl = conn->vfs_ops.sys_acl_get_file(conn, fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
-               } else {
-                       current_posix_acl = conn->vfs_ops.sys_acl_get_fd(fsp, fsp->fd);
-               }
-
-               if (current_posix_acl) {
-                       while (conn->vfs_ops.sys_acl_get_entry(conn, current_posix_acl, entry_id, &entry) == 1) {
-                               SMB_ACL_TAG_T tagtype;
-                               SMB_ACL_PERMSET_T permset;
-
-                               /* get_next... */
-                               if (entry_id == SMB_ACL_FIRST_ENTRY)
-                                       entry_id = SMB_ACL_NEXT_ENTRY;
-
-                               /* Is this a MASK entry ? */
-                               if (conn->vfs_ops.sys_acl_get_tag_type(conn, entry, &tagtype) == -1)
-                                       continue;
-
-                               if (conn->vfs_ops.sys_acl_get_permset(conn, entry, &permset) == -1)
-                                       continue;
-
-                               switch(tagtype) {
-                                       case SMB_ACL_USER_OBJ:
-                                               current_user_perms = convert_permset_to_mode_t(conn, permset);
-                                               got_current_user = True;
-                                               break;
-                                       case SMB_ACL_GROUP_OBJ:
-                                               current_grp_perms = convert_permset_to_mode_t(conn, permset);
-                                               got_current_grp = True;
-                                               break;
-                                       case SMB_ACL_OTHER:
-                                               current_other_perms = convert_permset_to_mode_t(conn, permset);
-                                               got_current_other = True;
-                                               break;
-                               }
-                       }
-                       conn->vfs_ops.sys_acl_free_acl(conn, current_posix_acl);
-               } else {
-                       DEBUG(10,("ensure_canon_entry_valid: failed to retrieve current ACL of %s\n",
-                               fsp->fsp_name));
-               }
-       }
-
        if (!got_user) {
-               if ((pace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+               if ((pace = SMB_MALLOC_P(canon_ace)) == NULL) {
                        DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
                        return False;
                }
@@ -716,17 +1099,27 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
                pace->attr = ALLOW_ACE;
 
                if (setting_acl) {
-                       if (got_current_user) {
-                               pace->perms = current_user_perms;
-                       } else {
-                               /* If we only got an "everyone" perm, just use that. */
-                               if (!got_grp && got_other)
+                       /* See if the owning user is in any of the other groups in
+                          the ACE. If so, OR in the permissions from that group. */
+
+                       BOOL group_matched = False;
+                       canon_ace *pace_iter;
+
+                       for (pace_iter = *pp_ace; pace_iter; pace_iter = pace_iter->next) {
+                               if (pace_iter->type == SMB_ACL_GROUP_OBJ || pace_iter->type == SMB_ACL_GROUP) {
+                                       if (uid_entry_in_group(pace, pace_iter)) {
+                                               pace->perms |= pace_iter->perms;
+                                               group_matched = True;
+                                       }
+                               }
+                       }
+
+                       /* If we only got an "everyone" perm, just use that. */
+                       if (!group_matched) {
+                               if (got_other)
                                        pace->perms = pace_other->perms;
-                               else if (got_grp && uid_entry_in_group(pace, pace_group))
-                                       pace->perms = pace_group->perms;
                                else
                                        pace->perms = 0;
-
                        }
 
                        apply_default_perms(fsp, pace, S_IRUSR);
@@ -738,7 +1131,7 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
        }
 
        if (!got_grp) {
-               if ((pace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+               if ((pace = SMB_MALLOC_P(canon_ace)) == NULL) {
                        DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
                        return False;
                }
@@ -750,15 +1143,11 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
                pace->trustee = *pfile_grp_sid;
                pace->attr = ALLOW_ACE;
                if (setting_acl) {
-                       if (got_current_grp) {
-                               pace->perms = current_grp_perms;
-                       } else {
-                               /* If we only got an "everyone" perm, just use that. */
-                               if (got_other)
-                                       pace->perms = pace_other->perms;
-                               else
-                                       pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRGRP, S_IWGRP, S_IXGRP);
-                       }
+                       /* If we only got an "everyone" perm, just use that. */
+                       if (got_other)
+                               pace->perms = pace_other->perms;
+                       else
+                               pace->perms = 0;
                        apply_default_perms(fsp, pace, S_IRGRP);
                } else {
                        pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRGRP, S_IWGRP, S_IXGRP);
@@ -768,7 +1157,7 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
        }
 
        if (!got_other) {
-               if ((pace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+               if ((pace = SMB_MALLOC_P(canon_ace)) == NULL) {
                        DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
                        return False;
                }
@@ -780,10 +1169,7 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
                pace->trustee = global_sid_World;
                pace->attr = ALLOW_ACE;
                if (setting_acl) {
-                       if (got_current_other)
-                               pace->perms = current_other_perms;
-                       else
-                               pace->perms = 0;
+                       pace->perms = 0;
                        apply_default_perms(fsp, pace, S_IROTH);
                } else
                        pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IROTH, S_IWOTH, S_IXOTH);
@@ -843,16 +1229,12 @@ static void check_owning_objs(canon_ace *ace, DOM_SID *pfile_owner_sid, DOM_SID
  Unpack a SEC_DESC into two canonical ace lists.
 ****************************************************************************/
 
-static BOOL create_canon_ace_lists(files_struct *fsp, 
+static BOOL create_canon_ace_lists(files_struct *fsp, SMB_STRUCT_STAT *pst,
                                                        DOM_SID *pfile_owner_sid,
                                                        DOM_SID *pfile_grp_sid,
                                                        canon_ace **ppfile_ace, canon_ace **ppdir_ace,
                                                        SEC_ACL *dacl)
 {
-       extern DOM_SID global_sid_Creator_Owner;
-       extern DOM_SID global_sid_Creator_Group;
-       extern DOM_SID global_sid_World;
-       extern struct generic_mapping file_generic_mapping;
        BOOL all_aces_are_inherit_only = (fsp->is_directory ? True : False);
        canon_ace *file_ace = NULL;
        canon_ace *dir_ace = NULL;
@@ -938,7 +1320,6 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
        }
 
        for(i = 0; i < dacl->num_aces; i++) {
-               enum SID_NAME_USE sid_type;
                SEC_ACE *psa = &dacl->ace[i];
 
                /*
@@ -956,7 +1337,7 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
                 * Create a cannon_ace entry representing this NT DACL ACE.
                 */
 
-               if ((current_ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+               if ((current_ace = SMB_MALLOC_P(canon_ace)) == NULL) {
                        free_canon_ace_list(file_ace);
                        free_canon_ace_list(dir_ace);
                        DEBUG(0,("create_canon_ace_lists: malloc fail.\n"));
@@ -979,7 +1360,7 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
                        current_ace->type = SMB_ACL_OTHER;
                } else if (sid_equal(&current_ace->trustee, &global_sid_Creator_Owner)) {
                        current_ace->owner_type = UID_ACE;
-                       current_ace->unix_ug.world = -1;
+                       current_ace->unix_ug.uid = pst->st_uid;
                        current_ace->type = SMB_ACL_USER_OBJ;
 
                        /*
@@ -992,7 +1373,7 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
                                psa->flags |= SEC_ACE_FLAG_INHERIT_ONLY;
                } else if (sid_equal(&current_ace->trustee, &global_sid_Creator_Group)) {
                        current_ace->owner_type = GID_ACE;
-                       current_ace->unix_ug.world = -1;
+                       current_ace->unix_ug.gid = pst->st_gid;
                        current_ace->type = SMB_ACL_GROUP_OBJ;
 
                        /*
@@ -1003,10 +1384,10 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
                        if (nt4_compatible_acls())
                                psa->flags |= SEC_ACE_FLAG_INHERIT_ONLY;
 
-               } else if (sid_to_uid( &current_ace->trustee, &current_ace->unix_ug.uid, &sid_type)) {
+               } else if (sid_to_uid( &current_ace->trustee, &current_ace->unix_ug.uid)) {
                        current_ace->owner_type = UID_ACE;
                        current_ace->type = SMB_ACL_USER;
-               } else if (sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid, &sid_type)) {
+               } else if (sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid)) {
                        current_ace->owner_type = GID_ACE;
                        current_ace->type = SMB_ACL_GROUP;
                } else {
@@ -1027,6 +1408,7 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
 
                current_ace->perms |= map_nt_perms( psa->info, S_IRUSR);
                current_ace->attr = (psa->type == SEC_ACE_TYPE_ACCESS_ALLOWED) ? ALLOW_ACE : DENY_ACE;
+               current_ace->inherited = ((psa->flags & SEC_ACE_FLAG_INHERITED_ACE) ? True : False);
 
                /*
                 * Now add the created ace to either the file list, the directory
@@ -1059,7 +1441,6 @@ static BOOL create_canon_ace_lists(files_struct *fsp,
 Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
                                        free_canon_ace_list(file_ace);
                                        free_canon_ace_list(dir_ace);
-                                       SAFE_FREE(current_ace);
                                        return False;
                                }       
 
@@ -1102,7 +1483,7 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
                 * Only add to the file ACL if not inherit only.
                 */
 
-               if (!(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY)) {
+               if (current_ace && !(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY)) {
                        DLIST_ADD_END(file_ace, current_ace, tmp_ace);
 
                        /*
@@ -1118,7 +1499,6 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
 Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
                                free_canon_ace_list(file_ace);
                                free_canon_ace_list(dir_ace);
-                               SAFE_FREE(current_ace);
                                return False;
                        }       
 
@@ -1160,8 +1540,12 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
                 * entries can be converted to *_OBJ. Usually we will already have these
                 * entries in the Default ACL, and the Access ACL will not have them.
                 */
-               check_owning_objs(file_ace, pfile_owner_sid, pfile_grp_sid);
-               check_owning_objs(dir_ace, pfile_owner_sid, pfile_grp_sid);
+               if (file_ace) {
+                       check_owning_objs(file_ace, pfile_owner_sid, pfile_grp_sid);
+               }
+               if (dir_ace) {
+                       check_owning_objs(dir_ace, pfile_owner_sid, pfile_grp_sid);
+               }
        }
 
        *ppfile_ace = file_ace;
@@ -1173,7 +1557,7 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
 /****************************************************************************
  ASCII art time again... JRA :-).
 
- We have 3 cases to process when moving from an NT ACL to a POSIX ACL. Firstly,
+ We have 4 cases to process when moving from an NT ACL to a POSIX ACL. Firstly,
  we insist the ACL is in canonical form (ie. all DENY entries preceede ALLOW
  entries). Secondly, the merge code has ensured that all duplicate SID entries for
  allow or deny have been merged, so the same SID can only appear once in the deny
@@ -1246,6 +1630,15 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
  best we can do and has the advantage of failing closed rather
  than open.
  ---------------------------------------------------------------------------
+ Fourth pass - cope with cumulative permissions.
+
+ for all allow user entries, if there exists an allow group entry with
+ more permissive permissions, and the user is in that group, rewrite the
+ allow user permissions to contain both sets of permissions.
+
+ Currently the code for this is #ifdef'ed out as these semantics make
+ no sense to me. JRA.
+ ---------------------------------------------------------------------------
 
  Note we *MUST* do the deny user pass first as this will convert deny user
  entries into allow user entries which can then be processed by the deny
@@ -1267,7 +1660,6 @@ Deny entry after Allow entry. Failing to set on file %s.\n", fsp->fsp_name ));
 
 static void process_deny_list( canon_ace **pp_ace_list )
 {
-       extern DOM_SID global_sid_World;
        canon_ace *ace_list = *pp_ace_list;
        canon_ace *curr_ace = NULL;
        canon_ace *curr_ace_next = NULL;
@@ -1435,6 +1827,45 @@ static void process_deny_list( canon_ace **pp_ace_list )
 
        }
 
+       /* Doing this fourth pass allows Windows semantics to be layered
+        * on top of POSIX semantics. I'm not sure if this is desirable.
+        * For example, in W2K ACLs there is no way to say, "Group X no
+        * access, user Y full access" if user Y is a member of group X.
+        * This seems completely broken semantics to me.... JRA.
+        */
+
+#if 0
+       /* Pass 4 above - deal with allow entries. */
+
+       for (curr_ace = ace_list; curr_ace; curr_ace = curr_ace_next) {
+               canon_ace *allow_ace_p;
+
+               curr_ace_next = curr_ace->next; /* So we can't lose the link. */
+
+               if (curr_ace->attr != ALLOW_ACE)
+                       continue;
+
+               if (curr_ace->owner_type != UID_ACE)
+                       continue;
+
+               for (allow_ace_p = ace_list; allow_ace_p; allow_ace_p = allow_ace_p->next) {
+
+                       if (allow_ace_p->attr != ALLOW_ACE)
+                               continue;
+
+                       /* We process GID_ACE entries only. */
+
+                       if (allow_ace_p->owner_type != GID_ACE)
+                               continue;
+
+                       /* OR in the group perms. */
+
+                       if (uid_entry_in_group( curr_ace, allow_ace_p))
+                               curr_ace->perms |= allow_ace_p->perms;
+               }
+       }
+#endif
+
        *pp_ace_list = ace_list;
 }
 
@@ -1448,7 +1879,7 @@ static mode_t create_default_mode(files_struct *fsp, BOOL interitable_mode)
        int snum = SNUM(fsp->conn);
        mode_t and_bits = (mode_t)0;
        mode_t or_bits = (mode_t)0;
-       mode_t mode = interitable_mode ? unix_mode( fsp->conn, FILE_ATTRIBUTE_ARCHIVE, fsp->fsp_name) : S_IRUSR;
+       mode_t mode = interitable_mode ? unix_mode( fsp->conn, FILE_ATTRIBUTE_ARCHIVE, fsp->fsp_name, False) : S_IRUSR;
 
        if (fsp->is_directory)
                mode |= (S_IWUSR|S_IXUSR);
@@ -1503,7 +1934,7 @@ static BOOL unpack_canon_ace(files_struct *fsp,
         * Now go through the DACL and create the canon_ace lists.
         */
 
-       if (!create_canon_ace_lists( fsp, pfile_owner_sid, pfile_grp_sid,
+       if (!create_canon_ace_lists( fsp, pst, pfile_owner_sid, pfile_grp_sid,
                                                                &file_ace, &dir_ace, psd->dacl))
                return False;
 
@@ -1593,8 +2024,8 @@ static BOOL unpack_canon_ace(files_struct *fsp,
  then a simple POSIX permission of rw-r--r-- should really map to 5 entries,
 
  Entry 0: owner : deny all except read and write.
- Entry 1: group : deny all except read.
- Entry 2: owner : allow read and write.
+ Entry 1: owner : allow read and write.
+ Entry 2: group : deny all except read.
  Entry 3: group : allow read.
  Entry 4: Everyone : allow read.
 
@@ -1646,9 +2077,8 @@ static void arrange_posix_perms( char *filename, canon_ace **pp_list_head)
 ****************************************************************************/
 
 static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_STRUCT_STAT *psbuf,
-                                       DOM_SID *powner, DOM_SID *pgroup, SMB_ACL_TYPE_T the_acl_type)
+                                       const DOM_SID *powner, const DOM_SID *pgroup, struct pai_val *pal, SMB_ACL_TYPE_T the_acl_type)
 {
-       extern DOM_SID global_sid_World;
        connection_struct *conn = fsp->conn;
        mode_t acl_mask = (S_IRUSR|S_IWUSR|S_IXUSR);
        canon_ace *list_head = NULL;
@@ -1658,7 +2088,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
        SMB_ACL_ENTRY_T entry;
        size_t ace_count;
 
-       while ( posix_acl && (conn->vfs_ops.sys_acl_get_entry(conn, posix_acl, entry_id, &entry) == 1)) {
+       while ( posix_acl && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1)) {
                SMB_ACL_TAG_T tagtype;
                SMB_ACL_PERMSET_T permset;
                DOM_SID sid;
@@ -1670,10 +2100,10 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                        entry_id = SMB_ACL_NEXT_ENTRY;
 
                /* Is this a MASK entry ? */
-               if (conn->vfs_ops.sys_acl_get_tag_type(conn, entry, &tagtype) == -1)
+               if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1)
                        continue;
 
-               if (conn->vfs_ops.sys_acl_get_permset(conn, entry, &permset) == -1)
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry, &permset) == -1)
                        continue;
 
                /* Decide which SID to use based on the ACL type. */
@@ -1686,7 +2116,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                                break;
                        case SMB_ACL_USER:
                                {
-                                       uid_t *puid = (uid_t *)conn->vfs_ops.sys_acl_get_qualifier(conn, entry);
+                                       uid_t *puid = (uid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry);
                                        if (puid == NULL) {
                                                DEBUG(0,("canonicalise_acl: Failed to get uid.\n"));
                                                continue;
@@ -1698,12 +2128,14 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                                         * entries out of the blue when setting ACLs, so a get/set
                                         * cycle will drop them.
                                         */
-                                       if (the_acl_type == SMB_ACL_TYPE_ACCESS && *puid == psbuf->st_uid)
+                                       if (the_acl_type == SMB_ACL_TYPE_ACCESS && *puid == psbuf->st_uid) {
+                                               SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)puid,tagtype);
                                                continue;
+                                       }
                                        uid_to_sid( &sid, *puid);
                                        unix_ug.uid = *puid;
                                        owner_type = UID_ACE;
-                                       conn->vfs_ops.sys_acl_free_qualifier(conn, (void *)puid,tagtype);
+                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)puid,tagtype);
                                        break;
                                }
                        case SMB_ACL_GROUP_OBJ:
@@ -1714,7 +2146,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                                break;
                        case SMB_ACL_GROUP:
                                {
-                                       gid_t *pgid = (gid_t *)conn->vfs_ops.sys_acl_get_qualifier(conn, entry);
+                                       gid_t *pgid = (gid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry);
                                        if (pgid == NULL) {
                                                DEBUG(0,("canonicalise_acl: Failed to get gid.\n"));
                                                continue;
@@ -1722,7 +2154,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                                        gid_to_sid( &sid, *pgid);
                                        unix_ug.gid = *pgid;
                                        owner_type = GID_ACE;
-                                       conn->vfs_ops.sys_acl_free_qualifier(conn, (void *)pgid,tagtype);
+                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)pgid,tagtype);
                                        break;
                                }
                        case SMB_ACL_MASK:
@@ -1743,7 +2175,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                 * Add this entry to the list.
                 */
 
-               if ((ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL)
+               if ((ace = SMB_MALLOC_P(canon_ace)) == NULL)
                        goto fail;
 
                ZERO_STRUCTP(ace);
@@ -1753,6 +2185,7 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                ace->trustee = sid;
                ace->unix_ug = unix_ug;
                ace->owner_type = owner_type;
+               ace->inherited = get_inherited_flag(pal, ace, (the_acl_type == SMB_ACL_TYPE_DEFAULT));
 
                DLIST_ADD(list_head, ace);
        }
@@ -1764,14 +2197,12 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
        if (!ensure_canon_entry_valid(&list_head, fsp, powner, pgroup, psbuf, False))
                goto fail;
 
-       arrange_posix_perms(fsp->fsp_name,&list_head );
-
        /*
         * Now go through the list, masking the permissions with the
         * acl_mask. Ensure all DENY Entries are at the start of the list.
         */
 
-       DEBUG(10,("canonicalise_acl: ace entries before arrange :\n"));
+       DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", the_acl_type == SMB_ACL_TYPE_ACCESS ? "Access" : "Default" ));
 
        for ( ace_count = 0, ace = list_head; ace; ace = next_ace, ace_count++) {
                next_ace = ace->next;
@@ -1789,6 +2220,8 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                }
        }
 
+       arrange_posix_perms(fsp->fsp_name,&list_head );
+
        print_canon_ace_list( "canonicalise_acl: ace entries after arrange", list_head );
 
        return list_head;
@@ -1799,15 +2232,49 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
        return NULL;
 }
 
+/****************************************************************************
+ Check if the current user group list contains a given group.
+****************************************************************************/
+
+static BOOL current_user_in_group(gid_t gid)
+{
+       int i;
+
+       for (i = 0; i < current_user.ut.ngroups; i++) {
+               if (current_user.ut.groups[i] == gid) {
+                       return True;
+               }
+       }
+
+       return False;
+}
+
+/****************************************************************************
+ Should we override a deny ?  Check deprecated 'acl group control'
+ and 'dos filemode'
+****************************************************************************/
+
+static BOOL acl_group_override(connection_struct *conn, gid_t prim_gid)
+{
+       if ( (errno == EACCES || errno == EPERM) 
+               && (lp_acl_group_control(SNUM(conn) || lp_dos_filemode(SNUM(conn)))) 
+               && current_user_in_group(prim_gid) ) 
+       {
+               return True;
+       } 
+
+       return False;
+}
+
 /****************************************************************************
  Attempt to apply an ACL to a file or directory.
 ****************************************************************************/
 
-static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL default_ace, BOOL *pacl_set_support)
+static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL default_ace, gid_t prim_gid, BOOL *pacl_set_support)
 {
        connection_struct *conn = fsp->conn;
        BOOL ret = False;
-       SMB_ACL_T the_acl = conn->vfs_ops.sys_acl_init(conn, (int)count_canon_ace_list(the_ace) + 1);
+       SMB_ACL_T the_acl = SMB_VFS_SYS_ACL_INIT(conn, (int)count_canon_ace_list(the_ace) + 1);
        canon_ace *p_ace;
        int i;
        SMB_ACL_ENTRY_T mask_entry;
@@ -1824,7 +2291,7 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
 
        if (the_acl == NULL) {
 
-               if (errno != ENOSYS) {
+               if (!no_acl_syscall_error(errno)) {
                        /*
                         * Only print this error message if we have some kind of ACL
                         * support that's not working. Otherwise we would always get this.
@@ -1865,10 +2332,10 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
                 * Get the entry for this ACE.
                 */
 
-               if (conn->vfs_ops.sys_acl_create_entry(conn, &the_acl, &the_entry) == -1) {
+               if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &the_acl, &the_entry) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to create entry %d. (%s)\n",
                                i, strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
                if (p_ace->type == SMB_ACL_MASK) {
@@ -1891,10 +2358,10 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
                 * First tell the entry what type of ACE this is.
                 */
 
-               if (conn->vfs_ops.sys_acl_set_tag_type(conn, the_entry, p_ace->type) == -1) {
+               if (SMB_VFS_SYS_ACL_SET_TAG_TYPE(conn, the_entry, p_ace->type) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to set tag type on entry %d. (%s)\n",
                                i, strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
                /*
@@ -1903,10 +2370,10 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
                 */
 
                if ((p_ace->type == SMB_ACL_USER) || (p_ace->type == SMB_ACL_GROUP)) {
-                       if (conn->vfs_ops.sys_acl_set_qualifier(conn, the_entry,(void *)&p_ace->unix_ug.uid) == -1) {
+                       if (SMB_VFS_SYS_ACL_SET_QUALIFIER(conn, the_entry,(void *)&p_ace->unix_ug.uid) == -1) {
                                DEBUG(0,("set_canon_ace_list: Failed to set qualifier on entry %d. (%s)\n",
                                        i, strerror(errno) ));
-                               goto done;
+                               goto fail;
                        }
                }
 
@@ -1914,56 +2381,57 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
                 * Convert the mode_t perms in the canon_ace to a POSIX permset.
                 */
 
-               if (conn->vfs_ops.sys_acl_get_permset(conn, the_entry, &the_permset) == -1) {
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, the_entry, &the_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to get permset on entry %d. (%s)\n",
                                i, strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
                if (map_acl_perms_to_permset(conn, p_ace->perms, &the_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to create permset for mode (%u) on entry %d. (%s)\n",
                                (unsigned int)p_ace->perms, i, strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
                /*
                 * ..and apply them to the entry.
                 */
 
-               if (conn->vfs_ops.sys_acl_set_permset(conn, the_entry, the_permset) == -1) {
+               if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, the_entry, the_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to add permset on entry %d. (%s)\n",
                                i, strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
                if( DEBUGLVL( 10 ))
                        print_canon_ace( p_ace, i);
+
        }
 
        if (needs_mask && !got_mask_entry) {
-               if (conn->vfs_ops.sys_acl_create_entry(conn, &the_acl, &mask_entry) == -1) {
+               if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &the_acl, &mask_entry) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to create mask entry. (%s)\n", strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
-               if (conn->vfs_ops.sys_acl_set_tag_type(conn, mask_entry, SMB_ACL_MASK) == -1) {
+               if (SMB_VFS_SYS_ACL_SET_TAG_TYPE(conn, mask_entry, SMB_ACL_MASK) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to set tag type on mask entry. (%s)\n",strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
-               if (conn->vfs_ops.sys_acl_get_permset(conn, mask_entry, &mask_permset) == -1) {
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, mask_entry, &mask_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to get mask permset. (%s)\n", strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
                if (map_acl_perms_to_permset(conn, S_IRUSR|S_IWUSR|S_IXUSR, &mask_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to create mask permset. (%s)\n", strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
 
-               if (conn->vfs_ops.sys_acl_set_permset(conn, mask_entry, mask_permset) == -1) {
+               if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, mask_entry, mask_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to add mask permset. (%s)\n", strerror(errno) ));
-                       goto done;
+                       goto fail;
                }
        }
 
@@ -1971,62 +2439,87 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
         * Check if the ACL is valid.
         */
 
-       if (conn->vfs_ops.sys_acl_valid(conn, the_acl) == -1) {
+       if (SMB_VFS_SYS_ACL_VALID(conn, the_acl) == -1) {
                DEBUG(0,("set_canon_ace_list: ACL type (%s) is invalid for set (%s).\n",
                                the_acl_type == SMB_ACL_TYPE_DEFAULT ? "directory default" : "file",
                                strerror(errno) ));
-               goto done;
+               goto fail;
        }
 
        /*
         * Finally apply it to the file or directory.
         */
 
-       if(default_ace || fsp->is_directory || fsp->fd == -1) {
-               if (conn->vfs_ops.sys_acl_set_file(conn, fsp->fsp_name, the_acl_type, the_acl) == -1) {
+       if(default_ace || fsp->is_directory || fsp->fh->fd == -1) {
+               if (SMB_VFS_SYS_ACL_SET_FILE(conn, fsp->fsp_name, the_acl_type, the_acl) == -1) {
                        /*
                         * Some systems allow all the above calls and only fail with no ACL support
                         * when attempting to apply the acl. HPUX with HFS is an example of this. JRA.
                         */
-                       if (errno == ENOSYS)
+                       if (no_acl_syscall_error(errno)) {
                                *pacl_set_support = False;
+                       }
 
-#ifdef ENOTSUP
-                       if (errno == ENOTSUP)
-                               *pacl_set_support = False;
-#endif
+                       if (acl_group_override(conn, prim_gid)) {
+                               int sret;
 
-                       DEBUG(2,("set_canon_ace_list: sys_acl_set_file type %s failed for file %s (%s).\n",
-                                       the_acl_type == SMB_ACL_TYPE_DEFAULT ? "directory default" : "file",
-                                       fsp->fsp_name, strerror(errno) ));
-                       goto done;
+                               DEBUG(5,("set_canon_ace_list: acl group control on and current user in file %s primary group.\n",
+                                       fsp->fsp_name ));
+
+                               become_root();
+                               sret = SMB_VFS_SYS_ACL_SET_FILE(conn, fsp->fsp_name, the_acl_type, the_acl);
+                               unbecome_root();
+                               if (sret == 0) {
+                                       ret = True;     
+                               }
+                       }
+
+                       if (ret == False) {
+                               DEBUG(2,("set_canon_ace_list: sys_acl_set_file type %s failed for file %s (%s).\n",
+                                               the_acl_type == SMB_ACL_TYPE_DEFAULT ? "directory default" : "file",
+                                               fsp->fsp_name, strerror(errno) ));
+                               goto fail;
+                       }
                }
        } else {
-               if (conn->vfs_ops.sys_acl_set_fd(fsp, fsp->fd, the_acl) == -1) {
+               if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, the_acl) == -1) {
                        /*
                         * Some systems allow all the above calls and only fail with no ACL support
                         * when attempting to apply the acl. HPUX with HFS is an example of this. JRA.
                         */
-                       if (errno == ENOSYS)
+                       if (no_acl_syscall_error(errno)) {
                                *pacl_set_support = False;
+                       }
 
-#ifdef ENOTSUP
-                       if (errno == ENOTSUP)
-                               *pacl_set_support = False;
-#endif
+                       if (acl_group_override(conn, prim_gid)) {
+                               int sret;
 
-                       DEBUG(2,("set_canon_ace_list: sys_acl_set_file failed for file %s (%s).\n",
-                                       fsp->fsp_name, strerror(errno) ));
-                       goto done;
+                               DEBUG(5,("set_canon_ace_list: acl group control on and current user in file %s primary group.\n",
+                                       fsp->fsp_name ));
+
+                               become_root();
+                               sret = SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, the_acl);
+                               unbecome_root();
+                               if (sret == 0) {
+                                       ret = True;
+                               }
+                       }
+
+                       if (ret == False) {
+                               DEBUG(2,("set_canon_ace_list: sys_acl_set_file failed for file %s (%s).\n",
+                                               fsp->fsp_name, strerror(errno) ));
+                               goto fail;
+                       }
                }
        }
 
        ret = True;
 
-  done:
+  fail:
 
-       if (the_acl != NULL)
-           conn->vfs_ops.sys_acl_free_acl(conn, the_acl);
+       if (the_acl != NULL) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, the_acl);
+       }
 
        return ret;
 }
@@ -2051,17 +2544,17 @@ static struct canon_ace *canon_ace_entry_for(struct canon_ace *list, SMB_ACL_TAG
  
 ****************************************************************************/
 
-SMB_ACL_T free_empty_sys_acl(connection_struct *conn, SMB_ACL_T acl)
+SMB_ACL_T free_empty_sys_acl(connection_struct *conn, SMB_ACL_T the_acl)
 {
        SMB_ACL_ENTRY_T entry;
 
-       if (!acl)
+       if (!the_acl)
                return NULL;
-       if (conn->vfs_ops.sys_acl_get_entry(conn, acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) {
-               conn->vfs_ops.sys_acl_free_acl(conn, acl);
+       if (SMB_VFS_SYS_ACL_GET_ENTRY(conn, the_acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, the_acl);
                return NULL;
        }
-       return acl;
+       return the_acl;
 }
 
 /****************************************************************************
@@ -2139,16 +2632,6 @@ posix perms.\n", fsp->fsp_name ));
        return True;
 }
 
-static int nt_ace_comp( SEC_ACE *a1, SEC_ACE *a2)
-{
-       if (a1->type == a2->type)
-               return 0;
-
-       if (a1->type == SEC_ACE_TYPE_ACCESS_DENIED && a2->type == SEC_ACE_TYPE_ACCESS_ALLOWED)
-               return -1;
-       return 1;
-}
-
 /****************************************************************************
   Incoming NT ACLs on a directory can be split into a default POSIX acl (CI|OI|IO) and
   a normal POSIX acl. Win2k needs these split acls re-merging into one ACL
@@ -2162,24 +2645,51 @@ static size_t merge_default_aces( SEC_ACE *nt_ace_list, size_t num_aces)
 
        for (i = 0; i < num_aces; i++) {
                for (j = i+1; j < num_aces; j++) {
+                       uint32 i_flags_ni = (nt_ace_list[i].flags & ~SEC_ACE_FLAG_INHERITED_ACE);
+                       uint32 j_flags_ni = (nt_ace_list[j].flags & ~SEC_ACE_FLAG_INHERITED_ACE);
+                       BOOL i_inh = (nt_ace_list[i].flags & SEC_ACE_FLAG_INHERITED_ACE) ? True : False;
+                       BOOL j_inh = (nt_ace_list[j].flags & SEC_ACE_FLAG_INHERITED_ACE) ? True : False;
+
                        /* We know the lower number ACE's are file entries. */
                        if ((nt_ace_list[i].type == nt_ace_list[j].type) &&
                                (nt_ace_list[i].size == nt_ace_list[j].size) &&
                                (nt_ace_list[i].info.mask == nt_ace_list[j].info.mask) &&
                                sid_equal(&nt_ace_list[i].trustee, &nt_ace_list[j].trustee) &&
-                               (nt_ace_list[i].flags == 0) &&
-                               (nt_ace_list[j].flags == (SEC_ACE_FLAG_OBJECT_INHERIT|
-                                                         SEC_ACE_FLAG_CONTAINER_INHERIT|
-                                                         SEC_ACE_FLAG_INHERIT_ONLY))) {
+                               (i_inh == j_inh) &&
+                               (i_flags_ni == 0) &&
+                               (j_flags_ni == (SEC_ACE_FLAG_OBJECT_INHERIT|
+                                                 SEC_ACE_FLAG_CONTAINER_INHERIT|
+                                                 SEC_ACE_FLAG_INHERIT_ONLY))) {
                                /*
-                                * These are identical except for the flags.
-                                * Merge the inherited ACE onto the non-inherited ACE.
+                                * W2K wants to have access allowed zero access ACE's
+                                * at the end of the list. If the mask is zero, merge
+                                * the non-inherited ACE onto the inherited ACE.
                                 */
 
-                               nt_ace_list[i].flags = SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT;
-                               if (num_aces - j - 1 > 0)
-                                       memmove(&nt_ace_list[j], &nt_ace_list[j+1], (num_aces-j-1) *
-                                                       sizeof(SEC_ACE));
+                               if (nt_ace_list[i].info.mask == 0) {
+                                       nt_ace_list[j].flags = SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|
+                                                               (i_inh ? SEC_ACE_FLAG_INHERITED_ACE : 0);
+                                       if (num_aces - i - 1 > 0)
+                                               memmove(&nt_ace_list[i], &nt_ace_list[i+1], (num_aces-i-1) *
+                                                               sizeof(SEC_ACE));
+
+                                       DEBUG(10,("merge_default_aces: Merging zero access ACE %u onto ACE %u.\n",
+                                               (unsigned int)i, (unsigned int)j ));
+                               } else {
+                                       /*
+                                        * These are identical except for the flags.
+                                        * Merge the inherited ACE onto the non-inherited ACE.
+                                        */
+
+                                       nt_ace_list[i].flags = SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|
+                                                               (i_inh ? SEC_ACE_FLAG_INHERITED_ACE : 0);
+                                       if (num_aces - j - 1 > 0)
+                                               memmove(&nt_ace_list[j], &nt_ace_list[j+1], (num_aces-j-1) *
+                                                               sizeof(SEC_ACE));
+
+                                       DEBUG(10,("merge_default_aces: Merging ACE %u onto ACE %u.\n",
+                                               (unsigned int)j, (unsigned int)i ));
+                               }
                                num_aces--;
                                break;
                        }
@@ -2195,12 +2705,8 @@ static size_t merge_default_aces( SEC_ACE *nt_ace_list, size_t num_aces)
  the UNIX style get ACL.
 ****************************************************************************/
 
-size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
+size_t get_nt_acl(files_struct *fsp, uint32 security_info, SEC_DESC **ppdesc)
 {
-       extern DOM_SID global_sid_Builtin_Administrators;
-       extern DOM_SID global_sid_Builtin_Users;
-       extern DOM_SID global_sid_Creator_Owner;
-       extern DOM_SID global_sid_Creator_Group;
        connection_struct *conn = fsp->conn;
        SMB_STRUCT_STAT sbuf;
        SEC_ACE *nt_ace_list = NULL;
@@ -2209,60 +2715,64 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
        size_t sd_size = 0;
        SEC_ACL *psa = NULL;
        size_t num_acls = 0;
-       size_t num_dir_acls = 0;
+       size_t num_def_acls = 0;
        size_t num_aces = 0;
        SMB_ACL_T posix_acl = NULL;
-       SMB_ACL_T dir_acl = NULL;
+       SMB_ACL_T def_acl = NULL;
        canon_ace *file_ace = NULL;
        canon_ace *dir_ace = NULL;
        size_t num_profile_acls = 0;
+       struct pai_val *pal = NULL;
+       SEC_DESC *psd = NULL;
+
        *ppdesc = NULL;
 
        DEBUG(10,("get_nt_acl: called for file %s\n", fsp->fsp_name ));
 
-       if(fsp->is_directory || fsp->fd == -1) {
+       if(fsp->is_directory || fsp->fh->fd == -1) {
 
                /* Get the stat struct for the owner info. */
-               if(vfs_stat(fsp->conn,fsp->fsp_name, &sbuf) != 0) {
+               if(SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf) != 0) {
                        return 0;
                }
                /*
                 * Get the ACL from the path.
                 */
 
-               posix_acl = conn->vfs_ops.sys_acl_get_file(conn, fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
+               posix_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, fsp->fsp_name, SMB_ACL_TYPE_ACCESS);
 
                /*
                 * If it's a directory get the default POSIX ACL.
                 */
 
                if(fsp->is_directory) {
-                       dir_acl = conn->vfs_ops.sys_acl_get_file(conn, fsp->fsp_name, SMB_ACL_TYPE_DEFAULT);
-                       dir_acl = free_empty_sys_acl(conn, dir_acl);
+                       def_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, fsp->fsp_name, SMB_ACL_TYPE_DEFAULT);
+                       def_acl = free_empty_sys_acl(conn, def_acl);
                }
 
        } else {
 
                /* Get the stat struct for the owner info. */
-               if(vfs_fstat(fsp,fsp->fd,&sbuf) != 0) {
+               if(SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) != 0) {
                        return 0;
                }
                /*
                 * Get the ACL from the fd.
                 */
-               posix_acl = conn->vfs_ops.sys_acl_get_fd(fsp, fsp->fd);
+               posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fh->fd);
        }
 
        DEBUG(5,("get_nt_acl : file ACL %s, directory ACL %s\n",
                        posix_acl ? "present" :  "absent",
-                       dir_acl ? "present" :  "absent" ));
+                       def_acl ? "present" :  "absent" ));
+
+       pal = load_inherited_info(fsp);
 
        /*
         * Get the owner, group and world SIDs.
         */
 
-       if (lp_profile_acls(SNUM(fsp->conn))) {
+       if (lp_profile_acls(SNUM(conn))) {
                /* For WXP SP1 the owner must be administrators. */
                sid_copy(&owner_sid, &global_sid_Builtin_Administrators);
                sid_copy(&group_sid, &global_sid_Builtin_Users);
@@ -2271,219 +2781,207 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
                create_file_sids(&sbuf, &owner_sid, &group_sid);
        }
 
-       /*
-        * In the optimum case Creator Owner and Creator Group would be used for
-        * the ACL_USER_OBJ and ACL_GROUP_OBJ entries, respectively, but this
-        * would lead to usability problems under Windows: The Creator entries
-        * are only available in browse lists of directories and not for files;
-        * additionally the identity of the owning group couldn't be determined.
-        * We therefore use those identities only for Default ACLs. 
-        */
-
-       /* Create the canon_ace lists. */
-       file_ace = canonicalise_acl( fsp, posix_acl, &sbuf, &owner_sid, &group_sid, SMB_ACL_TYPE_ACCESS );
+       if ((security_info & DACL_SECURITY_INFORMATION) && !(security_info & PROTECTED_DACL_SECURITY_INFORMATION)) {
 
-       /* We must have *some* ACLS. */
-
-       if (count_canon_ace_list(file_ace) == 0) {
-               DEBUG(0,("get_nt_acl : No ACLs on file (%s) !\n", fsp->fsp_name ));
-               return 0;
-       }
+               /*
+                * In the optimum case Creator Owner and Creator Group would be used for
+                * the ACL_USER_OBJ and ACL_GROUP_OBJ entries, respectively, but this
+                * would lead to usability problems under Windows: The Creator entries
+                * are only available in browse lists of directories and not for files;
+                * additionally the identity of the owning group couldn't be determined.
+                * We therefore use those identities only for Default ACLs. 
+                */
 
-       if (fsp->is_directory && dir_acl) {
-               dir_ace = canonicalise_acl(fsp, dir_acl, &sbuf,
-                               &global_sid_Creator_Owner,
-                               &global_sid_Creator_Group, SMB_ACL_TYPE_DEFAULT );
-       }
+               /* Create the canon_ace lists. */
+               file_ace = canonicalise_acl( fsp, posix_acl, &sbuf, &owner_sid, &group_sid, pal, SMB_ACL_TYPE_ACCESS );
 
-       /*
-        * Create the NT ACE list from the canonical ace lists.
-        */
+               /* We must have *some* ACLS. */
+       
+               if (count_canon_ace_list(file_ace) == 0) {
+                       DEBUG(0,("get_nt_acl : No ACLs on file (%s) !\n", fsp->fsp_name ));
+                       goto done;
+               }
 
-       {
-               canon_ace *ace;
-               int nt_acl_type;
-               int i;
+               if (fsp->is_directory && def_acl) {
+                       dir_ace = canonicalise_acl(fsp, def_acl, &sbuf,
+                                       &global_sid_Creator_Owner,
+                                       &global_sid_Creator_Group, pal, SMB_ACL_TYPE_DEFAULT );
+               }
 
-               if (nt4_compatible_acls()) {
-                       /*
-                        * NT 4 chokes if an ACL contains an INHERIT_ONLY entry
-                        * but no non-INHERIT_ONLY entry for one SID. So we only
-                        * remove entries from the Access ACL if the
-                        * corresponding Default ACL entries have also been
-                        * removed. ACEs for CREATOR-OWNER and CREATOR-GROUP
-                        * are exceptions. We can do nothing
-                        * intelligent if the Default ACL contains entries that
-                        * are not also contained in the Access ACL, so this
-                        * case will still fail under NT 4.
-                        */
+               /*
+                * Create the NT ACE list from the canonical ace lists.
+                */
 
-                       if (!dir_ace)
-                               goto simplify_file_ace_only;
+               {
+                       canon_ace *ace;
+                       int nt_acl_type;
+                       int i;
 
-                       ace = canon_ace_entry_for(dir_ace, SMB_ACL_OTHER, NULL);
-                       if (ace && !ace->perms) {
-                               DLIST_REMOVE(dir_ace, ace);
-                               SAFE_FREE(ace);
+                       if (nt4_compatible_acls() && dir_ace) {
+                               /*
+                                * NT 4 chokes if an ACL contains an INHERIT_ONLY entry
+                                * but no non-INHERIT_ONLY entry for one SID. So we only
+                                * remove entries from the Access ACL if the
+                                * corresponding Default ACL entries have also been
+                                * removed. ACEs for CREATOR-OWNER and CREATOR-GROUP
+                                * are exceptions. We can do nothing
+                                * intelligent if the Default ACL contains entries that
+                                * are not also contained in the Access ACL, so this
+                                * case will still fail under NT 4.
+                                */
 
-                               ace = canon_ace_entry_for(file_ace, SMB_ACL_OTHER, NULL);
+                               ace = canon_ace_entry_for(dir_ace, SMB_ACL_OTHER, NULL);
                                if (ace && !ace->perms) {
-                                       DLIST_REMOVE(file_ace, ace);
+                                       DLIST_REMOVE(dir_ace, ace);
                                        SAFE_FREE(ace);
+
+                                       ace = canon_ace_entry_for(file_ace, SMB_ACL_OTHER, NULL);
+                                       if (ace && !ace->perms) {
+                                               DLIST_REMOVE(file_ace, ace);
+                                               SAFE_FREE(ace);
+                                       }
                                }
-                       }
 
-                       /*
-                        * WinNT doesn't usually have Creator Group
-                        * in browse lists, so we send this entry to
-                        * WinNT even if it contains no relevant
-                        * permissions. Once we can add
-                        * Creator Group to browse lists we can
-                        * re-enable this.
-                        */
+                               /*
+                                * WinNT doesn't usually have Creator Group
+                                * in browse lists, so we send this entry to
+                                * WinNT even if it contains no relevant
+                                * permissions. Once we can add
+                                * Creator Group to browse lists we can
+                                * re-enable this.
+                                */
 
 #if 0
-                       ace = canon_ace_entry_for(dir_ace, SMB_ACL_GROUP_OBJ, NULL);
-                       if (ace && !ace->perms) {
-                               DLIST_REMOVE(dir_ace, ace);
-                               SAFE_FREE(ace);
-                       }
+                               ace = canon_ace_entry_for(dir_ace, SMB_ACL_GROUP_OBJ, NULL);
+                               if (ace && !ace->perms) {
+                                       DLIST_REMOVE(dir_ace, ace);
+                                       SAFE_FREE(ace);
+                               }
 #endif
 
-                       ace = canon_ace_entry_for(file_ace, SMB_ACL_GROUP_OBJ, NULL);
-                       if (ace && !ace->perms) {
-                               DLIST_REMOVE(file_ace, ace);
-                               SAFE_FREE(ace);
-                       }
-               } else {
-
-                       ace = canon_ace_entry_for(dir_ace, SMB_ACL_OTHER, NULL);
-                       if (ace && !ace->perms) {
-                               DLIST_REMOVE(dir_ace, ace);
-                               SAFE_FREE(ace);
-                       }
-                       ace = canon_ace_entry_for(dir_ace, SMB_ACL_GROUP_OBJ, NULL);
-                       if (ace && !ace->perms) {
-                               DLIST_REMOVE(dir_ace, ace);
-                               SAFE_FREE(ace);
+                               ace = canon_ace_entry_for(file_ace, SMB_ACL_GROUP_OBJ, NULL);
+                               if (ace && !ace->perms) {
+                                       DLIST_REMOVE(file_ace, ace);
+                                       SAFE_FREE(ace);
+                               }
                        }
 
- simplify_file_ace_only:
+                       num_acls = count_canon_ace_list(file_ace);
+                       num_def_acls = count_canon_ace_list(dir_ace);
 
-                       ace = canon_ace_entry_for(file_ace, SMB_ACL_OTHER, NULL);
-                       if (ace && !ace->perms) {
-                               DLIST_REMOVE(file_ace, ace);
-                               SAFE_FREE(ace);
-                       }
-
-                       ace = canon_ace_entry_for(file_ace, SMB_ACL_GROUP_OBJ, NULL);
-                       if (ace && !ace->perms) {
-                               DLIST_REMOVE(file_ace, ace);
-                               SAFE_FREE(ace);
+                       /* Allocate the ace list. */
+                       if ((nt_ace_list = SMB_MALLOC_ARRAY(SEC_ACE,num_acls + num_profile_acls + num_def_acls)) == NULL) {
+                               DEBUG(0,("get_nt_acl: Unable to malloc space for nt_ace_list.\n"));
+                               goto done;
                        }
-               }
 
-               num_acls = count_canon_ace_list(file_ace);
-               num_dir_acls = count_canon_ace_list(dir_ace);
+                       memset(nt_ace_list, '\0', (num_acls + num_def_acls) * sizeof(SEC_ACE) );
+                                                                                                       
+                       /*
+                        * Create the NT ACE list from the canonical ace lists.
+                        */
+       
+                       ace = file_ace;
 
-               /* Allocate the ace list. */
-               if ((nt_ace_list = (SEC_ACE *)malloc((num_acls + num_profile_acls + num_dir_acls)* sizeof(SEC_ACE))) == NULL) {
-                       DEBUG(0,("get_nt_acl: Unable to malloc space for nt_ace_list.\n"));
-                       goto done;
-               }
+                       for (i = 0; i < num_acls; i++, ace = ace->next) {
+                               SEC_ACCESS acc;
 
-               memset(nt_ace_list, '\0', (num_acls + num_dir_acls) * sizeof(SEC_ACE) );
-                                                                                               
-               /*
-                * Create the NT ACE list from the canonical ace lists.
-                */
+                               acc = map_canon_ace_perms(SNUM(conn), &nt_acl_type, &owner_sid, ace, fsp->is_directory);
+                               init_sec_ace(&nt_ace_list[num_aces++], &ace->trustee, nt_acl_type, acc, ace->inherited ? SEC_ACE_FLAG_INHERITED_ACE : 0);
+                       }
 
-               ace = file_ace;
+                       /* The User must have access to a profile share - even if we can't map the SID. */
+                       if (lp_profile_acls(SNUM(conn))) {
+                               SEC_ACCESS acc;
 
-               for (i = 0; i < num_acls; i++, ace = ace->next) {
-                       SEC_ACCESS acc;
+                               init_sec_access(&acc,FILE_GENERIC_ALL);
+                               init_sec_ace(&nt_ace_list[num_aces++], &global_sid_Builtin_Users, SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                               acc, 0);
+                       }
 
-                       acc = map_canon_ace_perms(&nt_acl_type, &owner_sid, ace );
-                       init_sec_ace(&nt_ace_list[num_aces++], &ace->trustee, nt_acl_type, acc, 0);
-               }
+                       ace = dir_ace;
 
-               /* The User must have access to a profile share - even if we can't map the SID. */
-               if (lp_profile_acls(SNUM(fsp->conn))) {
-                       SEC_ACCESS acc;
+                       for (i = 0; i < num_def_acls; i++, ace = ace->next) {
+                               SEC_ACCESS acc;
+       
+                               acc = map_canon_ace_perms(SNUM(conn), &nt_acl_type, &owner_sid, ace, fsp->is_directory);
+                               init_sec_ace(&nt_ace_list[num_aces++], &ace->trustee, nt_acl_type, acc,
+                                               SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|
+                                               SEC_ACE_FLAG_INHERIT_ONLY|
+                                               (ace->inherited ? SEC_ACE_FLAG_INHERITED_ACE : 0));
+                       }
 
-                       init_sec_access(&acc,FILE_GENERIC_ALL);
-                       init_sec_ace(&nt_ace_list[num_aces++], &global_sid_Builtin_Users, SEC_ACE_TYPE_ACCESS_ALLOWED, acc, 0);
-               }
+                       /* The User must have access to a profile share - even if we can't map the SID. */
+                       if (lp_profile_acls(SNUM(conn))) {
+                               SEC_ACCESS acc;
+                       
+                               init_sec_access(&acc,FILE_GENERIC_ALL);
+                               init_sec_ace(&nt_ace_list[num_aces++], &global_sid_Builtin_Users, SEC_ACE_TYPE_ACCESS_ALLOWED, acc,
+                                               SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|
+                                               SEC_ACE_FLAG_INHERIT_ONLY|0);
+                       }
 
-               ace = dir_ace;
+                       /*
+                        * Merge POSIX default ACLs and normal ACLs into one NT ACE.
+                        * Win2K needs this to get the inheritance correct when replacing ACLs
+                        * on a directory tree. Based on work by Jim @ IBM.
+                        */
 
-               for (i = 0; i < num_dir_acls; i++, ace = ace->next) {
-                       SEC_ACCESS acc;
+                       num_aces = merge_default_aces(nt_ace_list, num_aces);
 
-                       acc = map_canon_ace_perms(&nt_acl_type, &owner_sid, ace );
-                       init_sec_ace(&nt_ace_list[num_aces++], &ace->trustee, nt_acl_type, acc,
-                                       SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY);
                }
 
-               /* The User must have access to a profile share - even if we can't map the SID. */
-               if (lp_profile_acls(SNUM(fsp->conn))) {
-                       SEC_ACCESS acc;
-                       
-                       init_sec_access(&acc,FILE_GENERIC_ALL);
-                       init_sec_ace(&nt_ace_list[num_aces++], &global_sid_Builtin_Users, SEC_ACE_TYPE_ACCESS_ALLOWED, acc,
-                                       SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|
-                                       SEC_ACE_FLAG_INHERIT_ONLY);
+               if (num_aces) {
+                       if((psa = make_sec_acl( main_loop_talloc_get(), NT4_ACL_REVISION, num_aces, nt_ace_list)) == NULL) {
+                               DEBUG(0,("get_nt_acl: Unable to malloc space for acl.\n"));
+                               goto done;
+                       }
                }
+       } /* security_info & DACL_SECURITY_INFORMATION */
 
-               /*
-                * Merge POSIX default ACLs and normal ACLs into one NT ACE.
-                * Win2K needs this to get the inheritance correct when replacing ACLs
-                * on a directory tree. Based on work by Jim @ IBM.
-                */
-
-               num_aces = merge_default_aces(nt_ace_list, num_aces);
-
-               /*
-                * Sort to force deny entries to the front.
-                */
+       psd = make_standard_sec_desc( main_loop_talloc_get(),
+                       (security_info & OWNER_SECURITY_INFORMATION) ? &owner_sid : NULL,
+                       (security_info & GROUP_SECURITY_INFORMATION) ? &group_sid : NULL,
+                       psa,
+                       &sd_size);
 
-               if (num_aces)
-                       qsort( nt_ace_list, num_aces, sizeof(nt_ace_list[0]), QSORT_CAST nt_ace_comp);
+       if(!psd) {
+               DEBUG(0,("get_nt_acl: Unable to malloc space for security descriptor.\n"));
+               sd_size = 0;
+               goto done;
        }
 
-       if (num_aces) {
-               if((psa = make_sec_acl( main_loop_talloc_get(), ACL_REVISION, num_aces, nt_ace_list)) == NULL) {
-                       DEBUG(0,("get_nt_acl: Unable to malloc space for acl.\n"));
-                       goto done;
-               }
+       /*
+        * Windows 2000: The DACL_PROTECTED flag in the security
+        * descriptor marks the ACL as non-inheriting, i.e., no
+        * ACEs from higher level directories propagate to this
+        * ACL. In the POSIX ACL model permissions are only
+        * inherited at file create time, so ACLs never contain
+        * any ACEs that are inherited dynamically. The DACL_PROTECTED
+        * flag doesn't seem to bother Windows NT.
+        * Always set this if map acl inherit is turned off.
+        */
+       if (get_protected_flag(pal) || !lp_map_acl_inherit(SNUM(conn))) {
+               psd->type |= SE_DESC_DACL_PROTECTED;
        }
 
-       *ppdesc = make_standard_sec_desc( main_loop_talloc_get(), &owner_sid, &group_sid, psa, &sd_size);
-
-       if(!*ppdesc) {
-               DEBUG(0,("get_nt_acl: Unable to malloc space for security descriptor.\n"));
-               sd_size = 0;
-       } else {
-               /*
-                * Windows 2000: The DACL_PROTECTED flag in the security
-                * descriptor marks the ACL as non-inheriting, i.e., no
-                * ACEs from higher level directories propagate to this
-                * ACL. In the POSIX ACL model permissions are only
-                * inherited at file create time, so ACLs never contain
-                * any ACEs that are inherited dynamically. The DACL_PROTECTED
-                * flag doesn't seem to bother Windows NT.
-                */
-               (*ppdesc)->type |= SE_DESC_DACL_PROTECTED;
+       if (psd->dacl) {
+               dacl_sort_into_canonical_order(psd->dacl->ace, (unsigned int)psd->dacl->num_aces);
        }
 
+       *ppdesc = psd;
+
  done:
 
-       if (posix_acl)
-               conn->vfs_ops.sys_acl_free_acl(conn, posix_acl);
-       if (dir_acl)
-               conn->vfs_ops.sys_acl_free_acl(conn, dir_acl);
+       if (posix_acl) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
+       }
+       if (def_acl) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
+       }
        free_canon_ace_list(file_ace);
        free_canon_ace_list(dir_ace);
+       free_inherited_info(pal);
        SAFE_FREE(nt_ace_list);
 
        return sd_size;
@@ -2493,41 +2991,71 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
  Try to chown a file. We will be able to chown it under the following conditions.
 
   1) If we have root privileges, then it will just work.
-  2) If we have write permission to the file and dos_filemodes is set
+  2) If we have SeTakeOwnershipPrivilege we can change the user to the current user.
+  3) If we have SeRestorePrivilege we can change the user to any other user. 
+  4) If we have write permission to the file and dos_filemodes is set
      then allow chown to the currently authenticated user.
 ****************************************************************************/
 
 static int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid)
 {
        int ret;
-       extern struct current_user current_user;
        files_struct *fsp;
        SMB_STRUCT_STAT st;
 
+       if(!CAN_WRITE(conn)) {
+               return -1;
+       }
+
+       /* Case (1). */
        /* try the direct way first */
-       ret = vfs_chown(conn, fname, uid, gid);
+       ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
        if (ret == 0)
                return 0;
 
-       if(!CAN_WRITE(conn) || !lp_dos_filemode(SNUM(conn)))
+       /* Case (2) / (3) */
+       if (lp_enable_privileges()) {
+
+               BOOL has_take_ownership_priv = user_has_privileges(current_user.nt_user_token,
+                                                             &se_take_ownership);
+               BOOL has_restore_priv = user_has_privileges(current_user.nt_user_token,
+                                                      &se_restore);
+
+               /* Case (2) */
+               if ( ( has_take_ownership_priv && ( uid == current_user.ut.uid ) ) ||
+               /* Case (3) */
+                    ( has_restore_priv ) ) {
+
+                       become_root();
+                       /* Keep the current file gid the same - take ownership doesn't imply group change. */
+                       ret = SMB_VFS_CHOWN(conn, fname, uid, (gid_t)-1);
+                       unbecome_root();
+                       return ret;
+               }
+       }
+
+       /* Case (4). */
+       if (!lp_dos_filemode(SNUM(conn))) {
                return -1;
+       }
 
-       if (vfs_stat(conn,fname,&st))
+       if (SMB_VFS_STAT(conn,fname,&st)) {
                return -1;
+       }
 
-       fsp = open_file_fchmod(conn,fname,&st);
-       if (!fsp)
+       if (!NT_STATUS_IS_OK(open_file_fchmod(conn,fname,&st,&fsp))) {
                return -1;
+       }
 
        /* only allow chown to the current user. This is more secure,
           and also copes with the case where the SID in a take ownership ACL is
           a local SID on the users workstation 
        */
-       uid = current_user.uid;
+       uid = current_user.ut.uid;
 
        become_root();
        /* Keep the current file gid the same. */
-       ret = vfswrap_fchown(fsp, fsp->fd, uid, (gid_t)-1);
+       ret = SMB_VFS_FCHOWN(fsp, fsp->fh->fd, uid, (gid_t)-1);
        unbecome_root();
 
        close_file_fchmod(fsp);
@@ -2556,7 +3084,6 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
        uid_t orig_uid;
        gid_t orig_gid;
        BOOL need_chown = False;
-       extern struct current_user current_user;
 
        DEBUG(10,("set_nt_acl: called for file %s\n", fsp->fsp_name ));
 
@@ -2569,11 +3096,11 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
         * Get the current state of the file.
         */
 
-       if(fsp->is_directory || fsp->fd == -1) {
-               if(vfs_stat(fsp->conn,fsp->fsp_name, &sbuf) != 0)
+       if(fsp->is_directory || fsp->fh->fd == -1) {
+               if(SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf) != 0)
                        return False;
        } else {
-               if(vfs_fstat(fsp,fsp->fd,&sbuf) != 0)
+               if(SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) != 0)
                        return False;
        }
 
@@ -2586,15 +3113,17 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
         * Unpack the user/group/world id's.
         */
 
-       if (!unpack_nt_owners( &sbuf, &user, &grp, security_info_sent, psd))
+       if (!unpack_nt_owners( SNUM(conn), &sbuf, &user, &grp, security_info_sent, psd)) {
                return False;
+       }
 
        /*
         * Do we need to chown ?
         */
 
-       if (((user != (uid_t)-1) && (orig_uid != user)) || (( grp != (uid_t)-1) && (orig_gid != grp)))
+       if (((user != (uid_t)-1) && (orig_uid != user)) || (( grp != (gid_t)-1) && (orig_gid != grp))) {
                need_chown = True;
+       }
 
        /*
         * Chown before setting ACL only if we don't change the user, or
@@ -2602,7 +3131,7 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
         * the file.
         */
 
-       if (need_chown && (user == (uid_t)-1 || user == current_user.uid)) {
+       if (need_chown && (user == (uid_t)-1 || user == current_user.ut.uid)) {
 
                DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
                                fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
@@ -2619,17 +3148,17 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
                 */
 
                if(fsp->is_directory) {
-                       if(vfs_stat(fsp->conn, fsp->fsp_name, &sbuf) != 0) {
+                       if(SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf) != 0) {
                                return False;
                        }
                } else {
 
                        int ret;
     
-                       if(fsp->fd == -1)
-                               ret = vfs_stat(fsp->conn, fsp->fsp_name, &sbuf);
+                       if(fsp->fh->fd == -1)
+                               ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
                        else
-                               ret = vfs_fstat(fsp,fsp->fd,&sbuf);
+                               ret = SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf);
   
                        if(ret != 0)
                                return False;
@@ -2647,7 +3176,7 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
        create_file_sids(&sbuf, &file_owner_sid, &file_grp_sid);
 
        acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
-                                                                       &file_ace_list, &dir_ace_list, security_info_sent, psd);
+                                       &file_ace_list, &dir_ace_list, security_info_sent, psd);
 
        /* Ignore W2K traverse DACL set. */
        if (file_ace_list || dir_ace_list) {
@@ -2674,7 +3203,7 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
                         */
 
                        if (acl_perms && file_ace_list) {
-                               ret = set_canon_ace_list(fsp, file_ace_list, False, &acl_set_support);
+                               ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf.st_gid, &acl_set_support);
                                if (acl_set_support && ret == False) {
                                        DEBUG(3,("set_nt_acl: failed to set file acl on file %s (%s).\n", fsp->fsp_name, strerror(errno) ));
                                        free_canon_ace_list(file_ace_list);
@@ -2685,7 +3214,7 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 
                        if (acl_perms && acl_set_support && fsp->is_directory) {
                                if (dir_ace_list) {
-                                       if (!set_canon_ace_list(fsp, dir_ace_list, True, &acl_set_support)) {
+                                       if (!set_canon_ace_list(fsp, dir_ace_list, True, sbuf.st_gid, &acl_set_support)) {
                                                DEBUG(3,("set_nt_acl: failed to set default acl on directory %s (%s).\n", fsp->fsp_name, strerror(errno) ));
                                                free_canon_ace_list(file_ace_list);
                                                free_canon_ace_list(dir_ace_list); 
@@ -2697,15 +3226,34 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
                                         * No default ACL - delete one if it exists.
                                         */
 
-                                       if (conn->vfs_ops.sys_acl_delete_def_file(conn, fsp->fsp_name) == -1) {
-                                               DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
-                                               free_canon_ace_list(file_ace_list);
-                                               free_canon_ace_list(dir_ace_list);
-                                               return False;
+                                       if (SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name) == -1) {
+                                               int sret = -1;
+
+                                               if (acl_group_override(conn, sbuf.st_gid)) {
+                                                       DEBUG(5,("set_nt_acl: acl group control on and "
+                                                               "current user in file %s primary group. Override delete_def_acl\n",
+                                                               fsp->fsp_name ));
+
+                                                       become_root();
+                                                       sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
+                                                       unbecome_root();
+                                               }
+
+                                               if (sret == -1) {
+                                                       DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
+                                                       free_canon_ace_list(file_ace_list);
+                                                       free_canon_ace_list(dir_ace_list);
+                                                       return False;
+                                               }
                                        }
                                }
                        }
 
+                       if (acl_set_support) {
+                               store_inheritance_attributes(fsp, file_ace_list, dir_ace_list,
+                                               (psd->type & SE_DESC_DACL_PROTECTED) ? True : False);
+                       }
+
                        /*
                         * If we cannot set using POSIX ACLs we fall back to checking if we need to chmod.
                         */
@@ -2726,12 +3274,25 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
                                        DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
                                                fsp->fsp_name, (unsigned int)posix_perms ));
 
-                                       if(conn->vfs_ops.chmod(conn,fsp->fsp_name, posix_perms) == -1) {
-                                               DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
+                                       if(SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms) == -1) {
+                                               int sret = -1;
+                                               if (acl_group_override(conn, sbuf.st_gid)) {
+                                                       DEBUG(5,("set_nt_acl: acl group control on and "
+                                                               "current user in file %s primary group. Override chmod\n",
+                                                               fsp->fsp_name ));
+
+                                                       become_root();
+                                                       sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
+                                                       unbecome_root();
+                                               }
+
+                                               if (sret == -1) {
+                                                       DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
                                                                fsp->fsp_name, (unsigned int)posix_perms, strerror(errno) ));
-                                               free_canon_ace_list(file_ace_list);
-                                               free_canon_ace_list(dir_ace_list);
-                                               return False;
+                                                       free_canon_ace_list(file_ace_list);
+                                                       free_canon_ace_list(dir_ace_list);
+                                                       return False;
+                                               }
                                        }
                                }
                        }
@@ -2757,6 +3318,51 @@ BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
        return True;
 }
 
+/****************************************************************************
+ Get the actual group bits stored on a file with an ACL. Has no effect if
+ the file has no ACL. Needed in dosmode code where the stat() will return
+ the mask bits, not the real group bits, for a file with an ACL.
+****************************************************************************/
+
+int get_acl_group_bits( connection_struct *conn, const char *fname, mode_t *mode )
+{
+       int entry_id = SMB_ACL_FIRST_ENTRY;
+       SMB_ACL_ENTRY_T entry;
+       SMB_ACL_T posix_acl;
+       int result = -1;
+
+       posix_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, fname, SMB_ACL_TYPE_ACCESS);
+       if (posix_acl == (SMB_ACL_T)NULL)
+               return -1;
+
+       while (SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1) {
+               SMB_ACL_TAG_T tagtype;
+               SMB_ACL_PERMSET_T permset;
+
+               /* get_next... */
+               if (entry_id == SMB_ACL_FIRST_ENTRY)
+                       entry_id = SMB_ACL_NEXT_ENTRY;
+
+               if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) ==-1)
+                       break;
+
+               if (tagtype == SMB_ACL_GROUP_OBJ) {
+                       if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry, &permset) == -1) {
+                               break;
+                       } else {
+                               *mode &= ~(S_IRGRP|S_IWGRP|S_IXGRP);
+                               *mode |= (SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_READ) ? S_IRGRP : 0);
+                               *mode |= (SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_WRITE) ? S_IWGRP : 0);
+                               *mode |= (SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_EXECUTE) ? S_IXGRP : 0);
+                               result = 0;
+                               break;
+                       }
+               }
+       }
+       SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
+       return result;
+}
+
 /****************************************************************************
  Do a chmod by setting the ACL USER_OBJ, GROUP_OBJ and OTHER bits in an ACL
  and set the mask to rwx. Needed to preserve complex ACLs set by NT.
@@ -2768,7 +3374,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo
        SMB_ACL_ENTRY_T entry;
        int num_entries = 0;
 
-       while ( conn->vfs_ops.sys_acl_get_entry(conn, posix_acl, entry_id, &entry) == 1) {
+       while ( SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1) {
                SMB_ACL_TAG_T tagtype;
                SMB_ACL_PERMSET_T permset;
                mode_t perms;
@@ -2777,10 +3383,10 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo
                if (entry_id == SMB_ACL_FIRST_ENTRY)
                        entry_id = SMB_ACL_NEXT_ENTRY;
 
-               if (conn->vfs_ops.sys_acl_get_tag_type(conn, entry, &tagtype) == -1)
+               if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1)
                        return -1;
 
-               if (conn->vfs_ops.sys_acl_get_permset(conn, entry, &permset) == -1)
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry, &permset) == -1)
                        return -1;
 
                num_entries++;
@@ -2811,7 +3417,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo
                if (map_acl_perms_to_permset(conn, perms, &permset) == -1)
                        return -1;
 
-               if (conn->vfs_ops.sys_acl_set_permset(conn, entry, permset) == -1)
+               if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, entry, permset) == -1)
                        return -1;
        }
 
@@ -2837,17 +3443,17 @@ static int copy_access_acl(connection_struct *conn, const char *from, const char
        SMB_ACL_T posix_acl = NULL;
        int ret = -1;
 
-       if ((posix_acl = conn->vfs_ops.sys_acl_get_file(conn, from, SMB_ACL_TYPE_ACCESS)) == NULL)
+       if ((posix_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, from, SMB_ACL_TYPE_ACCESS)) == NULL)
                return -1;
 
        if ((ret = chmod_acl_internals(conn, posix_acl, mode)) == -1)
                goto done;
 
-       ret = conn->vfs_ops.sys_acl_set_file(conn, to, SMB_ACL_TYPE_ACCESS, posix_acl);
+       ret = SMB_VFS_SYS_ACL_SET_FILE(conn, to, SMB_ACL_TYPE_ACCESS, posix_acl);
 
  done:
 
-       conn->vfs_ops.sys_acl_free_acl(conn, posix_acl);
+       SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
        return ret;
 }
 
@@ -2889,17 +3495,17 @@ int fchmod_acl(files_struct *fsp, int fd, mode_t mode)
        SMB_ACL_T posix_acl = NULL;
        int ret = -1;
 
-       if ((posix_acl = conn->vfs_ops.sys_acl_get_fd(fsp, fd)) == NULL)
+       if ((posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fd)) == NULL)
                return -1;
 
        if ((ret = chmod_acl_internals(conn, posix_acl, mode)) == -1)
                goto done;
 
-       ret = conn->vfs_ops.sys_acl_set_fd(fsp, fd, posix_acl);
+       ret = SMB_VFS_SYS_ACL_SET_FD(fsp, fd, posix_acl);
 
   done:
 
-       conn->vfs_ops.sys_acl_free_acl(conn, posix_acl);
+       SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
        return ret;
 }
 
@@ -2909,14 +3515,768 @@ int fchmod_acl(files_struct *fsp, int fd, mode_t mode)
 
 BOOL directory_has_default_acl(connection_struct *conn, const char *fname)
 {
-        SMB_ACL_T dir_acl = conn->vfs_ops.sys_acl_get_file( conn, fname, SMB_ACL_TYPE_DEFAULT);
-        BOOL has_acl = False;
-        SMB_ACL_ENTRY_T entry;
+       SMB_ACL_T def_acl = SMB_VFS_SYS_ACL_GET_FILE( conn, fname, SMB_ACL_TYPE_DEFAULT);
+       BOOL has_acl = False;
+       SMB_ACL_ENTRY_T entry;
 
-        if (dir_acl != NULL && (conn->vfs_ops.sys_acl_get_entry(conn, dir_acl, SMB_ACL_FIRST_ENTRY, &entry) == 1))
-                has_acl = True;
+       if (def_acl != NULL && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, def_acl, SMB_ACL_FIRST_ENTRY, &entry) == 1)) {
+               has_acl = True;
+       }
 
-       if (dir_acl)
-               conn->vfs_ops.sys_acl_free_acl(conn, dir_acl);
+       if (def_acl) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
+       }
         return has_acl;
 }
+
+/****************************************************************************
+ Map from wire type to permset.
+****************************************************************************/
+
+static BOOL unix_ex_wire_to_permset(connection_struct *conn, unsigned char wire_perm, SMB_ACL_PERMSET_T *p_permset)
+{
+       if (wire_perm & ~(SMB_POSIX_ACL_READ|SMB_POSIX_ACL_WRITE|SMB_POSIX_ACL_EXECUTE)) {
+               return False;
+       }
+
+       if (SMB_VFS_SYS_ACL_CLEAR_PERMS(conn, *p_permset) ==  -1) {
+               return False;
+       }
+
+       if (wire_perm & SMB_POSIX_ACL_READ) {
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_READ) == -1) {
+                       return False;
+               }
+       }
+       if (wire_perm & SMB_POSIX_ACL_WRITE) {
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_WRITE) == -1) {
+                       return False;
+               }
+       }
+       if (wire_perm & SMB_POSIX_ACL_EXECUTE) {
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_EXECUTE) == -1) {
+                       return False;
+               }
+       }
+       return True;
+}
+
+/****************************************************************************
+ Map from wire type to tagtype.
+****************************************************************************/
+
+static BOOL unix_ex_wire_to_tagtype(unsigned char wire_tt, SMB_ACL_TAG_T *p_tt)
+{
+       switch (wire_tt) {
+               case SMB_POSIX_ACL_USER_OBJ:
+                       *p_tt = SMB_ACL_USER_OBJ;
+                       break;
+               case SMB_POSIX_ACL_USER:
+                       *p_tt = SMB_ACL_USER;
+                       break;
+               case SMB_POSIX_ACL_GROUP_OBJ:
+                       *p_tt = SMB_ACL_GROUP_OBJ;
+                       break;
+               case SMB_POSIX_ACL_GROUP:
+                       *p_tt = SMB_ACL_GROUP;
+                       break;
+               case SMB_POSIX_ACL_MASK:
+                       *p_tt = SMB_ACL_MASK;
+                       break;
+               case SMB_POSIX_ACL_OTHER:
+                       *p_tt = SMB_ACL_OTHER;
+                       break;
+               default:
+                       return False;
+       }
+       return True;
+}
+
+/****************************************************************************
+ Create a new POSIX acl from wire permissions.
+ FIXME ! How does the share mask/mode fit into this.... ?
+****************************************************************************/
+
+static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn, uint16 num_acls, const char *pdata)
+{
+       unsigned int i;
+       SMB_ACL_T the_acl = SMB_VFS_SYS_ACL_INIT(conn, num_acls);
+
+       if (the_acl == NULL) {
+               return NULL;
+       }
+
+       for (i = 0; i < num_acls; i++) {
+               SMB_ACL_ENTRY_T the_entry;
+               SMB_ACL_PERMSET_T the_permset;
+               SMB_ACL_TAG_T tag_type;
+
+               if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &the_acl, &the_entry) == -1) {
+                       DEBUG(0,("create_posix_acl_from_wire: Failed to create entry %u. (%s)\n",
+                               i, strerror(errno) ));
+                       goto fail;
+               }
+
+               if (!unix_ex_wire_to_tagtype(CVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)), &tag_type)) {
+                       DEBUG(0,("create_posix_acl_from_wire: invalid wire tagtype %u on entry %u.\n",
+                               CVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)), i ));
+                       goto fail;
+               }
+
+               if (SMB_VFS_SYS_ACL_SET_TAG_TYPE(conn, the_entry, tag_type) == -1) {
+                       DEBUG(0,("create_posix_acl_from_wire: Failed to set tagtype on entry %u. (%s)\n",
+                               i, strerror(errno) ));
+                       goto fail;
+               }
+
+               /* Get the permset pointer from the new ACL entry. */
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, the_entry, &the_permset) == -1) {
+                       DEBUG(0,("create_posix_acl_from_wire: Failed to get permset on entry %u. (%s)\n",
+                                i, strerror(errno) ));
+                        goto fail;
+                }
+
+               /* Map from wire to permissions. */
+               if (!unix_ex_wire_to_permset(conn, CVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)+1), &the_permset)) {
+                       DEBUG(0,("create_posix_acl_from_wire: invalid permset %u on entry %u.\n",
+                               CVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE) + 1), i ));
+                       goto fail;
+               }
+
+               /* Now apply to the new ACL entry. */
+               if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, the_entry, the_permset) == -1) {
+                       DEBUG(0,("create_posix_acl_from_wire: Failed to add permset on entry %u. (%s)\n",
+                               i, strerror(errno) ));
+                       goto fail;
+               }
+
+               if (tag_type == SMB_ACL_USER) {
+                       uint32 uidval = IVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)+2);
+                       uid_t uid = (uid_t)uidval;
+                       if (SMB_VFS_SYS_ACL_SET_QUALIFIER(conn, the_entry,(void *)&uid) == -1) {
+                               DEBUG(0,("create_posix_acl_from_wire: Failed to set uid %u on entry %u. (%s)\n",
+                                       (unsigned int)uid, i, strerror(errno) ));
+                               goto fail;
+                       }
+               }
+
+               if (tag_type == SMB_ACL_GROUP) {
+                       uint32 gidval = IVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)+2);
+                       gid_t gid = (uid_t)gidval;
+                       if (SMB_VFS_SYS_ACL_SET_QUALIFIER(conn, the_entry,(void *)&gid) == -1) {
+                               DEBUG(0,("create_posix_acl_from_wire: Failed to set gid %u on entry %u. (%s)\n",
+                                       (unsigned int)gid, i, strerror(errno) ));
+                               goto fail;
+                       }
+               }
+       }
+
+       return the_acl;
+
+ fail:
+
+       if (the_acl != NULL) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, the_acl);
+       }
+       return NULL;
+}
+
+/****************************************************************************
+ Calls from UNIX extensions - Default POSIX ACL set.
+ If num_def_acls == 0 and not a directory just return. If it is a directory
+ and num_def_acls == 0 then remove the default acl. Else set the default acl
+ on the directory.
+****************************************************************************/
+
+BOOL set_unix_posix_default_acl(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf,
+                               uint16 num_def_acls, const char *pdata)
+{
+       SMB_ACL_T def_acl = NULL;
+
+       if (num_def_acls && !S_ISDIR(psbuf->st_mode)) {
+               DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
+               errno = EISDIR;
+               return False;
+       }
+
+       if (!num_def_acls) {
+               /* Remove the default ACL. */
+               if (SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fname) == -1) {
+                       DEBUG(5,("set_unix_posix_default_acl: acl_delete_def_file failed on directory %s (%s)\n",
+                               fname, strerror(errno) ));
+                       return False;
+               }
+               return True;
+       }
+
+       if ((def_acl = create_posix_acl_from_wire(conn, num_def_acls, pdata)) == NULL) {
+               return False;
+       }
+
+       if (SMB_VFS_SYS_ACL_SET_FILE(conn, fname, SMB_ACL_TYPE_DEFAULT, def_acl) == -1) {
+               DEBUG(5,("set_unix_posix_default_acl: acl_set_file failed on directory %s (%s)\n",
+                       fname, strerror(errno) ));
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
+               return False;
+       }
+
+       DEBUG(10,("set_unix_posix_default_acl: set default acl for file %s\n", fname ));
+       SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
+       return True;
+}
+
+/****************************************************************************
+ Remove an ACL from a file. As we don't have acl_delete_entry() available
+ we must read the current acl and copy all entries except MASK, USER and GROUP
+ to a new acl, then set that. This (at least on Linux) causes any ACL to be
+ removed.
+ FIXME ! How does the share mask/mode fit into this.... ?
+****************************************************************************/
+
+static BOOL remove_posix_acl(connection_struct *conn, files_struct *fsp, const char *fname)
+{
+       SMB_ACL_T file_acl = NULL;
+       int entry_id = SMB_ACL_FIRST_ENTRY;
+       SMB_ACL_ENTRY_T entry;
+       BOOL ret = False;
+       /* Create a new ACL with only 3 entries, u/g/w. */
+       SMB_ACL_T new_file_acl = SMB_VFS_SYS_ACL_INIT(conn, 3);
+       SMB_ACL_ENTRY_T user_ent = NULL;
+       SMB_ACL_ENTRY_T group_ent = NULL;
+       SMB_ACL_ENTRY_T other_ent = NULL;
+
+       if (new_file_acl == NULL) {
+               DEBUG(5,("remove_posix_acl: failed to init new ACL with 3 entries for file %s.\n", fname));
+               return False;
+       }
+
+       /* Now create the u/g/w entries. */
+       if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &new_file_acl, &user_ent) == -1) {
+               DEBUG(5,("remove_posix_acl: Failed to create user entry for file %s. (%s)\n",
+                       fname, strerror(errno) ));
+               goto done;
+       }
+       if (SMB_VFS_SYS_ACL_SET_TAG_TYPE(conn, user_ent, SMB_ACL_USER_OBJ) == -1) {
+               DEBUG(5,("remove_posix_acl: Failed to set user entry for file %s. (%s)\n",
+                       fname, strerror(errno) ));
+               goto done;
+       }
+
+       if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &new_file_acl, &group_ent) == -1) {
+               DEBUG(5,("remove_posix_acl: Failed to create group entry for file %s. (%s)\n",
+                       fname, strerror(errno) ));
+               goto done;
+       }
+       if (SMB_VFS_SYS_ACL_SET_TAG_TYPE(conn, group_ent, SMB_ACL_GROUP_OBJ) == -1) {
+               DEBUG(5,("remove_posix_acl: Failed to set group entry for file %s. (%s)\n",
+                       fname, strerror(errno) ));
+               goto done;
+       }
+
+       if (SMB_VFS_SYS_ACL_CREATE_ENTRY(conn, &new_file_acl, &other_ent) == -1) {
+               DEBUG(5,("remove_posix_acl: Failed to create other entry for file %s. (%s)\n",
+                       fname, strerror(errno) ));
+               goto done;
+       }
+       if (SMB_VFS_SYS_ACL_SET_TAG_TYPE(conn, other_ent, SMB_ACL_OTHER) == -1) {
+               DEBUG(5,("remove_posix_acl: Failed to set other entry for file %s. (%s)\n",
+                       fname, strerror(errno) ));
+               goto done;
+       }
+
+       /* Get the current file ACL. */
+       if (fsp && fsp->fh->fd != -1) {
+               file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fh->fd);
+       } else {
+               file_acl = SMB_VFS_SYS_ACL_GET_FILE( conn, fname, SMB_ACL_TYPE_ACCESS);
+       }
+
+       if (file_acl == NULL) {
+               /* This is only returned if an error occurred. Even for a file with
+                  no acl a u/g/w acl should be returned. */
+               DEBUG(5,("remove_posix_acl: failed to get ACL from file %s (%s).\n",
+                       fname, strerror(errno) ));
+               goto done;
+       }
+
+       while ( SMB_VFS_SYS_ACL_GET_ENTRY(conn, file_acl, entry_id, &entry) == 1) {
+               SMB_ACL_TAG_T tagtype;
+               SMB_ACL_PERMSET_T permset;
+
+               /* get_next... */
+               if (entry_id == SMB_ACL_FIRST_ENTRY)
+                       entry_id = SMB_ACL_NEXT_ENTRY;
+
+               if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1) {
+                       DEBUG(5,("remove_posix_acl: failed to get tagtype from ACL on file %s (%s).\n",
+                               fname, strerror(errno) ));
+                       goto done;
+               }
+
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry, &permset) == -1) {
+                       DEBUG(5,("remove_posix_acl: failed to get permset from ACL on file %s (%s).\n",
+                               fname, strerror(errno) ));
+                       goto done;
+               }
+
+               if (tagtype == SMB_ACL_USER_OBJ) {
+                       if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, user_ent, permset) == -1) {
+                               DEBUG(5,("remove_posix_acl: failed to set permset from ACL on file %s (%s).\n",
+                                       fname, strerror(errno) ));
+                       }
+               } else if (tagtype == SMB_ACL_GROUP_OBJ) {
+                       if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, group_ent, permset) == -1) {
+                               DEBUG(5,("remove_posix_acl: failed to set permset from ACL on file %s (%s).\n",
+                                       fname, strerror(errno) ));
+                       }
+               } else if (tagtype == SMB_ACL_OTHER) {
+                       if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, other_ent, permset) == -1) {
+                               DEBUG(5,("remove_posix_acl: failed to set permset from ACL on file %s (%s).\n",
+                                       fname, strerror(errno) ));
+                       }
+               }
+       }
+
+       /* Set the new empty file ACL. */
+       if (fsp && fsp->fh->fd != -1) {
+               if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, new_file_acl) == -1) {
+                       DEBUG(5,("remove_posix_acl: acl_set_file failed on %s (%s)\n",
+                               fname, strerror(errno) ));
+                       goto done;
+               }
+       } else {
+               if (SMB_VFS_SYS_ACL_SET_FILE(conn, fname, SMB_ACL_TYPE_ACCESS, new_file_acl) == -1) {
+                       DEBUG(5,("remove_posix_acl: acl_set_file failed on %s (%s)\n",
+                               fname, strerror(errno) ));
+                       goto done;
+               }
+       }
+
+       ret = True;
+
+ done:
+
+       if (file_acl) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
+       }
+       if (new_file_acl) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, new_file_acl);
+       }
+       return ret;
+}
+
+/****************************************************************************
+ Calls from UNIX extensions - POSIX ACL set.
+ If num_def_acls == 0 then read/modify/write acl after removing all entries
+ except SMB_ACL_USER_OBJ, SMB_ACL_GROUP_OBJ, SMB_ACL_OTHER.
+****************************************************************************/
+
+BOOL set_unix_posix_acl(connection_struct *conn, files_struct *fsp, const char *fname, uint16 num_acls, const char *pdata)
+{
+       SMB_ACL_T file_acl = NULL;
+
+       if (!num_acls) {
+               /* Remove the ACL from the file. */
+               return remove_posix_acl(conn, fsp, fname);
+       }
+
+       if ((file_acl = create_posix_acl_from_wire(conn, num_acls, pdata)) == NULL) {
+               return False;
+       }
+
+       if (fsp && fsp->fh->fd != -1) {
+               /* The preferred way - use an open fd. */
+               if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->fh->fd, file_acl) == -1) {
+                       DEBUG(5,("set_unix_posix_acl: acl_set_file failed on %s (%s)\n",
+                               fname, strerror(errno) ));
+                       SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
+                       return False;
+               }
+       } else {
+               if (SMB_VFS_SYS_ACL_SET_FILE(conn, fname, SMB_ACL_TYPE_ACCESS, file_acl) == -1) {
+                       DEBUG(5,("set_unix_posix_acl: acl_set_file failed on %s (%s)\n",
+                               fname, strerror(errno) ));
+                       SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
+                       return False;
+               }
+       }
+
+       DEBUG(10,("set_unix_posix_acl: set acl for file %s\n", fname ));
+       SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl);
+       return True;
+}
+
+/****************************************************************************
+ Check for POSIX group ACLs. If none use stat entry.
+ Return -1 if no match, 0 if match and denied, 1 if match and allowed.
+****************************************************************************/
+
+static int check_posix_acl_group_write(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf)
+{
+       SMB_ACL_T posix_acl = NULL;
+       int entry_id = SMB_ACL_FIRST_ENTRY;
+       SMB_ACL_ENTRY_T entry;
+       int i;
+       BOOL seen_mask = False;
+       BOOL seen_owning_group = False;
+       int ret = -1;
+       gid_t cu_gid;
+
+       if ((posix_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, fname, SMB_ACL_TYPE_ACCESS)) == NULL) {
+               goto check_stat;
+       }
+
+       /* First ensure the group mask allows group read. */
+       /* Also check any user entries (these take preference over group). */
+
+       while ( SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1) {
+               SMB_ACL_TAG_T tagtype;
+               SMB_ACL_PERMSET_T permset;
+               int have_write = -1;
+
+               /* get_next... */
+               if (entry_id == SMB_ACL_FIRST_ENTRY)
+                       entry_id = SMB_ACL_NEXT_ENTRY;
+
+               if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1) {
+                       goto check_stat;
+               }
+
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry, &permset) == -1) {
+                       goto check_stat;
+               }
+
+               have_write = SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_WRITE);
+               if (have_write == -1) {
+                       goto check_stat;
+               }
+
+               /*
+                * Solaris returns 2 for this if write is available.
+                * canonicalize to 0 or 1.
+                */     
+               have_write = (have_write ? 1 : 0);
+
+               switch(tagtype) {
+                       case SMB_ACL_MASK:
+                               seen_mask = True;
+                               if (!have_write) {
+                                       /* We don't have any group or explicit user write permission. */
+                                       ret = -1; /* Allow caller to check "other" permissions. */
+                                       DEBUG(10,("check_posix_acl_group_write: file %s \
+refusing write due to mask.\n", fname));
+                                       goto done;
+                               }
+                               break;
+                       case SMB_ACL_USER:
+                       {
+                               /* Check against current_user.ut.uid. */
+                               uid_t *puid = (uid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry);
+                               if (puid == NULL) {
+                                       goto check_stat;
+                               }
+                               if (current_user.ut.uid == *puid) {
+                                       /* We have a uid match but we must ensure we have seen the acl mask. */
+                                       ret = have_write;
+                                       DEBUG(10,("check_posix_acl_group_write: file %s \
+match on user %u -> %s.\n", fname, (unsigned int)*puid, ret ? "can write" : "cannot write"));
+                                       if (seen_mask) {
+                                               goto done;
+                                       }
+                               }
+                               break;
+                       }
+                       default:
+                               continue;
+               }
+       }
+
+       /* If ret is anything other than -1 we matched on a user entry. */
+       if (ret != -1) {
+               goto done;
+       }
+
+       /* Next check all group entries. */
+       entry_id = SMB_ACL_FIRST_ENTRY;
+       while ( SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1) {
+               SMB_ACL_TAG_T tagtype;
+               SMB_ACL_PERMSET_T permset;
+               int have_write = -1;
+
+               /* get_next... */
+               if (entry_id == SMB_ACL_FIRST_ENTRY)
+                       entry_id = SMB_ACL_NEXT_ENTRY;
+
+               if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1) {
+                       goto check_stat;
+               }
+
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry, &permset) == -1) {
+                       goto check_stat;
+               }
+
+               have_write = SMB_VFS_SYS_ACL_GET_PERM(conn, permset, SMB_ACL_WRITE);
+               if (have_write == -1) {
+                       goto check_stat;
+               }
+
+               /*
+                * Solaris returns 2 for this if write is available.
+                * canonicalize to 0 or 1.
+                */     
+               have_write = (have_write ? 1 : 0);
+
+               switch(tagtype) {
+                       case SMB_ACL_GROUP:
+                       case SMB_ACL_GROUP_OBJ:
+                       {
+                               gid_t *pgid = NULL;
+
+                               if (tagtype == SMB_ACL_GROUP) {
+                                       pgid = (gid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry);
+                               } else {
+                                       seen_owning_group = True;
+                                       pgid = &psbuf->st_gid;
+                               }
+                               if (pgid == NULL) {
+                                       goto check_stat;
+                               }
+
+                               /*
+                                * Does it match the current effective group
+                                * or supplementary groups ?
+                                */
+                               for (cu_gid = get_current_user_gid_first(&i); cu_gid != (gid_t)-1;
+                                                       cu_gid = get_current_user_gid_next(&i)) {
+                                       if (cu_gid == *pgid) {
+                                               ret = have_write;
+                                               DEBUG(10,("check_posix_acl_group_write: file %s \
+match on group %u -> can write.\n", fname, (unsigned int)cu_gid ));
+
+                                               /* If we don't have write permission this entry doesn't
+                                                       terminate the enumeration of the entries. */
+                                               if (have_write) {
+                                                       goto done;
+                                               }
+                                               /* But does terminate the group iteration. */
+                                               break;
+                                       }
+                               }
+                               break;
+                       }
+                       default:
+                               continue;
+               }
+       }
+
+       /* If ret is -1 here we didn't match on the user entry or
+          supplemental group entries. */
+       
+       DEBUG(10,("check_posix_acl_group_write: ret = %d before check_stat:\n", ret));
+
+  check_stat:
+
+       /*
+        * We only check the S_IWGRP permissions if we haven't already
+        * seen an owning group SMB_ACL_GROUP_OBJ ace entry. If there is an
+        * SMB_ACL_GROUP_OBJ ace entry then the group bits in st_gid are
+        * the same as the SMB_ACL_MASK bits, not the SMB_ACL_GROUP_OBJ
+        * bits. Thanks to Marc Cousin <mcousin@sigma.fr> for pointing
+        * this out. JRA.
+        */
+
+       if (!seen_owning_group) {
+               /* Do we match on the owning group entry ? */
+               /*
+                * Does it match the current effective group
+                * or supplementary groups ?
+                */
+               for (cu_gid = get_current_user_gid_first(&i); cu_gid != (gid_t)-1;
+                                               cu_gid = get_current_user_gid_next(&i)) {
+                       if (cu_gid == psbuf->st_gid) {
+                               ret = (psbuf->st_mode & S_IWGRP) ? 1 : 0;
+                               DEBUG(10,("check_posix_acl_group_write: file %s \
+match on owning group %u -> %s.\n", fname, (unsigned int)psbuf->st_gid, ret ? "can write" : "cannot write"));
+                               break;
+                       }
+               }
+
+               if (cu_gid == (gid_t)-1) {
+                       DEBUG(10,("check_posix_acl_group_write: file %s \
+failed to match on user or group in token (ret = %d).\n", fname, ret ));
+               }
+       }
+
+  done:
+
+       if (posix_acl) {
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
+       }
+
+       DEBUG(10,("check_posix_acl_group_write: file %s returning (ret = %d).\n", fname, ret ));
+       return ret;
+}
+
+/****************************************************************************
+ Actually emulate the in-kernel access checking for delete access. We need
+ this to successfully return ACCESS_DENIED on a file open for delete access.
+****************************************************************************/
+
+BOOL can_delete_file_in_directory(connection_struct *conn, const char *fname)
+{
+       SMB_STRUCT_STAT sbuf;  
+       pstring dname;
+       int ret;
+
+       if (!CAN_WRITE(conn)) {
+               return False;
+       }
+
+       /* Get the parent directory permission mask and owners. */
+       pstrcpy(dname, parent_dirname(fname));
+       if(SMB_VFS_STAT(conn, dname, &sbuf) != 0) {
+               return False;
+       }
+       if (!S_ISDIR(sbuf.st_mode)) {
+               return False;
+       }
+       if (current_user.ut.uid == 0 || conn->admin_user) {
+               /* I'm sorry sir, I didn't know you were root... */
+               return True;
+       }
+
+       /* Check primary owner write access. */
+       if (current_user.ut.uid == sbuf.st_uid) {
+               return (sbuf.st_mode & S_IWUSR) ? True : False;
+       }
+
+#ifdef S_ISVTX
+       /* sticky bit means delete only by owner or root. */
+       if (sbuf.st_mode & S_ISVTX) {
+               SMB_STRUCT_STAT sbuf_file;  
+               if(SMB_VFS_STAT(conn, fname, &sbuf_file) != 0) {
+                       return False;
+               }
+               /*
+                * Patch from SATOH Fumiyasu <fumiyas@miraclelinux.com>
+                * for bug #3348. Don't assume owning sticky bit
+                * directory means write access allowed.
+                */
+               if (current_user.ut.uid != sbuf_file.st_uid) {
+                       return False;
+               }
+       }
+#endif
+
+       /* Check group or explicit user acl entry write access. */
+       ret = check_posix_acl_group_write(conn, dname, &sbuf);
+       if (ret == 0 || ret == 1) {
+               return ret ? True : False;
+       }
+
+       /* Finally check other write access. */
+       return (sbuf.st_mode & S_IWOTH) ? True : False;
+}
+
+/****************************************************************************
+ Actually emulate the in-kernel access checking for write access. We need
+ this to successfully check for ability to write for dos filetimes.
+ Note this doesn't take into account share write permissions.
+****************************************************************************/
+
+BOOL can_write_to_file(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf)
+{
+       int ret;
+
+       if (current_user.ut.uid == 0 || conn->admin_user) {
+               /* I'm sorry sir, I didn't know you were root... */
+               return True;
+       }
+
+       if (!VALID_STAT(*psbuf)) {
+               /* Get the file permission mask and owners. */
+               if(SMB_VFS_STAT(conn, fname, psbuf) != 0) {
+                       return False;
+               }
+       }
+
+       /* Check primary owner write access. */
+       if (current_user.ut.uid == psbuf->st_uid) {
+               return (psbuf->st_mode & S_IWUSR) ? True : False;
+       }
+
+       /* Check group or explicit user acl entry write access. */
+       ret = check_posix_acl_group_write(conn, fname, psbuf);
+       if (ret == 0 || ret == 1) {
+               return ret ? True : False;
+       }
+
+       /* Finally check other write access. */
+       return (psbuf->st_mode & S_IWOTH) ? True : False;
+}
+
+/********************************************************************
+ Pull the NT ACL from a file on disk or the OpenEventlog() access
+ check.  Caller is responsible for freeing the returned security
+ descriptor via TALLOC_FREE().  This is designed for dealing with 
+ user space access checks in smbd outside of the VFS.  For example,
+ checking access rights in OpenEventlog().
+ Assume we are dealing with files (for now)
+********************************************************************/
+
+SEC_DESC* get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname)
+{
+       SEC_DESC *psd, *ret_sd;
+       connection_struct conn;
+       files_struct finfo;
+       struct fd_handle fh;
+       pstring path;
+       pstring filename;
+       
+       ZERO_STRUCT( conn );
+       
+       if ( !(conn.mem_ctx = talloc_init( "novfs_get_nt_acl" )) ) {
+               DEBUG(0,("get_nt_acl_no_snum: talloc() failed!\n"));
+               return NULL;
+       }
+
+       if (!(conn.params = TALLOC_P(conn.mem_ctx, struct share_params))) {
+               DEBUG(0,("get_nt_acl_no_snum: talloc() failed!\n"));
+               TALLOC_FREE(conn.mem_ctx);
+               return NULL;
+       }
+
+       conn.params->service = -1;
+       
+       pstrcpy( path, "/" );
+       set_conn_connectpath(&conn, path);
+       
+       if (!smbd_vfs_init(&conn)) {
+               DEBUG(0,("get_nt_acl_no_snum: Unable to create a fake connection struct!\n"));
+               conn_free_internal( &conn );
+               return NULL;
+        }
+       
+       ZERO_STRUCT( finfo );
+       ZERO_STRUCT( fh );
+       
+       finfo.fnum = -1;
+       finfo.conn = &conn;
+       finfo.fh = &fh;
+       finfo.fh->fd = -1;
+       pstrcpy( filename, fname );
+       finfo.fsp_name = filename;
+       
+       if (get_nt_acl( &finfo, DACL_SECURITY_INFORMATION, &psd ) == 0) {
+               DEBUG(0,("get_nt_acl_no_snum: get_nt_acl returned zero.\n"));
+               conn_free_internal( &conn );
+               return NULL;
+       }
+       
+       ret_sd = dup_sec_desc( ctx, psd );
+       
+       conn_free_internal( &conn );
+       
+       return ret_sd;
+}