s3:afs make path argument to afs_syscall const
[mat/samba.git] / source3 / modules / vfs_afsacl.c
index 3e57a88ed3634fc0ea33444cad838aa9ac5ff6fc..8923c62b4c3cf06fe02108eddcb163fe272d2392 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
  * Convert AFS acls to NT acls and vice versa.
  *
  * Copyright (C) Volker Lendecke, 2003
@@ -7,17 +7,23 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "smbd/smbd.h"
+#include "../librpc/gen_ndr/lsa.h"
+#include "../libcli/security/security.h"
+#include "../libcli/security/dom_sid.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 #include <afs/venus.h>
 #include <afs/prs_fs.h>
 
-#define MAXSIZE 2048
+#define MAXSIZE 2049
 
-extern const DOM_SID global_sid_World;
-extern const DOM_SID global_sid_Builtin_Administrators;
-extern const DOM_SID global_sid_Builtin_Backup_Operators;
-extern const DOM_SID global_sid_Authenticated_Users;
-extern const DOM_SID global_sid_NULL;
+extern const struct dom_sid global_sid_World;
+extern const struct dom_sid global_sid_Builtin_Administrators;
+extern const struct dom_sid global_sid_Builtin_Backup_Operators;
+extern const struct dom_sid global_sid_Authenticated_Users;
+extern const struct dom_sid global_sid_NULL;
 
 static char space_replacement = '%';
 
 /* Do we expect SIDs as pts names? */
 static bool sidpts;
 
-extern int afs_syscall(int, char *, int, char *, int);
+extern int afs_syscall(int, const char *, int, char *, int);
 
 struct afs_ace {
        bool positive;
        char *name;
-       DOM_SID sid;
+       struct dom_sid sid;
        enum lsa_SidType type;
        uint32 rights;
        struct afs_ace *next;
@@ -71,9 +77,9 @@ static bool init_afs_acl(struct afs_acl *acl)
        acl->ctx = talloc_init("afs_acl");
        if (acl->ctx == NULL) {
                DEBUG(10, ("Could not init afs_acl"));
-               return False;
+               return false;
        }
-       return True;
+       return true;
 }
 
 static void free_afs_acl(struct afs_acl *acl)
@@ -87,7 +93,7 @@ static void free_afs_acl(struct afs_acl *acl)
 
 static struct afs_ace *clone_afs_ace(TALLOC_CTX *mem_ctx, struct afs_ace *ace)
 {
-       struct afs_ace *result = TALLOC_P(mem_ctx, struct afs_ace);
+       struct afs_ace *result = talloc(mem_ctx, struct afs_ace);
 
        if (result == NULL)
                return NULL;
@@ -108,7 +114,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
                                   bool positive,
                                   const char *name, uint32 rights)
 {
-       DOM_SID sid;
+       struct dom_sid sid;
        enum lsa_SidType type;
        struct afs_ace *result;
 
@@ -165,7 +171,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
                }
        }
 
-       result = TALLOC_P(mem_ctx, struct afs_ace);
+       result = talloc(mem_ctx, struct afs_ace);
 
        if (result == NULL) {
                DEBUG(0, ("Could not talloc AFS ace\n"));
@@ -232,27 +238,27 @@ static bool parse_afs_acl(struct afs_acl *acl, const char *acl_str)
        int nplus, nminus;
        int aces;
 
-       char str[MAXSIZE+1];
+       char str[MAXSIZE];
        char *p = str;
 
-       strncpy(str, acl_str, MAXSIZE);
+       strlcpy(str, acl_str, MAXSIZE);
 
        if (sscanf(p, "%d", &nplus) != 1)
-               return False;
+               return false;
 
        DEBUG(10, ("Found %d positive entries\n", nplus));
 
        if ((p = strchr(p, '\n')) == NULL)
-               return False;
+               return false;
        p += 1;
 
        if (sscanf(p, "%d", &nminus) != 1)
-               return False;
+               return false;
        
        DEBUG(10, ("Found %d negative entries\n", nminus));
 
        if ((p = strchr(p, '\n')) == NULL)
-               return False;
+               return false;
        p += 1;
 
        for (aces = nplus+nminus; aces > 0; aces--)
@@ -266,15 +272,15 @@ static bool parse_afs_acl(struct afs_acl *acl, const char *acl_str)
                namep = p;
 
                if ((p = strchr(p, '\t')) == NULL)
-                       return False;
+                       return false;
                *p = '\0';
                p += 1;
 
                if (sscanf(p, "%d", &rights) != 1)
-                       return False;
+                       return false;
 
                if ((p = strchr(p, '\n')) == NULL)
-                       return False;
+                       return false;
                p += 1;
 
                fstrcpy(name, namep);
@@ -287,7 +293,7 @@ static bool parse_afs_acl(struct afs_acl *acl, const char *acl_str)
                nplus -= 1;
        }
 
