trying to get HEAD building again. If you want the code
[kai/samba.git] / source3 / smbd / posix_acls.c
index b106975a863a706ab3f24af2c15023f999426f62..95b45fcc997b30c1a3500ec073c00975287356a7 100644 (file)
@@ -1,10 +1,8 @@
-#ifdef HAVE_POSIX_ACLS
-#define OLD_NTDOMAIN 1
 /*
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    SMB NT Security Descriptor / Unix permission conversion.
-   Copyright (C) Jeremy Allison 1994-2000
+   Copyright (C) Jeremy Allison 1994-2000.
+   Copyright (C) Andreas Gruenbacher 2002.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 
+/****************************************************************************
+ Data structures representing the internal ACE format.
+****************************************************************************/
+
+enum ace_owner {UID_ACE, GID_ACE, WORLD_ACE};
+enum ace_attribute {ALLOW_ACE, DENY_ACE}; /* Used for incoming NT ACLS. */
+
+typedef union posix_id {
+               uid_t uid;
+               gid_t gid;
+               int world;
+} posix_id;
+
 typedef struct canon_ace {
        struct canon_ace *next, *prev;
        SMB_ACL_TAG_T type;
-       SMB_ACL_PERMSET_T perms;
-       DOM_SID sid;
+       mode_t perms; /* Only use S_I(R|W|X)USR mode bits here. */
+       DOM_SID trustee;
+       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 SAMBA_POSIX_INHERITANCE_EA_NAME "user.SAMBA_PAI"
+
+#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 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 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 = 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,(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 = 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;
+               }
+       }
+
+       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;
+               }
+       }
+
+       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 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 (!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->fd != -1)
+                       SMB_VFS_FREMOVEXATTR(fsp, fsp->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, protected, &store_size);
+
+       if (fsp->fd != -1)
+               ret = SMB_VFS_FSETXATTR(fsp, fsp->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", protected ? " (protected)" : "", fsp->fsp_name));
+       if (ret == -1 && errno != ENOSYS)
+               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->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 = malloc(sizeof(struct pai_val));
+       if (!paiv)
+               return NULL;
+
+       memset(paiv, '\0', sizeof(struct pai_val));
+
+       paiv->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->protected ? " (protected)" : "", paiv->num_entries, paiv->num_def_entries ));
+
+       for (i = 0; i < paiv->num_entries; i++) {
+               struct pai_entry *paie;
+
+               paie = malloc(sizeof(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 = malloc(sizeof(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 = malloc(pai_buf_size)) == NULL)
+               return NULL;
+
+       do {
+               if (fsp->fd != -1)
+                       ret = SMB_VFS_FGETXATTR(fsp, fsp->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 = malloc(pai_buf_size)) == NULL)
+                               return NULL;
+               }
+       } while (ret == -1);
+
+       DEBUG(10,("load_inherited_info: ret = %d for file %s\n", 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->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.
+****************************************************************************/
+
+/****************************************************************************
+ Count a linked list of canonical ACE entries.
+****************************************************************************/
+
+static size_t count_canon_ace_list( canon_ace *list_head )
+{
+       size_t count = 0;
+       canon_ace *ace;
+
+       for (ace = list_head; ace; ace = ace->next)
+               count++;
+
+       return count;
+}
+
+/****************************************************************************
+ Free a linked list of canonical ACE entries.
+****************************************************************************/
+
+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);
+       }
+}
+
+/****************************************************************************
+ Function to duplicate a canon_ace entry.
+****************************************************************************/
+
+static canon_ace *dup_canon_ace( canon_ace *src_ace)
+{
+       canon_ace *dst_ace = (canon_ace *)malloc(sizeof(canon_ace));
+
+       if (dst_ace == NULL)
+               return NULL;
+
+       *dst_ace = *src_ace;
+       dst_ace->prev = dst_ace->next = NULL;
+       return dst_ace;
+}
+
+/****************************************************************************
+ Print out a canon ace.
+****************************************************************************/
+
+static void print_canon_ace(canon_ace *pace, int num)
+{
+       fstring str;
+
+       dbgtext( "canon_ace index %d. Type = %s ", num, pace->attr == ALLOW_ACE ? "allow" : "deny" );
+       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 );
+       } 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 );
+       } else
+               dbgtext( "other ");
+       switch (pace->type) {
+               case SMB_ACL_USER:
+                       dbgtext( "SMB_ACL_USER ");
+                       break;
+               case SMB_ACL_USER_OBJ:
+                       dbgtext( "SMB_ACL_USER_OBJ ");
+                       break;
+               case SMB_ACL_GROUP:
+                       dbgtext( "SMB_ACL_GROUP ");
+                       break;
+               case SMB_ACL_GROUP_OBJ:
+                       dbgtext( "SMB_ACL_GROUP_OBJ ");
+                       break;
+               case SMB_ACL_OTHER:
+                       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' : '-');
+       dbgtext( "%c\n", pace->perms & S_IXUSR ? 'x' : '-');
+}
+
+/****************************************************************************
+ Print out a canon ace list.
+****************************************************************************/
+
+static void print_canon_ace_list(const char *name, canon_ace *ace_list)
+{
+       int count = 0;
+
+       if( DEBUGLVL( 10 )) {
+               dbgtext( "print_canon_ace_list: %s\n", name );
+               for (;ace_list; ace_list = ace_list->next, count++)
+                       print_canon_ace(ace_list, count );
+       }
+}
+
+/****************************************************************************
+ Map POSIX ACL perms to canon_ace permissions (a mode_t containing only S_(R|W|X)USR bits).
+****************************************************************************/
+
+static mode_t convert_permset_to_mode_t(connection_struct *conn, SMB_ACL_PERMSET_T permset)
+{
+       mode_t ret = 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;
+}
+
+/****************************************************************************
+ Map generic UNIX permissions to canon_ace permissions (a mode_t containing only S_(R|W|X)USR bits).
+****************************************************************************/
+
+static mode_t unix_perms_to_acl_perms(mode_t mode, int r_mask, int w_mask, int x_mask)
+{
+       mode_t ret = 0;
+
+       if (mode & r_mask)
+               ret |= S_IRUSR;
+       if (mode & w_mask)
+               ret |= S_IWUSR;
+       if (mode & x_mask)
+               ret |= S_IXUSR;
+
+       return ret;
+}
+
+/****************************************************************************
+ Map canon_ace permissions (a mode_t containing only S_(R|W|X)USR bits) to
+ an SMB_ACL_PERMSET_T.
+****************************************************************************/
+
+static int map_acl_perms_to_permset(connection_struct *conn, mode_t mode, SMB_ACL_PERMSET_T *p_permset)
+{
+       if (SMB_VFS_SYS_ACL_CLEAR_PERMS(conn, *p_permset) ==  -1)
+               return -1;
+       if (mode & S_IRUSR) {
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_READ) == -1)
+                       return -1;
+       }
+       if (mode & S_IWUSR) {
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_WRITE) == -1)
+                       return -1;
+       }
+       if (mode & S_IXUSR) {
+               if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_EXECUTE) == -1)
+                       return -1;
+       }
+       return 0;
+}
+/****************************************************************************
+ Function to create owner and group SIDs from a SMB_STRUCT_STAT.
+****************************************************************************/
+
+static void create_file_sids(SMB_STRUCT_STAT *psbuf, DOM_SID *powner_sid, DOM_SID *pgroup_sid)
+{
+       uid_to_sid( powner_sid, psbuf->st_uid );
+       gid_to_sid( pgroup_sid, psbuf->st_gid );
+}
+
+/****************************************************************************
+ Merge aces with a common sid - if both are allow or deny, OR the permissions together and
+ delete the second one. If the first is deny, mask the permissions off and delete the allow
+ if the permissions become zero, delete the deny if the permissions are non zero.
+****************************************************************************/
+
+static void merge_aces( canon_ace **pp_list_head )
+{
+       canon_ace *list_head = *pp_list_head;
+       canon_ace *curr_ace_outer;
+       canon_ace *curr_ace_outer_next;
+
+       /*
+        * First, merge allow entries with identical SIDs, and deny entries
+        * with identical SIDs.
+        */
+
+       for (curr_ace_outer = list_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
+               canon_ace *curr_ace;
+               canon_ace *curr_ace_next;
+
+               curr_ace_outer_next = curr_ace_outer->next; /* Save the link in case we delete. */
+
+               for (curr_ace = curr_ace_outer->next; curr_ace; curr_ace = curr_ace_next) {
+
+                       curr_ace_next = curr_ace->next; /* Save the link in case of delete. */
+
+                       if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
+                               (curr_ace->attr == curr_ace_outer->attr)) {
+
+                               if( DEBUGLVL( 10 )) {
+                                       dbgtext("merge_aces: Merging ACE's\n");
+                                       print_canon_ace( curr_ace_outer, 0);
+                                       print_canon_ace( curr_ace, 0);
+                               }
+
+                               /* Merge two allow or two deny ACE's. */
+
+                               curr_ace_outer->perms |= curr_ace->perms;
+                               DLIST_REMOVE(list_head, curr_ace);
+                               SAFE_FREE(curr_ace);
+                               curr_ace_outer_next = curr_ace_outer->next; /* We may have deleted the link. */
+                       }
+               }
+       }
+
+       /*
+        * Now go through and mask off allow permissions with deny permissions.
+        * We can delete either the allow or deny here as we know that each SID
+        * appears only once in the list.
+        */
+
+       for (curr_ace_outer = list_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
+               canon_ace *curr_ace;
+               canon_ace *curr_ace_next;
+
+               curr_ace_outer_next = curr_ace_outer->next; /* Save the link in case we delete. */
+
+               for (curr_ace = curr_ace_outer->next; curr_ace; curr_ace = curr_ace_next) {
+
+                       curr_ace_next = curr_ace->next; /* Save the link in case of delete. */
+
+                       /*
+                        * Subtract ACE's with different entries. Due to the ordering constraints
+                        * we've put on the ACL, we know the deny must be the first one.
+                        */
+
+                       if (sid_equal(&curr_ace->trustee, &curr_ace_outer->trustee) &&
+                               (curr_ace_outer->attr == DENY_ACE) && (curr_ace->attr == ALLOW_ACE)) {
+
+                               if( DEBUGLVL( 10 )) {
+                                       dbgtext("merge_aces: Masking ACE's\n");
+                                       print_canon_ace( curr_ace_outer, 0);
+                                       print_canon_ace( curr_ace, 0);
+                               }
+
+                               curr_ace->perms &= ~curr_ace_outer->perms;
+
+                               if (curr_ace->perms == 0) {
+
+                                       /*
+                                        * The deny overrides the allow. Remove the allow.
+                                        */
+
+                                       DLIST_REMOVE(list_head, curr_ace);
+                                       SAFE_FREE(curr_ace);
+                                       curr_ace_outer_next = curr_ace_outer->next; /* We may have deleted the link. */
+
+                               } else {
+
+                                       /*
+                                        * Even after removing permissions, there
+                                        * are still allow permissions - delete the deny.
+                                        * It is safe to delete the deny here,
+                                        * as we are guarenteed by the deny first
+                                        * ordering that all the deny entries for
+                                        * this SID have already been merged into one
+                                        * before we can get to an allow ace.
+                                        */
+
+                                       DLIST_REMOVE(list_head, curr_ace_outer);
+                                       SAFE_FREE(curr_ace_outer);
+                                       break;
+                               }
+                       }
+
+               } /* end for curr_ace */
+       } /* end for curr_ace_outer */
+
+       /* We may have modified the list. */
+
+       *pp_list_head = list_head;
+}
+
+/****************************************************************************
+ Check if we need to return NT4.x compatible ACL entries.
+****************************************************************************/
+
+static BOOL nt4_compatible_acls(void)
+{
+       const char *compat = lp_acl_compatibility();
+
+       if (*compat == '\0') {
+               enum remote_arch_types ra_type = get_remote_arch();
+
+               /* Automatically adapt to client */
+               return (ra_type <= RA_WINNT);
+       } else
+               return (strequal(compat, "winnt"));
+}
+
+
+/****************************************************************************
+ Map canon_ace perms to permission bits NT.
+ The attr element is not used here - we only process deny entries on set,
+ 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)
+{
+       SEC_ACCESS sa;
+       uint32 nt_mask = 0;
+
+       *pacl_type = SEC_ACE_TYPE_ACCESS_ALLOWED;
+
+       if ((ace->perms & ALL_ACE_PERMS) == ALL_ACE_PERMS) {
+                       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
+                * they are perfectly legal with Windows 2000). If the ACE has empty
+                * permissions we cannot use 0, so we use the otherwise unused
+                * WRITE_OWNER permission, which we ignore when we set an ACL.
+                * We abstract this into a #define of UNIX_ACCESS_NONE to allow this
+                * to be changed in the future.
+                */
+
+               if (nt4_compatible_acls())
+                       nt_mask = UNIX_ACCESS_NONE;
+               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 );
+       }
+
+       DEBUG(10,("map_canon_ace_perms: Mapped (UNIX) %x to (NT) %x\n",
+                       (unsigned int)ace->perms, (unsigned int)nt_mask ));
+
+       init_sec_access(&sa,nt_mask);
+       return sa;
+}
+
+/****************************************************************************
+ Map NT perms to a UNIX mode_t.
+****************************************************************************/
+
+#define FILE_SPECIFIC_READ_BITS (FILE_READ_DATA|FILE_READ_EA|FILE_READ_ATTRIBUTES)
+#define FILE_SPECIFIC_WRITE_BITS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_EA|FILE_WRITE_ATTRIBUTES)
+#define FILE_SPECIFIC_EXECUTE_BITS (FILE_EXECUTE)
+
+static mode_t map_nt_perms( SEC_ACCESS sec_access, int type)
+{
+       mode_t mode = 0;
+
+       switch(type) {
+       case S_IRUSR:
+               if(sec_access.mask & GENERIC_ALL_ACCESS)
+                       mode = S_IRUSR|S_IWUSR|S_IXUSR;
+               else {
+                       mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IRUSR : 0;
+                       mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWUSR : 0;
+                       mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXUSR : 0;
+               }
+               break;
+       case S_IRGRP:
+               if(sec_access.mask & GENERIC_ALL_ACCESS)
+                       mode = S_IRGRP|S_IWGRP|S_IXGRP;
+               else {
+                       mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IRGRP : 0;
+                       mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWGRP : 0;
+                       mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXGRP : 0;
+               }
+               break;
+       case S_IROTH:
+               if(sec_access.mask & GENERIC_ALL_ACCESS)
+                       mode = S_IROTH|S_IWOTH|S_IXOTH;
+               else {
+                       mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IROTH : 0;
+                       mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWOTH : 0;
+                       mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXOTH : 0;
+               }
+               break;
+       }
+
+       return mode;
+}
+
+/****************************************************************************
+ 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)
+{
+       DOM_SID owner_sid;
+       DOM_SID grp_sid;
+
+       *puser = (uid_t)-1;
+       *pgrp = (gid_t)-1;
+
+       if(security_info_sent == 0) {
+               DEBUG(0,("unpack_nt_owners: no security info sent !\n"));
+               return True;
+       }
+
+       /*
+        * Validate the owner and group SID's.
+        */
+
+       memset(&owner_sid, '\0', sizeof(owner_sid));
+       memset(&grp_sid, '\0', sizeof(grp_sid));
+
+       DEBUG(5,("unpack_nt_owners: validating owner_sids.\n"));
+
+       /*
+        * Don't immediately fail if the owner sid cannot be validated.
+        * This may be a group chown only set.
+        */
+
+       if (security_info_sent & OWNER_SECURITY_INFORMATION) {
+               sid_copy(&owner_sid, psd->owner_sid);
+               if (!NT_STATUS_IS_OK(sid_to_uid(&owner_sid, puser))) {
+#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
+               }
+       }
+
+       /*
+        * Don't immediately fail if the group sid cannot be validated.
+        * This may be an owner chown only set.
+        */
+
+       if (security_info_sent & GROUP_SECURITY_INFORMATION) {
+               sid_copy(&grp_sid, psd->grp_sid);
+               if (!NT_STATUS_IS_OK(sid_to_gid( &grp_sid, pgrp))) {
+#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
+               }
+       }
+
+       DEBUG(5,("unpack_nt_owners: owner_sids validated.\n"));
+
+       return True;
+}
+
+/****************************************************************************
+ Ensure the enforced permissions for this share apply.
+****************************************************************************/
+
+static void apply_default_perms(files_struct *fsp, canon_ace *pace, mode_t type)
+{
+       int snum = SNUM(fsp->conn);
+       mode_t and_bits = (mode_t)0;
+       mode_t or_bits = (mode_t)0;
+
+       /* Get the initial bits to apply. */
+
+       if (fsp->is_directory) {
+               and_bits = lp_dir_security_mask(snum);
+               or_bits = lp_force_dir_security_mode(snum);
+       } else {
+               and_bits = lp_security_mask(snum);
+               or_bits = lp_force_security_mode(snum);
+       }
+
+       /* Now bounce them into the S_USR space. */     
+       switch(type) {
+       case S_IRUSR:
+               /* Ensure owner has read access. */
+               pace->perms |= S_IRUSR;
+               if (fsp->is_directory)
+                       pace->perms |= (S_IWUSR|S_IXUSR);
+               and_bits = unix_perms_to_acl_perms(and_bits, S_IRUSR, S_IWUSR, S_IXUSR);
+               or_bits = unix_perms_to_acl_perms(or_bits, S_IRUSR, S_IWUSR, S_IXUSR);
+               break;
+       case S_IRGRP:
+               and_bits = unix_perms_to_acl_perms(and_bits, S_IRGRP, S_IWGRP, S_IXGRP);
+               or_bits = unix_perms_to_acl_perms(or_bits, S_IRGRP, S_IWGRP, S_IXGRP);
+               break;
+       case S_IROTH:
+               and_bits = unix_perms_to_acl_perms(and_bits, S_IROTH, S_IWOTH, S_IXOTH);
+               or_bits = unix_perms_to_acl_perms(or_bits, S_IROTH, S_IWOTH, S_IXOTH);
+               break;
+       }
+
+       pace->perms = ((pace->perms & and_bits)|or_bits);
+}
+
 /****************************************************************************
- Function to create owner and group SIDs from a SMB_STRUCT_STAT.
+ Check if a given uid/SID is in a group gid/SID. This is probably very
+ expensive and will need optimisation. A *lot* of optimisation :-). JRA.
 ****************************************************************************/
 