-       return True;
+       return true;
 }
 
 static bool unparse_afs_acl(struct afs_acl *acl, char *acl_str)
@@ -297,11 +303,10 @@ static bool unparse_afs_acl(struct afs_acl *acl, char *acl_str)
        int positives = 0;
        int negatives = 0;
        fstring line;
+       struct afs_ace *ace = acl->acelist;
 
        *acl_str = 0;
 
-       struct afs_ace *ace = acl->acelist;
-
        while (ace != NULL) {
                if (ace->positive)
                        positives++;
@@ -311,19 +316,19 @@ static bool unparse_afs_acl(struct afs_acl *acl, char *acl_str)
        }
 
        fstr_sprintf(line, "%d\n", positives);
-       safe_strcat(acl_str, line, MAXSIZE);
+       strlcat(acl_str, line, MAXSIZE);
 
        fstr_sprintf(line, "%d\n", negatives);
-       safe_strcat(acl_str, line, MAXSIZE);
+       strlcat(acl_str, line, MAXSIZE);
 
        ace = acl->acelist;
 
        while (ace != NULL) {
                fstr_sprintf(line, "%s\t%d\n", ace->name, ace->rights);
-               safe_strcat(acl_str, line, MAXSIZE);
+               strlcat(acl_str, line, MAXSIZE);
                ace = ace->next;
        }
-       return True;
+       return true;
 }
 
 static uint32 afs_to_nt_file_rights(uint32 rights)