-static void create_file_sids(SMB_STRUCT_STAT *psbuf, DOM_SID *powner_sid, DOM_SID *pgroup_sid)
+static BOOL uid_entry_in_group( canon_ace *uid_ace, canon_ace *group_ace )
 {
-       uid_to_sid( powner_sid, psbuf->st_uid );
-       gid_to_sid( pgroup_sid, psbuf->st_gid );
+       extern DOM_SID global_sid_World;
+       fstring u_name;
+       fstring g_name;
+       extern struct current_user current_user;
+
+       /* "Everyone" always matches every uid. */
+
+       if (sid_equal(&group_ace->trustee, &global_sid_World))
+               return True;
+
+       /* 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)
+               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);
 }
 
 /****************************************************************************
- Map canon_ace perms to NT.
+ A well formed POSIX file or default ACL has at least 3 entries, a 
+ SMB_ACL_USER_OBJ, SMB_ACL_GROUP_OBJ, SMB_ACL_OTHER_OBJ.
+ In addition, the owner must always have at least read access.
+ When using this call on get_acl, the pst struct is valid and contains
+ the mode of the file. When using this call on set_acl, the pst struct has
+ been modified to have a mode containing the default for this file or directory
+ type.
 ****************************************************************************/
 
-static SEC_ACCESS map_canon_ace_perms(int *pacl_type, DOM_SID *powner_sid, canon_ace *ace)
+static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
+                                                       files_struct *fsp,
+                                                       DOM_SID *pfile_owner_sid,
+                                                       DOM_SID *pfile_grp_sid,
+                                                       SMB_STRUCT_STAT *pst,
+                                                       BOOL setting_acl)
 {
-       SEC_ACCESS sa;
-       uint32 nt_mask = 0;
+       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;
 
-       *pacl_type = SEC_ACE_TYPE_ACCESS_ALLOWED;
+       for (pace = *pp_ace; pace; pace = pace->next) {
+               if (pace->type == SMB_ACL_USER_OBJ) {
+
+                       if (setting_acl)
+                               apply_default_perms(fsp, pace, S_IRUSR);
+                       got_user = True;
+
+               } else if (pace->type == SMB_ACL_GROUP_OBJ) {
+
+                       /*
+                        * Ensure create mask/force create mode is respected on set.
+                        */
+
+                       if (setting_acl)
+                               apply_default_perms(fsp, pace, S_IRGRP);
+                       got_grp = True;
+                       pace_group = pace;
+
+               } else if (pace->type == SMB_ACL_OTHER) {
+
+                       /*
+                        * Ensure create mask/force create mode is respected on set.
+                        */
+
+                       if (setting_acl)
+                               apply_default_perms(fsp, pace, S_IROTH);
+                       got_other = True;
+                       pace_other = pace;
+               }
+       }
+
+       if (!got_user) {
+               if ((pace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+                       DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
+                       return False;
+               }
+
+               ZERO_STRUCTP(pace);
+               pace->type = SMB_ACL_USER_OBJ;
+               pace->owner_type = UID_ACE;
+               pace->unix_ug.uid = pst->st_uid;
+               pace->trustee = *pfile_owner_sid;
+               pace->attr = ALLOW_ACE;
+
+               if (setting_acl) {
+                       /* If we only got an "everyone" perm, just use that. */
+                       if (!got_grp && 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);
+               } else {
+                       pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IRUSR, S_IWUSR, S_IXUSR);
+               }
+
+               DLIST_ADD(*pp_ace, pace);
+       }
+
+       if (!got_grp) {
+               if ((pace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+                       DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
+                       return False;
+               }
+
+               ZERO_STRUCTP(pace);
+               pace->type = SMB_ACL_GROUP_OBJ;
+               pace->owner_type = GID_ACE;
+               pace->unix_ug.uid = pst->st_gid;
+               pace->trustee = *pfile_grp_sid;
+               pace->attr = ALLOW_ACE;
+               if (setting_acl) {
+                       /* 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);
+               }
+
+               DLIST_ADD(*pp_ace, pace);
+       }
+
+       if (!got_other) {
+               if ((pace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+                       DEBUG(0,("ensure_canon_entry_valid: malloc fail.\n"));
+                       return False;
+               }
+
+               ZERO_STRUCTP(pace);
+               pace->type = SMB_ACL_OTHER;
+               pace->owner_type = WORLD_ACE;
+               pace->unix_ug.world = -1;
+               pace->trustee = global_sid_World;
+               pace->attr = ALLOW_ACE;
+               if (setting_acl) {
+                       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);
+
+               DLIST_ADD(*pp_ace, pace);
+       }
+
+       return True;
+}
+
+/****************************************************************************
+ Check if a POSIX ACL has the required SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ entries.
+ If it does not have them, check if there are any entries where the trustee is the
+ file owner or the owning group, and map these to SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ.
+****************************************************************************/
+
+static void check_owning_objs(canon_ace *ace, DOM_SID *pfile_owner_sid, DOM_SID *pfile_grp_sid)
+{
+       BOOL got_user_obj, got_group_obj;
+       canon_ace *current_ace;
+       int i, entries;
+
+       entries = count_canon_ace_list(ace);
+       got_user_obj = False;
+       got_group_obj = False;
+
+       for (i=0, current_ace = ace; i < entries; i++, current_ace = current_ace->next) {
+               if (current_ace->type == SMB_ACL_USER_OBJ)
+                       got_user_obj = True;
+               else if (current_ace->type == SMB_ACL_GROUP_OBJ)
+                       got_group_obj = True;
+       }
+       if (got_user_obj && got_group_obj) {
+               DEBUG(10,("check_owning_objs: ACL had owning user/group entries.\n"));
+               return;
+       }
+
+       for (i=0, current_ace = ace; i < entries; i++, current_ace = current_ace->next) {
+               if (!got_user_obj && current_ace->owner_type == UID_ACE &&
+                               sid_equal(&current_ace->trustee, pfile_owner_sid)) {
+                       current_ace->type = SMB_ACL_USER_OBJ;
+                       got_user_obj = True;
+               }
+               if (!got_group_obj && current_ace->owner_type == GID_ACE &&
+                               sid_equal(&current_ace->trustee, pfile_grp_sid)) {
+                       current_ace->type = SMB_ACL_GROUP_OBJ;
+                       got_group_obj = True;
+               }
+       }
+       if (!got_user_obj)
+               DEBUG(10,("check_owning_objs: ACL is missing an owner entry.\n"));
+       if (!got_group_obj)
+               DEBUG(10,("check_owning_objs: ACL is missing an owning group entry.\n"));
+}
+
+/****************************************************************************
+ Unpack a SEC_DESC into two canonical ace lists.
+****************************************************************************/
+
+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;
+       canon_ace *tmp_ace = NULL;
+       canon_ace *current_ace = NULL;
+       BOOL got_dir_allow = False;
+       BOOL got_file_allow = False;
+       int i, j;
+
+       *ppfile_ace = NULL;
+       *ppdir_ace = NULL;
+
+       /*
+        * Convert the incoming ACL into a more regular form.
+        */
+
+       for(i = 0; i < dacl->num_aces; i++) {
+               SEC_ACE *psa = &dacl->ace[i];
+
+               if((psa->type != SEC_ACE_TYPE_ACCESS_ALLOWED) && (psa->type != SEC_ACE_TYPE_ACCESS_DENIED)) {
+                       DEBUG(3,("create_canon_ace_lists: unable to set anything but an ALLOW or DENY ACE.\n"));
+                       return False;
+               }
+
+               if (nt4_compatible_acls()) {
+                       /*
+                        * The security mask may be UNIX_ACCESS_NONE which should map into
+                        * no permissions (we overload the WRITE_OWNER bit for this) or it
+                        * should be one of the ALL/EXECUTE/READ/WRITE bits. Arrange for this
+                        * to be so. Any other bits override the UNIX_ACCESS_NONE bit.
+                        */
+
+                       /*
+                        * Convert GENERIC bits to specific bits.
+                        */
+                       se_map_generic(&psa->info.mask, &file_generic_mapping);
+
+                       psa->info.mask &= (UNIX_ACCESS_NONE|FILE_ALL_ACCESS);
+
+                       if(psa->info.mask != UNIX_ACCESS_NONE)
+                               psa->info.mask &= ~UNIX_ACCESS_NONE;
+               }
+       }
+
+       /*
+        * Deal with the fact that NT 4.x re-writes the canonical format
+        * that we return for default ACLs. If a directory ACE is identical
+        * to a inherited directory ACE then NT changes the bits so that the
+        * first ACE is set to OI|IO and the second ACE for this SID is set
+        * to CI. We need to repair this. JRA.
+        */
+
+       for(i = 0; i < dacl->num_aces; i++) {
+               SEC_ACE *psa1 = &dacl->ace[i];
+
+               for (j = i + 1; j < dacl->num_aces; j++) {
+                       SEC_ACE *psa2 = &dacl->ace[j];
+
+                       if (psa1->info.mask != psa2->info.mask)
+                               continue;
+
+                       if (!sid_equal(&psa1->trustee, &psa2->trustee))
+                               continue;
+
+                       /*
+                        * Ok - permission bits and SIDs are equal.
+                        * Check if flags were re-written.
+                        */
+
+                       if (psa1->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
+
+                               psa1->flags |= (psa2->flags & (SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT));
+                               psa2->flags &= ~(SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT);
+                               
+                       } else if (psa2->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
+
+                               psa2->flags |= (psa1->flags & (SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT));
+                               psa1->flags &= ~(SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_OBJECT_INHERIT);
+                               
+                       }
+               }
+       }
+
+       for(i = 0; i < dacl->num_aces; i++) {
+               SEC_ACE *psa = &dacl->ace[i];
 
-       if((ace->perms & (SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) == (SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) {
-               nt_mask = UNIX_ACCESS_RWX;
-       } else if((ace->perms & (SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE)) == 0) {
                /*
-                * Here we differentiate between the owner and any other user.
+                * Ignore non-mappable SIDs (NT Authority, BUILTIN etc).
                 */
-               if (sid_equal(powner_sid, &ace->sid)
-                       nt_mask = UNIX_ACCESS_NONE;
+
+               if (non_mappable_sid(&psa->trustee)) {
+                       fstring str;
+                       DEBUG(10,("create_canon_ace_lists: ignoring non-mappable SID %s\n",
+                               sid_to_string(str, &psa->trustee) ));
+                       continue;
+               }
+
+               /*
+                * Create a cannon_ace entry representing this NT DACL ACE.
+                */
+
+               if ((current_ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL) {
+                       free_canon_ace_list(file_ace);
+                       free_canon_ace_list(dir_ace);
+                       DEBUG(0,("create_canon_ace_lists: malloc fail.\n"));
+                       return False;
+               }
+
+               ZERO_STRUCTP(current_ace);
+
+               sid_copy(&current_ace->trustee, &psa->trustee);
+
+               /*
+                * Try and work out if the SID is a user or group
+                * as we need to flag these differently for POSIX.
+                * Note what kind of a POSIX ACL this should map to.
+                */
+
+               if( sid_equal(&current_ace->trustee, &global_sid_World)) {
+                       current_ace->owner_type = WORLD_ACE;
+                       current_ace->unix_ug.world = -1;
+                       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.uid = pst->st_uid;
+                       current_ace->type = SMB_ACL_USER_OBJ;
+
+                       /*
+                        * The Creator Owner entry only specifies inheritable permissions,
+                        * never access permissions. WinNT doesn't always set the ACE to
+                        *INHERIT_ONLY, though.
+                        */
+
+                       if (nt4_compatible_acls())
+                               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.gid = pst->st_gid;
+                       current_ace->type = SMB_ACL_GROUP_OBJ;
+
+                       /*
+                        * The Creator Group entry only specifies inheritable permissions,
+                        * never access permissions. WinNT doesn't always set the ACE to
+                        *INHERIT_ONLY, though.
+                        */
+                       if (nt4_compatible_acls())
+                               psa->flags |= SEC_ACE_FLAG_INHERIT_ONLY;
+
+               } else if (NT_STATUS_IS_OK(sid_to_gid( &current_ace->trustee, &current_ace->unix_ug.gid))) {
+                       current_ace->owner_type = GID_ACE;
+                       current_ace->type = SMB_ACL_GROUP;
+               } else if (NT_STATUS_IS_OK(sid_to_uid( &current_ace->trustee, &current_ace->unix_ug.uid))) {
+                       current_ace->owner_type = UID_ACE;
+                       current_ace->type = SMB_ACL_USER;
                } else {
-                       /* Not owner, this is an access denied ACE. */
-                       nt_mask = UNIX_ACCESS_RWX;
-                       *pacl_type = SEC_ACE_TYPE_ACCESS_DENIED;
+                       fstring str;
+
+                       free_canon_ace_list(file_ace);
+                       free_canon_ace_list(dir_ace);
+                       DEBUG(0,("create_canon_ace_lists: unable to map SID %s to uid or gid.\n",
+                               sid_to_string(str, &current_ace->trustee) ));
+                       SAFE_FREE(current_ace);
+                       return False;
+               }
+
+               /*
+                * Map the given NT permissions into a UNIX mode_t containing only
+                * S_I(R|W|X)USR bits.
+                */
+
+               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
+                * list, or both. We *MUST* preserve the order here (hence we use
+                * DLIST_ADD_END) as NT ACLs are order dependent.
+                */
+
+               if (fsp->is_directory) {
+
+                       /*
+                        * We can only add to the default POSIX ACE list if the ACE is
+                        * designed to be inherited by both files and directories.
+                        */
+
+                       if ((psa->flags & (SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT)) ==
+                               (SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT)) {
+
+                               DLIST_ADD_END(dir_ace, current_ace, tmp_ace);
+
+                               /*
+                                * Note if this was an allow ace. We can't process
+                                * any further deny ace's after this.
+                                */
+
+                               if (current_ace->attr == ALLOW_ACE)
+                                       got_dir_allow = True;
+
+                               if ((current_ace->attr == DENY_ACE) && got_dir_allow) {
+                                       DEBUG(0,("create_canon_ace_lists: malformed ACL in inheritable ACL ! \
+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;
+                               }       
+
+                               if( DEBUGLVL( 10 )) {
+                                       dbgtext("create_canon_ace_lists: adding dir ACL:\n");
+                                       print_canon_ace( current_ace, 0);
+                               }
+
+                               /*
+                                * If this is not an inherit only ACE we need to add a duplicate
+                                * to the file acl.
+                                */
+
+                               if (!(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY)) {
+                                       canon_ace *dup_ace = dup_canon_ace(current_ace);
+
+                                       if (!dup_ace) {
+                                               DEBUG(0,("create_canon_ace_lists: malloc fail !\n"));
+                                               free_canon_ace_list(file_ace);
+                                               free_canon_ace_list(dir_ace);
+                                               return False;
+                                       }
+
+                                       /*
+                                        * We must not free current_ace here as its
+                                        * pointer is now owned by the dir_ace list.
+                                        */
+                                       current_ace = dup_ace;
+                               } else {
+                                       /*
+                                        * We must not free current_ace here as its
+                                        * pointer is now owned by the dir_ace list.
+                                        */
+                                       current_ace = NULL;
+                               }
+                       }
+               }
+
+               /*
+                * Only add to the file ACL if not inherit only.
+                */
+
+               if (!(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY)) {
+                       DLIST_ADD_END(file_ace, current_ace, tmp_ace);
+
+                       /*
+                        * Note if this was an allow ace. We can't process
+                        * any further deny ace's after this.
+                        */
+
+                       if (current_ace->attr == ALLOW_ACE)
+                               got_file_allow = True;
+
+                       if ((current_ace->attr == DENY_ACE) && got_file_allow) {
+                               DEBUG(0,("create_canon_ace_lists: malformed ACL in file ACL ! \
+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;
+                       }       
+
+                       if( DEBUGLVL( 10 )) {
+                               dbgtext("create_canon_ace_lists: adding file ACL:\n");
+                               print_canon_ace( current_ace, 0);
+                       }
+                       all_aces_are_inherit_only = False;
+                       /*
+                        * We must not free current_ace here as its
+                        * pointer is now owned by the file_ace list.
+                        */
+                       current_ace = NULL;
                }
+
+               /*
+                * Free if ACE was not added.
+                */
+
+               SAFE_FREE(current_ace);
+       }
+
+       if (fsp->is_directory && all_aces_are_inherit_only) {
+               /*
+                * Windows 2000 is doing one of these weird 'inherit acl'
+                * traverses to conserve NTFS ACL resources. Just pretend
+                * there was no DACL sent. JRA.
+                */
+
+               DEBUG(10,("create_canon_ace_lists: Win2k inherit acl traverse. Ignoring DACL.\n"));
+               free_canon_ace_list(file_ace);
+               free_canon_ace_list(dir_ace);
+               file_ace = NULL;
+               dir_ace = NULL;
        } else {
-               nt_mask |= (perm & SMB_ACL_READ) ? UNIX_ACCESS_R : 0;
-               nt_mask |= (perm & SMB_ACL_WRITE) ? UNIX_ACCESS_W : 0;
-               nt_mask |= (perm & SMB_ACL_EXECUTE) ? UNIX_ACCESS_X : 0;
+               /*
+                * Check if we have SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ entries in each
+                * ACL. If we don't have them, check if any SMB_ACL_USER/SMB_ACL_GROUP
+                * 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);
        }
-       init_sec_access(&sa,nt_mask);
-       return sa;
+
+       *ppfile_ace = file_ace;
+       *ppdir_ace = dir_ace;
+
+       return True;
 }
 
 /****************************************************************************
- Map NT perms to UNIX.
+ ASCII art time again... JRA :-).
+
+ 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
+ list or once in the allow list.
+
+ We then process as follows :
+
+ ---------------------------------------------------------------------------
+ First pass - look for a Everyone DENY entry.
+
+ If it is deny all (rwx) trunate the list at this point.
+ Else, walk the list from this point and use the deny permissions of this
+ entry as a mask on all following allow entries. Finally, delete
+ the Everyone DENY entry (we have applied it to everything possible).
+
+ In addition, in this pass we remove any DENY entries that have 
+ no permissions (ie. they are a DENY nothing).
+ ---------------------------------------------------------------------------
+ Second pass - only deal with deny user entries.
+
+ DENY user1 (perms XXX)
+
+ new_perms = 0
+ for all following allow group entries where user1 is in group
+       new_perms |= group_perms;
+
+ user1 entry perms = new_perms & ~ XXX;
+
+ Convert the deny entry to an allow entry with the new perms and
+ push to the end of the list. Note if the user was in no groups
+ this maps to a specific allow nothing entry for this user.
+
+ The common case from the NT ACL choser (userX deny all) is
+ optimised so we don't do the group lookup - we just map to
+ an allow nothing entry.
+
+ What we're doing here is inferring the allow permissions the
+ person setting the ACE on user1 wanted by looking at the allow
+ permissions on the groups the user is currently in. This will
+ be a snapshot, depending on group membership but is the best
+ we can do and has the advantage of failing closed rather than
+ open.
+ ---------------------------------------------------------------------------
+ Third pass - only deal with deny group entries.
+
+ DENY group1 (perms XXX)
+
+ for all following allow user entries where user is in group1
+   user entry perms = user entry perms & ~ XXX;
+
+ If there is a group Everyone allow entry with permissions YYY,
+ convert the group1 entry to an allow entry and modify its
+ permissions to be :
+
+ new_perms = YYY & ~ XXX
+
+ and push to the end of the list.
+
+ If there is no group Everyone allow entry then convert the
+ group1 entry to a allow nothing entry and push to the end of the list.
+
+ Note that the common case from the NT ACL choser (groupX deny all)
+ cannot be optimised here as we need to modify user entries who are
+ in the group to change them to a deny all also.
+
+ What we're doing here is modifying the allow permissions of
+ user entries (which are more specific in POSIX ACLs) to mask
+ out the explicit deny set on the group they are in. This will
+ be a snapshot depending on current group membership but is the
+ 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
+ group pass.
+
+ The above algorithm took a *lot* of thinking about - hence this
+ explaination :-). JRA.
 ****************************************************************************/
 
-#define FILE_SPECIFIC_READ_BITS (FILE_READ_DATA|FILE_READ_EA|FILE_READ_ATTRIBUTES)
-#define FILE_SPECIFIC_WRITE_BITS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_EA|FILE_WRITE_ATTRIBUTES)
-#define FILE_SPECIFIC_EXECUTE_BITS (FILE_EXECUTE)
+/****************************************************************************
+ Process a canon_ace list entries. This is very complex code. We need
+ to go through and remove the "deny" permissions from any allow entry that matches
+ the id of this entry. We have already refused any NT ACL that wasn't in correct
+ order (DENY followed by ALLOW). If any allow entry ends up with zero permissions,
+ we just remove it (to fail safe). We have already removed any duplicate ace
+ entries. Treat an "Everyone" DENY_ACE as a special case - use it to mask all
+ allow entries.
+****************************************************************************/
 
-static mode_t map_nt_perms( SEC_ACCESS sec_access, int type)
+static void process_deny_list( canon_ace **pp_ace_list )
 {
-  mode_t mode = 0;
-
-  switch(type) {
-  case S_IRUSR:
-    if(sec_access.mask & GENERIC_ALL_ACCESS)
-      mode = S_IRUSR|S_IWUSR|S_IXUSR;
-    else {
-      mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IRUSR : 0;
-      mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWUSR : 0;
-      mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXUSR : 0;
-    }
-    break;
-  case S_IRGRP:
-    if(sec_access.mask & GENERIC_ALL_ACCESS)
-      mode = S_IRGRP|S_IWGRP|S_IXGRP;
-    else {
-      mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IRGRP : 0;
-      mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWGRP : 0;
-      mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXGRP : 0;
-    }
-    break;
-  case S_IROTH:
-    if(sec_access.mask & GENERIC_ALL_ACCESS)
-      mode = S_IROTH|S_IWOTH|S_IXOTH;
-    else {
-      mode |= (sec_access.mask & (GENERIC_READ_ACCESS|FILE_SPECIFIC_READ_BITS)) ? S_IROTH : 0;
-      mode |= (sec_access.mask & (GENERIC_WRITE_ACCESS|FILE_SPECIFIC_WRITE_BITS)) ? S_IWOTH : 0;
-      mode |= (sec_access.mask & (GENERIC_EXECUTE_ACCESS|FILE_SPECIFIC_EXECUTE_BITS)) ? S_IXOTH : 0;
-    }
-    break;
-  }
-
-  return mode;
-}
-
-/****************************************************************************
- Unpack a SEC_DESC into a owner, group and set of UNIX permissions.
-****************************************************************************/
-
-static BOOL unpack_nt_permissions(SMB_STRUCT_STAT *psbuf, uid_t *puser, gid_t *pgrp, mode_t *pmode,
-                                  uint32 security_info_sent, SEC_DESC *psd, BOOL is_directory)
-{
-  extern DOM_SID global_sid_World;
-  DOM_SID owner_sid;
-  DOM_SID grp_sid;
-  DOM_SID file_owner_sid;
-  DOM_SID file_grp_sid;
-  uint32 owner_rid;
-  uint32 grp_rid;
-  SEC_ACL *dacl = psd->dacl;
-  BOOL all_aces_are_inherit_only = (is_directory ? True : False);
-  int i;
-  enum SID_NAME_USE sid_type;
-
-  *pmode = 0;
-  *puser = (uid_t)-1;
-  *pgrp = (gid_t)-1;
-
-  if(security_info_sent == 0) {
-    DEBUG(0,("unpack_nt_permissions: no security info sent !\n"));
-    return False;
-  }
-
-  /*
-   * Windows 2000 sends the owner and group SIDs as the logged in
-   * user, not the connected user. But it still sends the file
-   * owner SIDs on an ACL set. So we need to check for the file
-   * owner and group SIDs as well as the owner SIDs. JRA.
-   */
-  create_file_sids(psbuf, &file_owner_sid, &file_grp_sid);
-
-  /*
-   * Validate the owner and group SID's.
-   */
-
-  memset(&owner_sid, '\0', sizeof(owner_sid));
-  memset(&grp_sid, '\0', sizeof(grp_sid));
-
-  DEBUG(5,("unpack_nt_permissions: validating owner_sid.\n"));
-
-  /*
-   * Don't immediately fail if the owner sid cannot be validated.
-   * This may be a group chown only set.
-   */
-
-  if (security_info_sent & OWNER_SECURITY_INFORMATION) {
-    if (!sid_to_uid( &owner_sid, puser, &sid_type))
-      DEBUG(3,("unpack_nt_permissions: unable to validate owner sid.\n"));
-  }
-
-  /*
-   * Don't immediately fail if the group sid cannot be validated.
-   * This may be an owner chown only set.
-   */
-
-  if (security_info_sent & GROUP_SECURITY_INFORMATION) {
-    if (!sid_to_gid( &grp_sid, pgrp, &sid_type))
-      DEBUG(3,("unpack_nt_permissions: unable to validate group sid.\n"));
-  }
-
-  /*
-   * If no DACL then this is a chown only security descriptor.
-   */
-
-  if(!(security_info_sent & DACL_SECURITY_INFORMATION) || !dacl) {
-    *pmode = 0;
-    return True;
-  }
-
-  /*
-   * Now go through the DACL and ensure that
-   * any owner/group sids match.
-   */
-
-  for(i = 0; i < dacl->num_aces; i++) {
-    DOM_SID ace_sid;
-    SEC_ACE *psa = &dacl->ace[i];
-
-    if((psa->type != SEC_ACE_TYPE_ACCESS_ALLOWED) &&
-       (psa->type != SEC_ACE_TYPE_ACCESS_DENIED)) {
-      DEBUG(3,("unpack_nt_permissions: unable to set anything but an ALLOW or DENY ACE.\n"));
-      return False;
-    }
-
-    /*
-     * Ignore or remove bits we don't care about on a directory ACE.
-     */
+       extern DOM_SID global_sid_World;
+       canon_ace *ace_list = *pp_ace_list;
+       canon_ace *curr_ace = NULL;
+       canon_ace *curr_ace_next = NULL;
+
+       /* Pass 1 above - look for an Everyone, deny entry. */
+
+       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 != DENY_ACE)
+                       continue;
+
+               if (curr_ace->perms == (mode_t)0) {
+
+                       /* Deny nothing entry - delete. */
+
+                       DLIST_REMOVE(ace_list, curr_ace);
+                       continue;
+               }
+
+               if (!sid_equal(&curr_ace->trustee, &global_sid_World))
+                       continue;
+
+               /* JRATEST - assert. */
+               SMB_ASSERT(curr_ace->owner_type == WORLD_ACE);
+
+               if (curr_ace->perms == ALL_ACE_PERMS) {
+
+                       /*
+                        * Optimisation. This is a DENY_ALL to Everyone. Truncate the
+                        * list at this point including this entry.
+                        */
+
+                       canon_ace *prev_entry = curr_ace->prev;
+
+                       free_canon_ace_list( curr_ace );
+                       if (prev_entry)
+                               prev_entry->next = NULL;
+                       else {
+                               /* We deleted the entire list. */
+                               ace_list = NULL;
+                       }
+                       break;
+               }
+
+               for (allow_ace_p = curr_ace->next; allow_ace_p; allow_ace_p = allow_ace_p->next) {
+
+                       /* 
+                        * Only mask off allow entries.
+                        */
+
+                       if (allow_ace_p->attr != ALLOW_ACE)
+                               continue;
+
+                       allow_ace_p->perms &= ~curr_ace->perms;
+               }
+
+               /*
+                * Now it's been applied, remove it.
+                */
+
+               DLIST_REMOVE(ace_list, curr_ace);
+       }
+
+       /* Pass 2 above - deal with deny user entries. */
+
+       for (curr_ace = ace_list; curr_ace; curr_ace = curr_ace_next) {
+               mode_t new_perms = (mode_t)0;
+               canon_ace *allow_ace_p;
+               canon_ace *tmp_ace;
+
+               curr_ace_next = curr_ace->next; /* So we can't lose the link. */
+
+               if (curr_ace->attr != DENY_ACE)
+                       continue;
+
+               if (curr_ace->owner_type != UID_ACE)
+                       continue;
+
+               if (curr_ace->perms == ALL_ACE_PERMS) {
+
+                       /*
+                        * Optimisation - this is a deny everything to this user.
+                        * Convert to an allow nothing and push to the end of the list.
+                        */
+
+                       curr_ace->attr = ALLOW_ACE;
+                       curr_ace->perms = (mode_t)0;
+                       DLIST_DEMOTE(ace_list, curr_ace, tmp_ace);
+                       continue;
+               }
+
+               for (allow_ace_p = curr_ace->next; allow_ace_p; allow_ace_p = allow_ace_p->next) {
+
+                       if (allow_ace_p->attr != ALLOW_ACE)
+                               continue;
+
+                       /* We process GID_ACE and WORLD_ACE entries only. */
+
+                       if (allow_ace_p->owner_type == UID_ACE)
+                               continue;
+
+                       if (uid_entry_in_group( curr_ace, allow_ace_p))
+                               new_perms |= allow_ace_p->perms;
+               }
+
+               /*
+                * Convert to a allow entry, modify the perms and push to the end
+                * of the list.
+                */
+
+               curr_ace->attr = ALLOW_ACE;
+               curr_ace->perms = (new_perms & ~curr_ace->perms);
+               DLIST_DEMOTE(ace_list, curr_ace, tmp_ace);
+       }
+
+       /* Pass 3 above - deal with deny group entries. */
+
+       for (curr_ace = ace_list; curr_ace; curr_ace = curr_ace_next) {
+               canon_ace *tmp_ace;
+               canon_ace *allow_ace_p;
+               canon_ace *allow_everyone_p = NULL;
+
+               curr_ace_next = curr_ace->next; /* So we can't lose the link. */
+
+               if (curr_ace->attr != DENY_ACE)
+                       continue;
+
+               if (curr_ace->owner_type != GID_ACE)
+                       continue;
 
-    if(is_directory) {
-      if(psa->flags & SEC_ACE_FLAG_INHERIT_ONLY) {
-        DEBUG(3,("unpack_nt_permissions: ignoring inherit only ACE.\n"));
-        continue;
-      }
+               for (allow_ace_p = curr_ace->next; allow_ace_p; allow_ace_p = allow_ace_p->next) {
 
-      /*
-       * At least one of the ACE entries wasn't inherit only.
-       * Flag this so we know the returned mode is valid.
-       */
+                       if (allow_ace_p->attr != ALLOW_ACE)
+                               continue;
 
-      all_aces_are_inherit_only = False;
-    }
+                       /* Store a pointer to the Everyone allow, if it exists. */
+                       if (allow_ace_p->owner_type == WORLD_ACE)
+                               allow_everyone_p = allow_ace_p;
 
-    /*
-     * Windows 2000 sets these flags even on *file* ACE's. This is wrong
-     * but we can ignore them for now. Revisit this when we go to POSIX
-     * ACLs on directories.
-     */
+                       /* We process UID_ACE entries only. */
 
-    psa->flags &= ~(SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT);
+                       if (allow_ace_p->owner_type != UID_ACE)
+                               continue;
 
-    if(psa->flags != 0) {
-      DEBUG(1,("unpack_nt_permissions: unable to set ACE flags (%x).\n", 
-            (unsigned int)psa->flags));
-      return False;
-    }
+                       /* Mask off the deny group perms. */
 
-    /*
-     * The security mask may be UNIX_ACCESS_NONE which should map into
-     * no permissions (we overload the WRITE_OWNER bit for this) or it
-     * should be one of the ALL/EXECUTE/READ/WRITE bits. Arrange for this
-     * to be so. Any other bits override the UNIX_ACCESS_NONE bit.
-     */
+                       if (uid_entry_in_group( allow_ace_p, curr_ace))
+                               allow_ace_p->perms &= ~curr_ace->perms;
+               }
 
-    psa->info.mask &= (GENERIC_ALL_ACCESS|GENERIC_EXECUTE_ACCESS|GENERIC_WRITE_ACCESS|
-                     GENERIC_READ_ACCESS|UNIX_ACCESS_NONE|FILE_ALL_ATTRIBUTES);
+               /*
+                * Convert the deny to an allow with the correct perms and
+                * push to the end of the list.
+                */
 
-    if(psa->info.mask != UNIX_ACCESS_NONE)
-      psa->info.mask &= ~UNIX_ACCESS_NONE;
+               curr_ace->attr = ALLOW_ACE;
+               if (allow_everyone_p)
+                       curr_ace->perms = allow_everyone_p->perms & ~curr_ace->perms;
+               else
+                       curr_ace->perms = (mode_t)0;
+               DLIST_DEMOTE(ace_list, curr_ace, tmp_ace);
 
-    sid_copy(&ace_sid, &psa->sid);
+       }
 
-    if(sid_equal(&ace_sid, &file_owner_sid)) {
-      /*
-       * Map the desired permissions into owner perms.
-       */
+       /* 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(psa->type == SEC_ACE_TYPE_ACCESS_ALLOWED)
-        *pmode |= map_nt_perms( psa->info, S_IRUSR);
-      else
-        *pmode &= ~(map_nt_perms( psa->info, S_IRUSR));
-
-    } else if( sid_equal(&ace_sid, &file_grp_sid)) {
-      /*
-       * Map the desired permissions into group perms.
-       */
-
-      if(psa->type == SEC_ACE_TYPE_ACCESS_ALLOWED)
-        *pmode |= map_nt_perms( psa->info, S_IRGRP);
-      else
-        *pmode &= ~(map_nt_perms( psa->info, S_IRGRP));
+#if 0
+       /* Pass 4 above - deal with allow entries. */
 
-    } else if( sid_equal(&ace_sid, &global_sid_World)) {
-      /*
-       * Map the desired permissions into other perms.
-       */
+       for (curr_ace = ace_list; curr_ace; curr_ace = curr_ace_next) {
+               canon_ace *allow_ace_p;
 
-      if(psa->type == SEC_ACE_TYPE_ACCESS_ALLOWED)
-        *pmode |= map_nt_perms( psa->info, S_IROTH);
-      else
-        *pmode &= ~(map_nt_perms( psa->info, S_IROTH));
+               curr_ace_next = curr_ace->next; /* So we can't lose the link. */
 
-    } else {
-      DEBUG(0,("unpack_nt_permissions: unknown SID used in ACL.\n"));
-      return False;
-    }
-  }
+               if (curr_ace->attr != ALLOW_ACE)
+                       continue;
 
-  if (is_directory && all_aces_are_inherit_only) {
-    /*
-     * Windows 2000 is doing one of these weird 'inherit acl'
-     * traverses to conserve NTFS ACL resources. Just pretend
-     * there was no DACL sent. JRA.
-     */
+               if (curr_ace->owner_type != UID_ACE)
+                       continue;
 
-    DEBUG(10,("unpack_nt_permissions: Win2k inherit acl traverse. Ignoring DACL.\n"));
-    free_sec_acl(&psd->dacl);
-  }
+               for (allow_ace_p = ace_list; allow_ace_p; allow_ace_p = allow_ace_p->next) {
 
-  return True;
-}
+                       if (allow_ace_p->attr != ALLOW_ACE)
+                               continue;
 
-/****************************************************************************
- Map generic UNIX permissions to POSIX ACL perms.
-****************************************************************************/
+                       /* We process GID_ACE entries only. */
 
-static SMB_ACL_PERMSET_T unix_perms_to_acl_perms(mode_t mode, int r_mask, int w_mask, int x_mask)
-{
-       SMB_ACL_PERMSET_T  ret = 0;
+                       if (allow_ace_p->owner_type != GID_ACE)
+                               continue;
 
-       ret |= (mode & r_mask) ? SMB_ACL_READ : 0;
-       ret |= (mode & w_mask) ? SMB_ACL_WRITE : 0;
-       ret |= (mode & x_mask) ? SMB_ACL_EXECUTE : 0;
+                       /* OR in the group perms. */
 
-       return ret;
+                       if (uid_entry_in_group( curr_ace, allow_ace_p))
+                               curr_ace->perms |= allow_ace_p->perms;
+               }
+       }
+#endif
+
+       *pp_ace_list = ace_list;
 }
 
 /****************************************************************************
- Count a linked list of canonical ACE entries.
+ Create a default mode that will be used if a security descriptor entry has
+ no user/group/world entries.
 ****************************************************************************/
 
-static size_t count_canon_ace_list( canon_ace *list_head )
+static mode_t create_default_mode(files_struct *fsp, BOOL interitable_mode)
 {
-       size_t count = 0;
-       canon_ace *ace;
+       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;
 
-       for (ace = list_head; ace; ace = ace->next)
-               count++;
+       if (fsp->is_directory)
+               mode |= (S_IWUSR|S_IXUSR);
 
-       return count;
+       /*
+        * Now AND with the create mode/directory mode bits then OR with the
+        * force create mode/force directory mode bits.
+        */
+
+       if (fsp->is_directory) {
+               and_bits = lp_dir_security_mask(snum);
+               or_bits = lp_force_dir_security_mode(snum);
+       } else {
+               and_bits = lp_security_mask(snum);
+               or_bits = lp_force_security_mode(snum);
+       }
+
+       return ((mode & and_bits)|or_bits);
 }
 
 /****************************************************************************
- Free a linked list of canonical ACE entries.
+ Unpack a SEC_DESC into two canonical ace lists. We don't depend on this
+ succeeding.
 ****************************************************************************/
 
-static void free_canon_ace_list( canon_ace *list_head )
+static BOOL unpack_canon_ace(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,
+                                                       uint32 security_info_sent, SEC_DESC *psd)
 {
-       while (list_head) {
-               canon_ace *old_head = list_head;
-               DLIST_REMOVE(list_head, list_head);
-               free(old_head);
+       canon_ace *file_ace = NULL;
+       canon_ace *dir_ace = NULL;
+
+       *ppfile_ace = NULL;
+       *ppdir_ace = NULL;
+
+       if(security_info_sent == 0) {
+               DEBUG(0,("unpack_canon_ace: no security info sent !\n"));
+               return False;
        }
-}
 
-/******************************************************************************
Fall back to the generic 3 element UNIX permissions.
-********************************************************************************/
+       /*
       * If no DACL then this is a chown only security descriptor.
+        */
 
-static canon_ace *unix_canonicalise_acl(files_struct *fsp, SMB_STRUCT_STAT *psbuf,
-                                                                               DOM_SID *powner, DOM_SID *pgroup)
-{
-       extern DOM_SID global_sid_World;
-       canon_ace *list_head = NULL;
-       canon_ace *owner_ace = NULL;
-       canon_ace *group_ace = NULL;
-       canon_ace *other_ace = NULL;
-       SMB_ACL_TAG_T type;
-       SMB_ACL_PERMSET_T perms;
-       DOM_SID sid;
+       if(!(security_info_sent & DACL_SECURITY_INFORMATION) || !psd->dacl)
+               return True;
 
        /*
-        * Create 3 linked list entries.
+        * Now go through the DACL and create the canon_ace lists.
         */
 
-       if ((owner_ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL)
-               goto fail;
+       if (!create_canon_ace_lists( fsp, pst, pfile_owner_sid, pfile_grp_sid,
+                                                               &file_ace, &dir_ace, psd->dacl))
+               return False;
 
-       if ((gtoup_ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL)
-               goto fail;
+       if ((file_ace == NULL) && (dir_ace == NULL)) {
+               /* W2K traverse DACL set - ignore. */
+               return True;
+       }
 
-       if ((other_ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL)
-               goto fail;
+       /*
+        * Go through the canon_ace list and merge entries
+        * belonging to identical users of identical allow or deny type.
+        * We can do this as all deny entries come first, followed by
+        * all allow entries (we have mandated this before accepting this acl).
+        */
 
-       ZERO_STRUCTP(owner_ace);
-       ZERO_STRUCTP(group_ace);
-       ZERO_STRUCTP(other_ace);
+       print_canon_ace_list( "file ace - before merge", file_ace);
+       merge_aces( &file_ace );
 
-       owner_ace->type = SMB_ACL_USER_OBJ;
-       owner_ace->sid = *powner;
+       print_canon_ace_list( "dir ace - before merge", dir_ace);
+       merge_aces( &dir_ace );
 
-       group_ace->type = SMB_ACL_GROUP_OBJ;
-       group_ace->sid = *pgroup;
+       /*
+        * NT ACLs are order dependent. Go through the acl lists and
+        * process DENY entries by masking the allow entries.
+        */
 
-       other_ace->type = SMB_ACL_OTHER_OBJ;
-       other_ace->sid = global_sid_World;
+       print_canon_ace_list( "file ace - before deny", file_ace);
+       process_deny_list( &file_ace);
 
-       if (!fsp->is_directory) {
-               owner_ace->perms = unix_perms_to_acl_perms(sbuf.st_mode, S_IRUSR, S_IWUSR, S_IXUSR);
-               group_ace->perms = unix_perms_to_acl_perms(sbuf.st_mode, S_IRGRP, S_IWGRP, S_IXGRP);
-               other_ace->perms = unix_perms_to_acl_perms(sbuf.st_mode, S_IROTH, S_IWOTH, S_IXOTH);
-       } else {
-               mode_t mode = unix_mode( fsp->conn, FILE_ATTRIBUTE_ARCHIVE, fsp->fsp_name);
+       print_canon_ace_list( "dir ace - before deny", dir_ace);
+       process_deny_list( &dir_ace);
 
-               owner_ace->perms = unix_perms_to_acl_perms(mode, S_IRUSR, S_IWUSR, S_IXUSR);
-               group_ace->perms = unix_perms_to_acl_perms(mode, S_IRGRP, S_IWGRP, S_IXGRP);
-               other_ace->perms = unix_perms_to_acl_perms(mode, S_IROTH, S_IWOTH, S_IXOTH);
+       /*
+        * A well formed POSIX file or default ACL has at least 3 entries, a 
+        * SMB_ACL_USER_OBJ, SMB_ACL_GROUP_OBJ, SMB_ACL_OTHER_OBJ
+        * and optionally a mask entry. Ensure this is the case.
+        */
+
+       print_canon_ace_list( "file ace - before valid", file_ace);
+
+       /*
+        * A default 3 element mode entry for a file should be r-- --- ---.
+        * A default 3 element mode entry for a directory should be rwx --- ---.
+        */
+
+       pst->st_mode = create_default_mode(fsp, False);
+
+       if (!ensure_canon_entry_valid(&file_ace, fsp, pfile_owner_sid, pfile_grp_sid, pst, True)) {
+               free_canon_ace_list(file_ace);
+               free_canon_ace_list(dir_ace);
+               return False;
        }
 
-       DLIST_ADD(list_head, other_ace);
-       DLIST_ADD(list_head, group_ace);
-       DLIST_ADD(list_head, owner_ace);
+       print_canon_ace_list( "dir ace - before valid", dir_ace);
 
-       return list_head;
+       /*
+        * A default inheritable 3 element mode entry for a directory should be the
+        * mode Samba will use to create a file within. Ensure user rwx bits are set if
+        * it's a directory.
+        */
 
-  fail:
+       pst->st_mode = create_default_mode(fsp, True);
+
+       if (dir_ace && !ensure_canon_entry_valid(&dir_ace, fsp, pfile_owner_sid, pfile_grp_sid, pst, True)) {
+               free_canon_ace_list(file_ace);
+               free_canon_ace_list(dir_ace);
+               return False;
+       }
 
-       safe_free(owner_ace);
-       safe_free(group_ace);
-       safe_free(other_ace);
+       print_canon_ace_list( "file ace - return", file_ace);
+       print_canon_ace_list( "dir ace - return", dir_ace);
+
+       *ppfile_ace = file_ace;
+       *ppdir_ace = dir_ace;
+       return True;
 
-       return NULL;
 }
 
+/******************************************************************************
+ When returning permissions, try and fit NT display
+ semantics if possible. Note the the canon_entries here must have been malloced.
+ The list format should be - first entry = owner, followed by group and other user
+ entries, last entry = other.
+
+ Note that this doesn't exactly match the NT semantics for an ACL. As POSIX entries
+ are not ordered, and match on the most specific entry rather than walking a list,
+ 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 3: group : allow read.
+ Entry 4: Everyone : allow read.
+
+ But NT cannot display this in their ACL editor !
+********************************************************************************/
+
+static void arrange_posix_perms( char *filename, canon_ace **pp_list_head)
+{
+       canon_ace *list_head = *pp_list_head;
+       canon_ace *owner_ace = NULL;
+       canon_ace *other_ace = NULL;
+       canon_ace *ace = NULL;
+
+       for (ace = list_head; ace; ace = ace->next) {
+               if (ace->type == SMB_ACL_USER_OBJ)
+                       owner_ace = ace;
+               else if (ace->type == SMB_ACL_OTHER) {
+                       /* Last ace - this is "other" */
+                       other_ace = ace;
+               }
+       }
+               
+       if (!owner_ace || !other_ace) {
+               DEBUG(0,("arrange_posix_perms: Invalid POSIX permissions for file %s, missing owner or other.\n",
+                       filename ));
+               return;
+       }
+
+       /*
+        * The POSIX algorithm applies to owner first, and other last,
+        * so ensure they are arranged in this order.
+        */
+
+       if (owner_ace) {
+               DLIST_PROMOTE(list_head, owner_ace);
+       }
+
+       if (other_ace) {
+               DLIST_DEMOTE(list_head, other_ace, ace);
+       }
+
+       /* We have probably changed the head of the list. */
+
+       *pp_list_head = list_head;
+}
+               
 /****************************************************************************
- Create a linked list of canonical ACE entries. This is sorted so that DENY
- entries are at the front of the list, as NT requires.
+ Create a linked list of canonical ACE entries.
 ****************************************************************************/
 
-static canon_ace *canonicalise_acl( SMB_ACL_T posix_acl, SMB_STRUCT_STAT *psbuf)
+static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_STRUCT_STAT *psbuf,
+                                       DOM_SID *powner, DOM_SID *pgroup, struct pai_val *pal, SMB_ACL_TYPE_T the_acl_type)
 {
        extern DOM_SID global_sid_World;
-       SMB_ACL_PERMSET_T acl_mask = (SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE);
+       connection_struct *conn = fsp->conn;
+       mode_t acl_mask = (S_IRUSR|S_IWUSR|S_IXUSR);
        canon_ace *list_head = NULL;
        canon_ace *ace = NULL;
        canon_ace *next_ace = NULL;
        int entry_id = SMB_ACL_FIRST_ENTRY;
        SMB_ACL_ENTRY_T entry;
+       size_t ace_count;
 
-       while ( sys_acl_get_entry(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;
+               posix_id unix_ug;
+               enum ace_owner owner_type;
 
                /* get_next... */
                if (entry_id == SMB_ACL_FIRST_ENTRY)
                        entry_id = SMB_ACL_NEXT_ENTRY;
 
                /* Is this a MASK entry ? */
-               if (sys_acl_get_tag_type(entry, &tagtype) == -1)
+               if (SMB_VFS_SYS_ACL_GET_TAG_TYPE(conn, entry, &tagtype) == -1)
                        continue;
 
-               if (sys_acl_get_permset(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. */
                switch(tagtype) {
-                       SMB_ACL_USER_OBJ:
+                       case SMB_ACL_USER_OBJ:
                                /* Get the SID from the owner. */
-                               uid_to_sid( &sid, psbuf->st_uid );
+                               sid_copy(&sid, powner);
+                               unix_ug.uid = psbuf->st_uid;
+                               owner_type = UID_ACE;
                                break;
-                       SMB_ACL_USER:
+                       case SMB_ACL_USER:
                                {
-                                       uid_t *puid = (uid_t *)sys_acl_get_qualifier(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;
                                        }
+                                       /*
+                                        * A SMB_ACL_USER entry for the owner is shadowed by the
+                                        * SMB_ACL_USER_OBJ entry and Windows also cannot represent
+                                        * that entry, so we ignore it. We also don't create such
+                                        * 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)
+                                               continue;
                                        uid_to_sid( &sid, *puid);
+                                       unix_ug.uid = *puid;
+                                       owner_type = UID_ACE;
+                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)puid,tagtype);
                                        break;
                                }
-                       SMB_ACL_GROUP_OBJ:
+                       case SMB_ACL_GROUP_OBJ:
                                /* Get the SID from the owning group. */
-                               gid_to_sid( &sid, psbuf->st_gid );
+                               sid_copy(&sid, pgroup);
+                               unix_ug.gid = psbuf->st_gid;
+                               owner_type = GID_ACE;
                                break;
-                       SMB_ACL_GROUP:
+                       case SMB_ACL_GROUP:
                                {
-                                       gid_t *pgid = (gid_t *)sys_acl_get_qualifier(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;
                                        }
                                        gid_to_sid( &sid, *pgid);
+                                       unix_ug.gid = *pgid;
+                                       owner_type = GID_ACE;
+                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)pgid,tagtype);
                                        break;
                                }
-                       SMB_ACL_MASK:
-                               acl_mask = permset;
+                       case SMB_ACL_MASK:
+                               acl_mask = convert_permset_to_mode_t(conn, permset);
                                continue; /* Don't count the mask as an entry. */
-                       SMB_ACL_OTHER_OBJ:
+                       case SMB_ACL_OTHER:
                                /* Use the Everyone SID */
                                sid = global_sid_World;
+                               unix_ug.world = -1;
+                               owner_type = WORLD_ACE;
                                break;
                        default:
                                DEBUG(0,("canonicalise_acl: Unknown tagtype %u\n", (unsigned int)tagtype));
                                continue;
-               }       
+               }
+
+               /*
+                * Add this entry to the list.
+                */
+
+               if ((ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL)
+                       goto fail;
+
+               ZERO_STRUCTP(ace);
+               ace->type = tagtype;
+               ace->perms = convert_permset_to_mode_t(conn, permset);
+               ace->attr = ALLOW_ACE;
+               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);
+       }
+
+       /*
+        * This next call will ensure we have at least a user/group/world set.
+        */
+
+       if (!ensure_canon_entry_valid(&list_head, fsp, powner, pgroup, psbuf, False))
+               goto fail;
+
+       /*
+        * 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: %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;
+
+               /* Masks are only applied to entries other than USER_OBJ and OTHER. */
+               if (ace->type != SMB_ACL_OTHER && ace->type != SMB_ACL_USER_OBJ)
+                       ace->perms &= acl_mask;
+
+               if (ace->perms == 0) {
+                       DLIST_PROMOTE(list_head, ace);
+               }
+
+               if( DEBUGLVL( 10 ) ) {
+                       print_canon_ace(ace, ace_count);
+               }
+       }
+
+       arrange_posix_perms(fsp->fsp_name,&list_head );
+
+       print_canon_ace_list( "canonicalise_acl: ace entries after arrange", list_head );
+
+       return list_head;
+
+  fail:
+
+       free_canon_ace_list(list_head);
+       return NULL;
+}
+
+/****************************************************************************
+ 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)
+{
+       connection_struct *conn = fsp->conn;
+       BOOL ret = False;
+       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;
+       BOOL got_mask_entry = False;
+       SMB_ACL_PERMSET_T mask_permset;
+       SMB_ACL_TYPE_T the_acl_type = (default_ace ? SMB_ACL_TYPE_DEFAULT : SMB_ACL_TYPE_ACCESS);
+       BOOL needs_mask = False;
+       mode_t mask_perms = 0;
+
+#if defined(POSIX_ACL_NEEDS_MASK)
+       /* HP-UX always wants to have a mask (called "class" there). */
+       needs_mask = True;
+#endif
+
+       if (the_acl == NULL) {
+
+               if (errno != ENOSYS) {
+                       /*
+                        * Only print this error message if we have some kind of ACL
+                        * support that's not working. Otherwise we would always get this.
+                        */
+                       DEBUG(0,("set_canon_ace_list: Unable to init %s ACL. (%s)\n",
+                               default_ace ? "default" : "file", strerror(errno) ));
+               }
+               *pacl_set_support = False;
+               return False;
+       }
+
+       if( DEBUGLVL( 10 )) {
+               dbgtext("set_canon_ace_list: setting ACL:\n");
+               for (i = 0, p_ace = the_ace; p_ace; p_ace = p_ace->next, i++ ) {
+                       print_canon_ace( p_ace, i);
+               }
+       }
+
+       for (i = 0, p_ace = the_ace; p_ace; p_ace = p_ace->next, i++ ) {
+               SMB_ACL_ENTRY_T the_entry;
+               SMB_ACL_PERMSET_T the_permset;
+
+               /*
+                * ACLs only "need" an ACL_MASK entry if there are any named user or
+                * named group entries. But if there is an ACL_MASK entry, it applies
+                * to ACL_USER, ACL_GROUP, and ACL_GROUP_OBJ entries. Set the mask
+                * so that it doesn't deny (i.e., mask off) any permissions.
+                */
+
+               if (p_ace->type == SMB_ACL_USER || p_ace->type == SMB_ACL_GROUP) {
+                       needs_mask = True;
+                       mask_perms |= p_ace->perms;
+               } else if (p_ace->type == SMB_ACL_GROUP_OBJ) {
+                       mask_perms |= p_ace->perms;
+               }
+
+               /*
+                * Get the entry for this ACE.
+                */
+
+               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;
+               }
+
+               if (p_ace->type == SMB_ACL_MASK) {
+                       mask_entry = the_entry;
+                       got_mask_entry = True;
+               }
+
+               /*
+                * Ok - we now know the ACL calls should be working, don't
+                * allow fallback to chmod.
+                */
+
+               *pacl_set_support = True;
+
+               /*
+                * Initialise the entry from the canon_ace.
+                */
+
+               /*
+                * First tell the entry what type of ACE this is.
+                */
+
+               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;
+               }
+
+               /*
+                * Only set the qualifier (user or group id) if the entry is a user
+                * or group id ACE.
+                */
+
+               if ((p_ace->type == SMB_ACL_USER) || (p_ace->type == SMB_ACL_GROUP)) {
+                       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;
+                       }
+               }
+
+               /*
+                * Convert the mode_t perms in the canon_ace to a POSIX permset.
+                */
+
+               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;
+               }
+
+               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;
+               }
+
+               /*
+                * ..and apply them to the entry.
+                */
+
+               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;
+               }
+
+               if( DEBUGLVL( 10 ))
+                       print_canon_ace( p_ace, i);
+
+       }
+
+       if (needs_mask && !got_mask_entry) {
+               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;
+               }
+
+               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;
+               }
+
+               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;
+               }
+
+               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;
+               }
+
+               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;
+               }
+       }
+
+       /*
+        * Check if the ACL is valid.
+        */
+
+       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;
+       }
+
+       /*
+        * Finally apply it to the file or directory.
+        */
+
+       if(default_ace || fsp->is_directory || fsp->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)
+                               *pacl_set_support = False;
+
+#ifdef ENOTSUP
+                       if (errno == ENOTSUP)
+                               *pacl_set_support = False;
+#endif
+
+                       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;
+               }
+       } else {
+               if (SMB_VFS_SYS_ACL_SET_FD(fsp, fsp->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)
+                               *pacl_set_support = False;
+
+#ifdef ENOTSUP
+                       if (errno == ENOTSUP)
+                               *pacl_set_support = False;
+#endif
+
+                       DEBUG(2,("set_canon_ace_list: sys_acl_set_file failed for file %s (%s).\n",
+                                       fsp->fsp_name, strerror(errno) ));
+                       goto done;
+               }
+       }
+
+       ret = True;
+
+  done:
+
+       if (the_acl != NULL)
+           SMB_VFS_SYS_ACL_FREE_ACL(conn, the_acl);
+
+       return ret;
+}
+
+/****************************************************************************
+ Find a particular canon_ace entry.
+****************************************************************************/
+
+static struct canon_ace *canon_ace_entry_for(struct canon_ace *list, SMB_ACL_TAG_T type, posix_id *id)
+{
+       while (list) {
+               if (list->type == type && ((type != SMB_ACL_USER && type != SMB_ACL_GROUP) ||
+                               (type == SMB_ACL_USER  && id && id->uid == list->unix_ug.uid) ||
+                               (type == SMB_ACL_GROUP && id && id->gid == list->unix_ug.gid)))
+                       break;
+               list = list->next;
+       }
+       return list;
+}
+
+/****************************************************************************
+****************************************************************************/
 
-               /*
-                * Add this entry to the list.
-                */
+SMB_ACL_T free_empty_sys_acl(connection_struct *conn, SMB_ACL_T the_acl)
+{
+       SMB_ACL_ENTRY_T entry;
 
-               if ((ace = (canon_ace *)malloc(sizeof(canon_ace))) == NULL)
-                       goto fail;
+       if (!the_acl)
+               return NULL;
+       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 the_acl;
+}
 
-               ZERO_STRUCTP(ace);
-               ace->type = tagtype;
-               ace->perms = permset;
-               ace->sid = sid;
-                
-               DLIST_ADD(list_head, ace);
+/****************************************************************************
+ Convert a canon_ace to a generic 3 element permission - if possible.
+****************************************************************************/
+
+#define MAP_PERM(p,mask,result) (((p) & (mask)) ? (result) : 0 )
+
+static BOOL convert_canon_ace_to_posix_perms( files_struct *fsp, canon_ace *file_ace_list, mode_t *posix_perms)
+{
+       int snum = SNUM(fsp->conn);
+       size_t ace_count = count_canon_ace_list(file_ace_list);
+       canon_ace *ace_p;
+       canon_ace *owner_ace = NULL;
+       canon_ace *group_ace = NULL;
+       canon_ace *other_ace = NULL;
+       mode_t and_bits;
+       mode_t or_bits;
+
+       if (ace_count != 3) {
+               DEBUG(3,("convert_canon_ace_to_posix_perms: Too many ACE entries for file %s to convert to \
+posix perms.\n", fsp->fsp_name ));
+               return False;
        }
 
-       /*
-        * Now go through the list, masking the permissions with the
-        * acl_mask. If the permissions are 0 and the type is ACL_USER
-        * or ACL_GROUP then it's a DENY entry and should be listed
-        * first. If the permissions are 0 and the type is ACL_USER_OBJ,
-        * ACL_GROUP_OBJ or ACL_OTHER_OBJ then remove the entry as they
-        * can never apply.
-        */
+       for (ace_p = file_ace_list; ace_p; ace_p = ace_p->next) {
+               if (ace_p->owner_type == UID_ACE)
+                       owner_ace = ace_p;
+               else if (ace_p->owner_type == GID_ACE)
+                       group_ace = ace_p;
+               else if (ace_p->owner_type == WORLD_ACE)
+                       other_ace = ace_p;
+       }
 
-       for ( ace = list_head; ace; ace = next_ace) {
-               next_ace = ace_next;
-               ace->perms &= acl_mask;
+       if (!owner_ace || !group_ace || !other_ace) {
+               DEBUG(3,("convert_canon_ace_to_posix_perms: Can't get standard entries for file %s.\n",
+                               fsp->fsp_name ));
+               return False;
+       }
 
-               if (ace->perms == 0) {
-                       switch (ace->type) {
-                               SMB_ACL_USER_OBJ:
-                               SMB_ACL_GROUP_OBJ:
-                               SMB_ACL_OTHER_OBJ:
-                                       DLIST_REMOVE(list_head, ace);
-                                       break;
-                               SMB_ACL_USER:
-                               SMB_ACL_GROUP:
-                                       DLIST_PROMOTE(list_head, ace);
-                                       break;
+       *posix_perms = (mode_t)0;
+
+       *posix_perms |= owner_ace->perms;
+       *posix_perms |= MAP_PERM(group_ace->perms, S_IRUSR, S_IRGRP);
+       *posix_perms |= MAP_PERM(group_ace->perms, S_IWUSR, S_IWGRP);
+       *posix_perms |= MAP_PERM(group_ace->perms, S_IXUSR, S_IXGRP);
+       *posix_perms |= MAP_PERM(other_ace->perms, S_IRUSR, S_IROTH);
+       *posix_perms |= MAP_PERM(other_ace->perms, S_IWUSR, S_IWOTH);
+       *posix_perms |= MAP_PERM(other_ace->perms, S_IXUSR, S_IXOTH);
+
+       /* The owner must have at least read access. */
+
+       *posix_perms |= S_IRUSR;
+       if (fsp->is_directory)
+               *posix_perms |= (S_IWUSR|S_IXUSR);
+
+       /* If requested apply the masks. */
+
+       /* Get the initial bits to apply. */
+
+       if (fsp->is_directory) {
+               and_bits = lp_dir_security_mask(snum);
+               or_bits = lp_force_dir_security_mode(snum);
+       } else {
+               and_bits = lp_security_mask(snum);
+               or_bits = lp_force_security_mode(snum);
+       }
+
+       *posix_perms = (((*posix_perms) & and_bits)|or_bits);
+
+       DEBUG(10,("convert_canon_ace_to_posix_perms: converted u=%o,g=%o,w=%o to perm=0%o for file %s.\n",
+               (int)owner_ace->perms, (int)group_ace->perms, (int)other_ace->perms, (int)*posix_perms,
+               fsp->fsp_name ));
+
+       return True;
+}
+
+/****************************************************************************
+  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
+  with CI|OI set so it is inherited and also applies to the directory.
+  Based on code from "Jim McDonough" <jmcd@us.ibm.com>.
+****************************************************************************/
+
+static size_t merge_default_aces( SEC_ACE *nt_ace_list, size_t num_aces)
+{
+       size_t i, j;
+
+       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) &&
+                               (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))) {
+                               /*
+                                * 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.
+                                */
+
+                               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;
                        }
                }
        }
 
-       return list_head;
+       return num_aces;
 }
-
 /****************************************************************************
  Reply to query a security descriptor from an fsp. If it succeeds it allocates
  the space for the return elements and returns the size needed to return the
@@ -543,21 +2625,19 @@ static canon_ace *canonicalise_acl( SMB_ACL_T posix_acl, SMB_STRUCT_STAT *psbuf)
  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_World;
+       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;
+       SEC_ACE *nt_ace_list = NULL;
        DOM_SID owner_sid;
        DOM_SID group_sid;
        size_t sd_size = 0;
        SEC_ACL *psa = NULL;
-       SEC_ACCESS owner_access;
-       int owner_acl_type;
-       SEC_ACCESS group_access;
-       int grp_acl_type;
-       SEC_ACCESS other_access;
-       int other_acl_type;
        size_t num_acls = 0;
        size_t num_dir_acls = 0;
        size_t num_aces = 0;
@@ -565,127 +2645,312 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
        SMB_ACL_T dir_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) {
 
                /* Get the stat struct for the owner info. */
-               if(vfs_stat(fsp,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 = sys_acl_get_file( dos_to_unix(fsp->fsp_name, False), 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 = sys_acl_get_file( dos_to_unix(fsp->fsp_name, False), SMB_ACL_TYPE_DEFAULT);
+               if(fsp->is_directory) {
+                       dir_acl = SMB_VFS_SYS_ACL_GET_FILE(conn, fsp->fsp_name, SMB_ACL_TYPE_DEFAULT);
+                       dir_acl = free_empty_sys_acl(conn, dir_acl);
+               }
 
        } else {
 
                /* Get the stat struct for the owner info. */
-               if(fsp->conn->vfs_ops.fstat(fsp->fd,&sbuf) != 0) {
+               if(SMB_VFS_FSTAT(fsp,fsp->fd,&sbuf) != 0) {
                        return 0;
                }
                /*
                 * Get the ACL from the fd.
                 */
-               posix_acl = sys_acl_get_fd(fsp->fd);
+               posix_acl = SMB_VFS_SYS_ACL_GET_FD(fsp, fsp->fd);
        }
 
+       DEBUG(5,("get_nt_acl : file ACL %s, directory ACL %s\n",
+                       posix_acl ? "present" :  "absent",
+                       dir_acl ? "present" :  "absent" ));
+
+       pal = load_inherited_info(fsp);
+
        /*
         * Get the owner, group and world SIDs.
         */
 
-       create_file_sids(&sbuf, &owner_sid, &group_sid);
+       if (lp_profile_acls(SNUM(fsp->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);
+               num_profile_acls = 2;
+       } else {
+               create_file_sids(&sbuf, &owner_sid, &group_sid);
+       }
+
+       if ((security_info & DACL_SECURITY_INFORMATION) && !(security_info & PROTECTED_DACL_SECURITY_INFORMATION)) {
 
-       /* Create the canon_ace lists. */
-       if (posix_acl)
-               file_ace = canonicalise_acl( posix_acl, &sbuf);
-       else
-               file_ace = unix_canonicalise_acl(fsp, &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. 
+                */
 
-       num_acls = count_canon_ace_list(file_ace);
+               /* Create the canon_ace lists. */
+               file_ace = canonicalise_acl( fsp, posix_acl, &sbuf, &owner_sid, &group_sid, pal, SMB_ACL_TYPE_ACCESS );
 
-       if (fsp->is_directory) { 
-               if (dir_ace)
-                       dir_ace = canonicalise_acl( dir_acl, &sbuf);
-               else
-                       dir_ace = unix_canonicalise_acl(fsp, &sbuf, &owner_sid, &group_sid);
+               /* 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;
+               }
 
-               num_dir_acls = count_canon_ace_list(dir_ace);
-       }
+               if (fsp->is_directory && dir_acl) {
+                       dir_ace = canonicalise_acl(fsp, dir_acl, &sbuf,
+                                       &global_sid_Creator_Owner,
+                                       &global_sid_Creator_Group, pal, SMB_ACL_TYPE_DEFAULT );
+               }
 
-       /* Allocate the ace list. */
-       if ((nt_ace_list = (SEC_ACE *)malloc((num_acls + num_dir_acls)* sizeof(SEC_ACE))) == NULL) {
-               DEBUG(0,("get_nt_acl: Unable to malloc space for nt_ace_list.\n"));
-               goto done:
-       }
+               /*
+                * Create the NT ACE list from the canonical ace lists.
+                */
 
-       memset(nt_ace_list, '\0', (num_acls + num_dir_acls) * sizeof(SEC_ACE) );
+               {
+                       canon_ace *ace;
+                       int nt_acl_type;
+                       int i;
+
+                       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(dir_ace, SMB_ACL_OTHER, NULL);
+                               if (ace && !ace->perms) {
+                                       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);
+                                       }
+                               }
 
-       /*
-        * Create the NT ACE list from the canonical ace lists.
-        */
+                               /*
+                                * 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);
+                               }
+#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);
+                               }
+                       }
+
+                       num_acls = count_canon_ace_list(file_ace);
+                       num_dir_acls = count_canon_ace_list(dir_ace);
 
-       {
-               canon_ace *ace;
-               int nt_acl_type;
+                       /* 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;
+                       }
 
-               ace = file_ace;
+                       memset(nt_ace_list, '\0', (num_acls + num_dir_acls) * sizeof(SEC_ACE) );
+                                                                                                       
+                       /*
+                        * Create the NT ACE list from the canonical ace lists.
+                        */
+       
+                       ace = file_ace;
 
-               for (i = 0; i < num_acls; i++, ace = ace->next) {
-                       SEC_ACCESS acc = map_canon_ace_perms(&nt_acl_type, &owner_sid, ace );
-                       init_sec_ace(&nt_ace_list[num_aces++], &ace->sid, nt_acl_type, acc, 0);
-               }
+                       for (i = 0; i < num_acls; i++, ace = ace->next) {
+                               SEC_ACCESS acc;
+
+                               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, ace->inherited ? SEC_ACE_FLAG_INHERITED_ACE : 0);
+                       }
+
+                       /* 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, 0);
+                       }
+
+                       ace = dir_ace;
+
+                       for (i = 0; i < num_dir_acls; i++, ace = ace->next) {
+                               SEC_ACCESS acc;
+       
+                               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|
+                                               (ace->inherited ? SEC_ACE_FLAG_INHERITED_ACE : 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;
+                       
+                               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);
+                       }
+
+                       /*
+                        * 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);
 
-               for (i = 0; i < num_dir_acls; i++, ace = ace->next) {
-                       SEC_ACCESS acc = map_canon_ace_perms(&nt_acl_type, &owner_sid, ace );
-                       init_sec_ace(&nt_ace_list[num_aces++], &ace->sid, nt_acl_type, acc, 
-                                       SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY);
                }
-       }
 
-       if (num_acls) {
-               if((psa = make_sec_acl( ACL_REVISION, num_aces, ace_list)) == NULL) {
-                       DEBUG(0,("get_nt_acl: Unable to malloc space for acl.\n"));
-                       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;
+                       }
                }
-       }
+       } /* security_info & DACL_SECURITY_INFORMATION */
 
-       *ppdesc = make_standard_sec_desc( &owner_sid, &group_sid, psa, &sd_size);
+       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(!*ppdesc) {
+       if(!psd) {
                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.
+                */
+               if (get_protected_flag(pal))
+                       psd->type |= SE_DESC_DACL_PROTECTED;
        }
 
-  done:
+       if (psd->dacl)
+               dacl_sort_into_canonical_order(psd->dacl->ace, (unsigned int)psd->dacl->num_aces);
 
-       if (posix_acl)  
-               sys_acl_free(posix_acl);
-       if (directory_acl)
-               sys_acl_free(directory_acl);
-       if (file_ace)
-               free_canon_ace_list(file_ace);
-       if (dir_ace)
-               free_canon_ace_list(dir_ace);
-       if (nt_ace_list)
-               free(nt_ace_list);
-       if (psa)
-               free_sec_acl(&psa);
+       *ppdesc = psd;
+
+ done:
+
+       if (posix_acl)
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
+       if (dir_acl)
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, dir_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;
 }
 
+/****************************************************************************
+ 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
+     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;
+
+       /* try the direct way first */
+       ret = SMB_VFS_CHOWN(conn, fname, uid, gid);
+       if (ret == 0)
+               return 0;
+
+       if(!CAN_WRITE(conn) || !lp_dos_filemode(SNUM(conn)))
+               return -1;
+
+       if (SMB_VFS_STAT(conn,fname,&st))
+               return -1;
+
+       fsp = open_file_fchmod(conn,fname,&st);
+       if (!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;
+
+       become_root();
+       /* Keep the current file gid the same. */
+       ret = SMB_VFS_FCHOWN(fsp, fsp->fd, uid, (gid_t)-1);
+       unbecome_root();
+
+       close_file_fchmod(fsp);
+
+       return ret;
+}
+
 /****************************************************************************
  Reply to set a security descriptor on an fsp. security_info_sent is the
  description of the following NT ACL.
@@ -694,131 +2959,384 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
 
 BOOL set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
 {
-  connection_struct *conn = fsp->conn;
-  uid_t user = (uid_t)-1;
-  gid_t grp = (gid_t)-1;
-  mode_t perms = 0;
-  SMB_STRUCT_STAT sbuf;  
-  BOOL got_dacl = False;
-
-  /*
-   * Get the current state of the file.
-   */
+       connection_struct *conn = fsp->conn;
+       uid_t user = (uid_t)-1;
+       gid_t grp = (gid_t)-1;
+       SMB_STRUCT_STAT sbuf;  
+       DOM_SID file_owner_sid;
+       DOM_SID file_grp_sid;
+       canon_ace *file_ace_list = NULL;
+       canon_ace *dir_ace_list = NULL;
+       BOOL acl_perms = False;
+       mode_t orig_mode = (mode_t)0;
+       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 ));
+
+       if (!CAN_WRITE(conn)) {
+               DEBUG(10,("set acl rejected on read-only share\n"));
+               return False;
+       }
 
-  if(fsp->is_directory) {
-    if(dos_stat(fsp->fsp_name, &sbuf) != 0)
-      return False;
-  } else {
+       /*
+        * Get the current state of the file.
+        */
 
-    int ret;
+       if(fsp->is_directory || fsp->fd == -1) {
+               if(SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf) != 0)
+                       return False;
+       } else {
+               if(SMB_VFS_FSTAT(fsp,fsp->fd,&sbuf) != 0)
+                       return False;
+       }
 
-    if(fsp->fd == -1)
-      ret = conn->vfs_ops.stat(dos_to_unix(fsp->fsp_name,False), &sbuf);
-    else
-      ret = conn->vfs_ops.fstat(fsp->fd,&sbuf);
+       /* Save the original elements we check against. */
+       orig_mode = sbuf.st_mode;
+       orig_uid = sbuf.st_uid;
+       orig_gid = sbuf.st_gid;
 
-    if(ret != 0)
-      return False;
-  }
+       /*
+        * Unpack the user/group/world id's.
+        */
 
-  /*
-   * Unpack the user/group/world id's and permissions.
-   */
+       if (!unpack_nt_owners( &sbuf, &user, &grp, security_info_sent, psd))
+               return False;
 
-  if (!unpack_nt_permissions( &sbuf, &user, &grp, &perms, security_info_sent, psd, fsp->is_directory))
-    return False;
+       /*
+        * Do we need to chown ?
+        */
 
-  if (psd->dacl != NULL)
-    got_dacl = True;
+       if (((user != (uid_t)-1) && (orig_uid != user)) || (( grp != (gid_t)-1) && (orig_gid != grp)))
+               need_chown = True;
 
-  /*
-   * Do we need to chown ?
-   */
+       /*
+        * Chown before setting ACL only if we don't change the user, or
+        * if we change to the current user, but not if we want to give away
+        * the file.
+        */
 
-  if((user != (uid_t)-1 || grp != (uid_t)-1) && (sbuf.st_uid != user || sbuf.st_gid != grp)) {
+       if (need_chown && (user == (uid_t)-1 || user == current_user.uid)) {
 
-    DEBUG(3,("call_nt_transact_set_security_desc: chown %s. uid = %u, gid = %u.\n",
-          fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
+               DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
+                               fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
 
-    if(dos_chown( fsp->fsp_name, user, grp) == -1) {
-      DEBUG(3,("call_nt_transact_set_security_desc: chown %s, %u, %u failed. Error = %s.\n",
-            fsp->fsp_name, (unsigned int)user, (unsigned int)grp, strerror(errno) ));
-      return False;
-    }
+               if(try_chown( fsp->conn, fsp->fsp_name, user, grp) == -1) {
+                       DEBUG(3,("set_nt_acl: chown %s, %u, %u failed. Error = %s.\n",
+                               fsp->fsp_name, (unsigned int)user, (unsigned int)grp, strerror(errno) ));
+                       return False;
+               }
 
-    /*
-     * Recheck the current state of the file, which may have changed.
-     * (suid/sgid bits, for instance)
-     */
+               /*
+                * Recheck the current state of the file, which may have changed.
+                * (suid/sgid bits, for instance)
+                */
 
-    if(fsp->is_directory) {
-      if(dos_stat(fsp->fsp_name, &sbuf) != 0) {
-        return False;
-      }
-    } else {
+               if(fsp->is_directory) {
+                       if(SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf) != 0) {
+                               return False;
+                       }
+               } else {
 
-      int ret;
+                       int ret;
     
-      if(fsp->fd == -1)
-        ret = conn->vfs_ops.stat(dos_to_unix(fsp->fsp_name,False), &sbuf);
-      else
-        ret = conn->vfs_ops.fstat(fsp->fd,&sbuf);
+                       if(fsp->fd == -1)
+                               ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
+                       else
+                               ret = SMB_VFS_FSTAT(fsp,fsp->fd,&sbuf);
   
-      if(ret != 0)
-        return False;
-    }
-  }
+                       if(ret != 0)
+                               return False;
+               }
+
+               /* Save the original elements we check against. */
+               orig_mode = sbuf.st_mode;
+               orig_uid = sbuf.st_uid;
+               orig_gid = sbuf.st_gid;
+
+               /* We did it, don't try again */
+               need_chown = False;
+       }
+
+       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);
+
+       /* Ignore W2K traverse DACL set. */
+       if (file_ace_list || dir_ace_list) {
+
+               if (!acl_perms) {
+                       DEBUG(3,("set_nt_acl: cannot set permissions\n"));
+                       free_canon_ace_list(file_ace_list);
+                       free_canon_ace_list(dir_ace_list); 
+                       return False;
+               }
+
+               /*
+                * Only change security if we got a DACL.
+                */
+
+               if((security_info_sent & DACL_SECURITY_INFORMATION) && (psd->dacl != NULL)) {
+
+                       BOOL acl_set_support = False;
+                       BOOL ret = False;
+
+                       /*
+                        * Try using the POSIX ACL set first. Fall back to chmod if
+                        * we have no ACL support on this filesystem.
+                        */
+
+                       if (acl_perms && file_ace_list) {
+                               ret = set_canon_ace_list(fsp, file_ace_list, False, &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);
+                                       free_canon_ace_list(dir_ace_list); 
+                                       return False;
+                               }
+                       }
+
+                       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)) {
+                                               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); 
+                                               return False;
+                                       }
+                               } else {
+
+                                       /*
+                                        * No default ACL - delete one if it exists.
+                                        */
+
+                                       if (SMB_VFS_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 (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.
+                        */
+
+                       if(!acl_set_support && acl_perms) {
+                               mode_t posix_perms;
+
+                               if (!convert_canon_ace_to_posix_perms( fsp, file_ace_list, &posix_perms)) {
+                                       free_canon_ace_list(file_ace_list);
+                                       free_canon_ace_list(dir_ace_list);
+                                       DEBUG(3,("set_nt_acl: failed to convert file acl to posix permissions for file %s.\n",
+                                               fsp->fsp_name ));
+                                       return False;
+                               }
+
+                               if (orig_mode != posix_perms) {
+
+                                       DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
+                                               fsp->fsp_name, (unsigned int)posix_perms ));
+
+                                       if(SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms) == -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); 
+       }
+
+       /* Any chown pending? */
+       if (need_chown) {
+
+               DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
+                       fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
+
+               if(try_chown( fsp->conn, fsp->fsp_name, user, grp) == -1) {
+                       DEBUG(3,("set_nt_acl: chown %s, %u, %u failed. Error = %s.\n",
+                               fsp->fsp_name, (unsigned int)user, (unsigned int)grp, strerror(errno) ));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+/****************************************************************************
+ 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.
+****************************************************************************/
+
+static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mode_t mode)
+{
+       int entry_id = SMB_ACL_FIRST_ENTRY;
+       SMB_ACL_ENTRY_T entry;
+       int num_entries = 0;
+
+       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;
+
+               /* 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)
+                       return -1;
+
+               if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, entry, &permset) == -1)
+                       return -1;
+
+               num_entries++;
+
+               switch(tagtype) {
+                       case SMB_ACL_USER_OBJ:
+                               perms = unix_perms_to_acl_perms(mode, S_IRUSR, S_IWUSR, S_IXUSR);
+                               break;
+                       case SMB_ACL_GROUP_OBJ:
+                               perms = unix_perms_to_acl_perms(mode, S_IRGRP, S_IWGRP, S_IXGRP);
+                               break;
+                       case SMB_ACL_MASK:
+                               /*
+                                * FIXME: The ACL_MASK entry permissions should really be set to
+                                * the union of the permissions of all ACL_USER,
+                                * ACL_GROUP_OBJ, and ACL_GROUP entries. That's what
+                                * acl_calc_mask() does, but Samba ACLs doesn't provide it.
+                                */
+                               perms = S_IRUSR|S_IWUSR|S_IXUSR;
+                               break;
+                       case SMB_ACL_OTHER:
+                               perms = unix_perms_to_acl_perms(mode, S_IROTH, S_IWOTH, S_IXOTH);
+                               break;
+                       default:
+                               continue;
+               }
+
+               if (map_acl_perms_to_permset(conn, perms, &permset) == -1)
+                       return -1;
+
+               if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, entry, permset) == -1)
+                       return -1;
+       }
+
+       /*
+        * If this is a simple 3 element ACL or no elements then it's a standard
+        * UNIX permission set. Just use chmod...       
+        */
+
+       if ((num_entries == 3) || (num_entries == 0))
+               return -1;
+
+       return 0;
+}
+
+/****************************************************************************
+ Get the access ACL of FROM, do a chmod by setting the ACL USER_OBJ,
+ GROUP_OBJ and OTHER bits in an ACL and set the mask to rwx. Set the
+ resulting ACL on TO.  Note that name is in UNIX character set.
+****************************************************************************/
+
+static int copy_access_acl(connection_struct *conn, const char *from, const char *to, mode_t mode)
+{
+       SMB_ACL_T posix_acl = NULL;
+       int ret = -1;
+
+       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 = SMB_VFS_SYS_ACL_SET_FILE(conn, to, SMB_ACL_TYPE_ACCESS, posix_acl);
+
+ done:
+
+       SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
+       return ret;
+}
+
+/****************************************************************************
+ 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.
+ Note that name is in UNIX character set.
+****************************************************************************/
+
+int chmod_acl(connection_struct *conn, const char *name, mode_t mode)
+{
+       return copy_access_acl(conn, name, name, mode);
+}
 