@@ -417,7 +422,7 @@ static void split_afs_acl(struct afs_acl *acl,
 static bool same_principal(struct afs_ace *x, struct afs_ace *y)
 {
        return ( (x->positive == y->positive) &&
-                (sid_compare(&x->sid, &y->sid) == 0) );
+                (dom_sid_compare(&x->sid, &y->sid) == 0) );
 }
 
 static void merge_afs_acls(struct afs_acl *dir_acl,
@@ -430,7 +435,7 @@ static void merge_afs_acls(struct afs_acl *dir_acl,
 
        for (ace = dir_acl->acelist; ace != NULL; ace = ace->next) {
                struct afs_ace *file_ace;
-               bool found = False;
+               bool found = false;
 
                for (file_ace = file_acl->acelist;
                     file_ace != NULL;
@@ -440,7 +445,7 @@ static void merge_afs_acls(struct afs_acl *dir_acl,
 
                        add_afs_ace(target, ace->positive, ace->name,
                                    ace->rights | file_ace->rights);
-                       found = True;
+                       found = true;
                        break;
                }
                if (!found)
@@ -450,14 +455,14 @@ static void merge_afs_acls(struct afs_acl *dir_acl,
 
        for (ace = file_acl->acelist; ace != NULL; ace = ace->next) {
                struct afs_ace *dir_ace;
-               bool already_seen = False;
+               bool already_seen = false;
 
                for (dir_ace = dir_acl->acelist;
                     dir_ace != NULL;
                     dir_ace = dir_ace->next) {
                        if (!same_principal(ace, dir_ace))
                                continue;
-                       already_seen = True;
+                       already_seen = true;
                        break;
                }
                if (!already_seen)
@@ -514,7 +519,7 @@ static struct static_dir_ace_mapping {
 
        /* FULL inherit only -- counterpart to previous one */
        { 0, SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY,
-         PERMS_FULL | GENERIC_RIGHT_WRITE_ACCESS, 127 /* rlidwka */ },
+         PERMS_FULL | SEC_GENERIC_WRITE, 127 /* rlidwka */ },
 
        /* CHANGE without inheritance -- in all cases here we also get
           the corresponding INHERIT_ONLY ACE in the same ACL */
@@ -522,13 +527,13 @@ static struct static_dir_ace_mapping {
 
        /* CHANGE inherit only -- counterpart to previous one */
        { 0, SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY,
-         PERMS_CHANGE | GENERIC_RIGHT_WRITE_ACCESS, 63 /* rlidwk */ },
+         PERMS_CHANGE | SEC_GENERIC_WRITE, 63 /* rlidwk */ },
 
        /* End marker, hopefully there's no afs right 9999 :-) */
        { 0, 0, 0, 9999 }
 };
 
-static uint32 nt_to_afs_dir_rights(const char *filename, const SEC_ACE *ace)
+static uint32 nt_to_afs_dir_rights(const char *filename, const struct security_ace *ace)
 {
        uint32 result = 0;
        uint32 rights = ace->access_mask;
@@ -569,7 +574,7 @@ static uint32 nt_to_afs_dir_rights(const char *filename, const SEC_ACE *ace)
        return result;
 }
 
-static uint32 nt_to_afs_file_rights(const char *filename, const SEC_ACE *ace)
+static uint32 nt_to_afs_file_rights(const char *filename, const struct security_ace *ace)
 {
        uint32 result = 0;
        uint32 rights = ace->access_mask;
@@ -585,38 +590,25 @@ static uint32 nt_to_afs_file_rights(const char *filename, const SEC_ACE *ace)
        return result;
 }
 
-static size_t afs_to_nt_acl(struct afs_acl *afs_acl, 
-                           struct files_struct *fsp,
-                           uint32 security_info,
-                           struct security_descriptor **ppdesc)
+static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
+                                  SMB_STRUCT_STAT *psbuf,
+                                  uint32 security_info,
+                                  struct security_descriptor **ppdesc)
 {
-       SEC_ACE *nt_ace_list;
-       DOM_SID owner_sid, group_sid;
-       SEC_ACCESS mask;
-       SMB_STRUCT_STAT sbuf;
-       SEC_ACL *psa = NULL;
+       struct security_ace *nt_ace_list;
+       struct dom_sid owner_sid, group_sid;
+       struct security_acl *psa = NULL;
        int good_aces;
        size_t sd_size;
        TALLOC_CTX *mem_ctx = talloc_tos();
 
        struct afs_ace *afs_ace;
 
-       if (fsp->is_directory || fsp->fh->fd == -1) {
-               /* Get the stat struct for the owner info. */
-               if(SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf) != 0) {
-                       return 0;
-               }
-       } else {
-               if(SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf) != 0) {
-                       return 0;
-               }
-       }
-
-       uid_to_sid(&owner_sid, sbuf.st_uid);
-       gid_to_sid(&group_sid, sbuf.st_gid);
+       uid_to_sid(&owner_sid, psbuf->st_ex_uid);
+       gid_to_sid(&group_sid, psbuf->st_ex_gid);
 
        if (afs_acl->num_aces) {
-               nt_ace_list = TALLOC_ARRAY(mem_ctx, SEC_ACE, afs_acl->num_aces);
+               nt_ace_list = talloc_array(mem_ctx, struct security_ace, afs_acl->num_aces);
 
                if (nt_ace_list == NULL)
                        return 0;
@@ -628,7 +620,7 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
        good_aces = 0;
 
        while (afs_ace != NULL) {
-               uint32 nt_rights;
+               uint32_t nt_rights;
                uint8 flag = SEC_ACE_FLAG_OBJECT_INHERIT |
                        SEC_ACE_FLAG_CONTAINER_INHERIT;
 
@@ -639,15 +631,14 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
                        continue;
                }
 
-               if (fsp->is_directory)
+               if (S_ISDIR(psbuf->st_ex_mode))
                        afs_to_nt_dir_rights(afs_ace->rights, &nt_rights,
                                             &flag);
                else
                        nt_rights = afs_to_nt_file_rights(afs_ace->rights);
 
-               init_sec_access(&mask, nt_rights);
                init_sec_ace(&nt_ace_list[good_aces++], &(afs_ace->sid),
-                            SEC_ACE_TYPE_ACCESS_ALLOWED, mask, flag);
+                            SEC_ACE_TYPE_ACCESS_ALLOWED, nt_rights, flag);
                afs_ace = afs_ace->next;
        }
 
@@ -656,96 +647,137 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
        if (psa == NULL)
                return 0;
 
-       
-       *ppdesc = make_sec_desc(mem_ctx, SEC_DESC_REVISION,
+       *ppdesc = make_sec_desc(mem_ctx, SD_REVISION,
                                SEC_DESC_SELF_RELATIVE,
-                               (security_info & OWNER_SECURITY_INFORMATION)
+                               (security_info & SECINFO_OWNER)
                                ? &owner_sid : NULL,
-                               (security_info & GROUP_SECURITY_INFORMATION)
+                               (security_info & SECINFO_GROUP)
                                ? &group_sid : NULL,
                                NULL, psa, &sd_size);
 
        return sd_size;
 }
 
-static bool mappable_sid(const DOM_SID *sid)
+static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
+                           struct connection_struct *conn,
+                           struct smb_filename *smb_fname,
+                           uint32 security_info,
+                           struct security_descriptor **ppdesc)
+{
+       int ret;
+
+       /* Get the stat struct for the owner info. */
+       if (lp_posix_pathnames()) {
+               ret = SMB_VFS_LSTAT(conn, smb_fname);
+       } else {
+               ret = SMB_VFS_STAT(conn, smb_fname);
+       }
+       if (ret == -1) {
+               return 0;
+       }
+
+       return afs_to_nt_acl_common(afs_acl, &smb_fname->st, security_info,
+                                   ppdesc);
+}
+
+static size_t afs_fto_nt_acl(struct afs_acl *afs_acl,
+                            struct files_struct *fsp,
+                            uint32 security_info,
+                            struct security_descriptor **ppdesc)
 {
-       DOM_SID domain_sid;
+       SMB_STRUCT_STAT sbuf;
+
+       if (fsp->fh->fd == -1) {
+               /* Get the stat struct for the owner info. */
+               return afs_to_nt_acl(afs_acl, fsp->conn, fsp->fsp_name,
+                                    security_info, ppdesc);
+       }
+
+       if(SMB_VFS_FSTAT(fsp, &sbuf) != 0) {
+               return 0;
+       }
+
+       return afs_to_nt_acl_common(afs_acl, &sbuf, security_info, ppdesc);
+}
+
+static bool mappable_sid(const struct dom_sid *sid)
+{
+       struct dom_sid domain_sid;
        
-       if (sid_compare(sid, &global_sid_Builtin_Administrators) == 0)
-               return True;
+       if (dom_sid_compare(sid, &global_sid_Builtin_Administrators) == 0)
+               return true;
 
-       if (sid_compare(sid, &global_sid_World) == 0)
-               return True;
+       if (dom_sid_compare(sid, &global_sid_World) == 0)
+               return true;
 
-       if (sid_compare(sid, &global_sid_Authenticated_Users) == 0)
-               return True;
+       if (dom_sid_compare(sid, &global_sid_Authenticated_Users) == 0)
+               return true;
 
-       if (sid_compare(sid, &global_sid_Builtin_Backup_Operators) == 0)
-               return True;
+       if (dom_sid_compare(sid, &global_sid_Builtin_Backup_Operators) == 0)
+               return true;
 
        string_to_sid(&domain_sid, "S-1-5-21");
 
        if (sid_compare_domain(sid, &domain_sid) == 0)
-               return True;
+               return true;
 
-       return False;
+       return false;
 }
 
 static bool nt_to_afs_acl(const char *filename,
                          uint32 security_info_sent,
-                         struct security_descriptor *psd,
+                         const struct security_descriptor *psd,
                          uint32 (*nt_to_afs_rights)(const char *filename,
-                                                    const SEC_ACE *ace),
+                                                    const struct security_ace *ace),
                          struct afs_acl *afs_acl)
 {
-       SEC_ACL *dacl;
+       const struct security_acl *dacl;
        int i;
 
        /* Currently we *only* look at the dacl */
 
-       if (((security_info_sent & DACL_SECURITY_INFORMATION) == 0) ||
+       if (((security_info_sent & SECINFO_DACL) == 0) ||
            (psd->dacl == NULL))
-               return True;
+               return true;
 
        if (!init_afs_acl(afs_acl))
-               return False;
+               return false;
 
        dacl = psd->dacl;
 
        for (i = 0; i < dacl->num_aces; i++) {
-               SEC_ACE *ace = &(dacl->aces[i]);
+               const struct security_ace *ace = &(dacl->aces[i]);
                const char *dom_name, *name;
                enum lsa_SidType name_type;
                char *p;
 
                if (ace->type != SEC_ACE_TYPE_ACCESS_ALLOWED) {
                        /* First cut: Only positive ACEs */
-                       return False;
+                       return false;
                }
 
                if (!mappable_sid(&ace->trustee)) {
                        DEBUG(10, ("Ignoring unmappable SID %s\n",
-                                  sid_string_static(&ace->trustee)));
+                                  sid_string_dbg(&ace->trustee)));
                        continue;
                }
 
-               if (sid_compare(&ace->trustee,
+               if (dom_sid_compare(&ace->trustee,
                                &global_sid_Builtin_Administrators) == 0) {
 
                        name = "system:administrators";
 
-               } else if (sid_compare(&ace->trustee,
+               } else if (dom_sid_compare(&ace->trustee,
                                       &global_sid_World) == 0) {
 
                        name = "system:anyuser";
 
-               } else if (sid_compare(&ace->trustee,
+               } else if (dom_sid_compare(&ace->trustee,
                                       &global_sid_Authenticated_Users) == 0) {
 
                        name = "system:authuser";
 
-               } else if (sid_compare(&ace->trustee,
+               } else if (dom_sid_compare(&ace->trustee,
                                       &global_sid_Builtin_Backup_Operators)
                           == 0) {
 
@@ -756,7 +788,8 @@ static bool nt_to_afs_acl(const char *filename,
                        if (!lookup_sid(talloc_tos(), &ace->trustee,
                                        &dom_name, &name, &name_type)) {
                                DEBUG(1, ("AFSACL: Could not lookup SID %s on file %s\n",
-                                         sid_string_static(&ace->trustee), filename));
+                                         sid_string_dbg(&ace->trustee),
+                                         filename));
                                continue;
                        }
 
@@ -768,7 +801,7 @@ static bool nt_to_afs_acl(const char *filename,
                                                       dom_name, lp_winbind_separator(),
                                                       name);
                                if (tmp == NULL) {
-                                       return False;
+                                       return false;
                                }
                                strlower_m(tmp);
                                name = tmp;
@@ -778,9 +811,9 @@ static bool nt_to_afs_acl(const char *filename,
                                /* Expect all users/groups in pts as SIDs */
                                name = talloc_strdup(
                                        talloc_tos(),
-                                       sid_string_static(&ace->trustee));
+                                       sid_string_tos(&ace->trustee));
                                if (name == NULL) {
-                                       return False;
+                                       return false;
                                }
                        }
                }
@@ -788,11 +821,11 @@ static bool nt_to_afs_acl(const char *filename,
                while ((p = strchr_m(name, ' ')) != NULL)
                        *p = space_replacement;
 
-               add_afs_ace(afs_acl, True, name,
+               add_afs_ace(afs_acl, true, name,
                            nt_to_afs_rights(filename, ace));
        }
 
-       return True;
+       return true;
 }
 
 static bool afs_get_afs_acl(char *filename, struct afs_acl *acl)
@@ -814,40 +847,19 @@ static bool afs_get_afs_acl(char *filename, struct afs_acl *acl)
 
        if (ret) {
                DEBUG(1, ("got error from PIOCTL: %d\n", ret));
-               return False;
+               return false;
        }
 
        if (!init_afs_acl(acl))
-               return False;
+               return false;
 
        if (!parse_afs_acl(acl, space)) {
                DEBUG(1, ("Could not parse AFS acl\n"));
                free_afs_acl(acl);
-               return False;
+               return false;
        }
 
-       return True;
-}
-
-static NTSTATUS afs_get_nt_acl(struct files_struct *fsp, uint32 security_info,
-                              struct security_descriptor **ppdesc)
-{
-       struct afs_acl acl;
-       size_t sd_size;
-
-       DEBUG(5, ("afs_get_nt_acl: %s\n", fsp->fsp_name));
-
-       sidpts = lp_parm_bool(SNUM(fsp->conn), "afsacl", "sidpts", False);
-
-       if (!afs_get_afs_acl(fsp->fsp_name, &acl)) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
-
-       sd_size = afs_to_nt_acl(&acl, fsp, security_info, ppdesc);
-
-       free_afs_acl(&acl);
-
-       return (sd_size != 0) ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
+       return true;
 }
 
 /* For setting an AFS ACL we have to take care of the ACEs we could
@@ -884,11 +896,11 @@ static void merge_unknown_aces(struct afs_acl *src, struct afs_acl *dst)
 
 static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                           uint32 security_info_sent,
-                          struct security_descriptor *psd)
+                          const struct security_descriptor *psd)
 {
        struct afs_acl old_afs_acl, new_afs_acl;
        struct afs_acl dir_acl, file_acl;
-       char acl_string[2049];
+       char acl_string[MAXSIZE];
        struct afs_iob iob;
        int ret = -1;
        char *name = NULL;
@@ -897,14 +909,14 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
        fileacls = lp_parm_const_string(SNUM(handle->conn), "afsacl", "fileacls",
                                        "yes");
 
-       sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", False);
+       sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", false);
 
        ZERO_STRUCT(old_afs_acl);
        ZERO_STRUCT(new_afs_acl);
        ZERO_STRUCT(dir_acl);
        ZERO_STRUCT(file_acl);
 
-       name = talloc_strdup(talloc_tos(), fsp->fsp_name);
+       name = talloc_strdup(talloc_tos(), fsp->fsp_name->base_name);
        if (!name) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -924,7 +936,7 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
        }
 
        if (!afs_get_afs_acl(name, &old_afs_acl)) {
-               DEBUG(3, ("Could not get old ACL of %s\n", fsp->fsp_name));
+               DEBUG(3, ("Could not get old ACL of %s\n", fsp_str_dbg(fsp)));
                goto done;
        }
 
@@ -940,7 +952,8 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                }
 
                free_afs_acl(&dir_acl);
-               if (!nt_to_afs_acl(fsp->fsp_name, security_info_sent, psd,
+               if (!nt_to_afs_acl(fsp->fsp_name->base_name,
+                                  security_info_sent, psd,
                                   nt_to_afs_dir_rights, &dir_acl))
                        goto done;
        } else {
@@ -955,7 +968,8 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                }
 
                free_afs_acl(&file_acl);
-               if (!nt_to_afs_acl(fsp->fsp_name, security_info_sent, psd,
+               if (!nt_to_afs_acl(fsp->fsp_name->base_name,
+                                  security_info_sent, psd,
                                   nt_to_afs_file_rights, &file_acl))
                        goto done;
        }
@@ -990,31 +1004,64 @@ static NTSTATUS afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
 
 static NTSTATUS afsacl_fget_nt_acl(struct vfs_handle_struct *handle,
                                   struct files_struct *fsp,
-                                  int fd,  uint32 security_info,
+                                  uint32 security_info,
                                   struct security_descriptor **ppdesc)
 {
-       return afs_get_nt_acl(fsp, security_info, ppdesc);
+       struct afs_acl acl;
+       size_t sd_size;
+
+       DEBUG(5, ("afsacl_fget_nt_acl: %s\n", fsp_str_dbg(fsp)));
+
+       sidpts = lp_parm_bool(SNUM(fsp->conn), "afsacl", "sidpts", false);
+
+       if (!afs_get_afs_acl(fsp->fsp_name->base_name, &acl)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       sd_size = afs_fto_nt_acl(&acl, fsp, security_info, ppdesc);
+
+       free_afs_acl(&acl);
+
+       return (sd_size != 0) ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
 }
+
 static NTSTATUS afsacl_get_nt_acl(struct vfs_handle_struct *handle,
-                                 struct files_struct *fsp,
                                  const char *name,  uint32 security_info,
                                  struct security_descriptor **ppdesc)
 {
-       return afs_get_nt_acl(fsp, security_info, ppdesc);
+       struct afs_acl acl;
+       size_t sd_size;
+       struct smb_filename *smb_fname = NULL;
+       NTSTATUS status;
+
+       DEBUG(5, ("afsacl_get_nt_acl: %s\n", name));
+
+       sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", false);
+
+       if (!afs_get_afs_acl(name, &acl)) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       status = create_synthetic_smb_fname(talloc_tos(), name, NULL, NULL,
+                                           &smb_fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               free_afs_acl(&acl);
+               return status;
+       }
+
+       sd_size = afs_to_nt_acl(&acl, handle->conn, smb_fname, security_info,
+                               ppdesc);
+       TALLOC_FREE(smb_fname);
+
+       free_afs_acl(&acl);
+
+       return (sd_size != 0) ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
 }
 
 NTSTATUS afsacl_fset_nt_acl(vfs_handle_struct *handle,
                         files_struct *fsp,
-                        int fd, uint32 security_info_sent,
-                        SEC_DESC *psd)
-{
-       return afs_set_nt_acl(handle, fsp, security_info_sent, psd);
-}
-
-NTSTATUS afsacl_set_nt_acl(vfs_handle_struct *handle,
-                      files_struct *fsp,
-                      const char *name, uint32 security_info_sent,
-                      SEC_DESC *psd)
+                        uint32 security_info_sent,
+                        const struct security_descriptor *psd)
 {
        return afs_set_nt_acl(handle, fsp, security_info_sent, psd);
 }
@@ -1023,35 +1070,31 @@ static int afsacl_connect(vfs_handle_struct *handle,
                          const char *service, 
                          const char *user)
 {
-                       const char *spc;
+       const char *spc;
+       int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+       if (ret < 0) {
+               return ret;
+       }
 
        spc = lp_parm_const_string(SNUM(handle->conn), "afsacl", "space", "%");
 
        if (spc != NULL)
                space_replacement = spc[0];
-       
-       return SMB_VFS_NEXT_CONNECT(handle, service, user);
+
+       return 0;
 }
 
-/* VFS operations structure */
-
-static vfs_op_tuple afsacl_ops[] = {   
-       {SMB_VFS_OP(afsacl_connect), SMB_VFS_OP_CONNECT,
-        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(afsacl_fget_nt_acl), SMB_VFS_OP_FGET_NT_ACL,
-        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(afsacl_get_nt_acl), SMB_VFS_OP_GET_NT_ACL,
-        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(afsacl_fset_nt_acl), SMB_VFS_OP_FSET_NT_ACL,
-        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(afsacl_set_nt_acl), SMB_VFS_OP_SET_NT_ACL,
-        SMB_VFS_LAYER_TRANSPARENT},
-       {SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
+static struct vfs_fn_pointers vfs_afsacl_fns = {
+       .connect_fn = afsacl_connect,
+       .fget_nt_acl = afsacl_fget_nt_acl,
+       .get_nt_acl = afsacl_get_nt_acl,
+       .fset_nt_acl = afsacl_fset_nt_acl
 };
 
 NTSTATUS vfs_afsacl_init(void);
 NTSTATUS vfs_afsacl_init(void)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "afsacl",
-                               afsacl_ops);
+                               &vfs_afsacl_fns);
 }