-  /*
-   * Only change security if we got a DACL.
-   */
+/****************************************************************************
+ If "inherit permissions" is set and the parent directory has no default
+ ACL but it does have an Access ACL, inherit this Access ACL to file name.
+****************************************************************************/
 
-  if((security_info_sent & DACL_SECURITY_INFORMATION) && got_dacl) {
+int inherit_access_acl(connection_struct *conn, const char *name, mode_t mode)
+{
+       pstring dirname;
+       pstrcpy(dirname, parent_dirname(name));
 
-    /*
-     * Check to see if we need to change anything.
-     * Enforce limits on modified bits *only*. Don't enforce masks
-        * on bits not changed by the user.
-     */
+       if (!lp_inherit_perms(SNUM(conn)) || directory_has_default_acl(conn, dirname))
+               return 0;
 
-    if(fsp->is_directory) {
+       return copy_access_acl(conn, dirname, name, mode);
+}
 
-      perms &= (lp_dir_security_mask(SNUM(conn)) | sbuf.st_mode);
-      perms |= (lp_force_dir_security_mode(SNUM(conn)) & ( perms ^ sbuf.st_mode ));
+/****************************************************************************
+ Do an fchmod 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.
+****************************************************************************/
 
-    } else {
+int fchmod_acl(files_struct *fsp, int fd, mode_t mode)
+{
+       connection_struct *conn = fsp->conn;
+       SMB_ACL_T posix_acl = NULL;
+       int ret = -1;
 
-      perms &= (lp_security_mask(SNUM(conn)) | sbuf.st_mode); 
-      perms |= (lp_force_security_mode(SNUM(conn)) & ( perms ^ sbuf.st_mode ));
+       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;
 
-    /*
-     * Preserve special bits.
-     */
+       ret = SMB_VFS_SYS_ACL_SET_FD(fsp, fd, posix_acl);
 
-    perms |= (sbuf.st_mode & ~0777);
+  done:
 
-    /*
-     * Do we need to chmod ?
-     */
+       SMB_VFS_SYS_ACL_FREE_ACL(conn, posix_acl);
+       return ret;
+}
 
-    if(sbuf.st_mode != perms) {
+/****************************************************************************
+ Check for an existing default POSIX ACL on a directory.
+****************************************************************************/
 
-      DEBUG(3,("call_nt_transact_set_security_desc: chmod %s. perms = 0%o.\n",
-            fsp->fsp_name, (unsigned int)perms ));
+BOOL directory_has_default_acl(connection_struct *conn, const char *fname)
+{
+        SMB_ACL_T dir_acl = SMB_VFS_SYS_ACL_GET_FILE( conn, fname, SMB_ACL_TYPE_DEFAULT);
+        BOOL has_acl = False;
+        SMB_ACL_ENTRY_T entry;
 
-      if(conn->vfs_ops.chmod(dos_to_unix(fsp->fsp_name, False), perms) == -1) {
-        DEBUG(3,("call_nt_transact_set_security_desc: chmod %s, 0%o failed. Error = %s.\n",
-              fsp->fsp_name, (unsigned int)perms, strerror(errno) ));
-        return False;
-      }
-    }
-  }
+        if (dir_acl != NULL && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, dir_acl, SMB_ACL_FIRST_ENTRY, &entry) == 1))
+                has_acl = True;
 
-  return True;
+       if (dir_acl)
+               SMB_VFS_SYS_ACL_FREE_ACL(conn, dir_acl);
+        return has_acl;
 }
-#undef OLD_NTDOMAIN
-#else /* HAVE_POSIX_ACLS */
- void dummy_posix_acls(void) {;} /* So some compilers don't complain. */
-#endif /* HAVE_POSIX_ACLS */