vfs: Use posix_sys_acl_blob_get_file in vfs_aixacl2 for posix ACLs

[kai/samba.git] / source3 / modules / vfs_aixacl2.c

diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c
index 996adbbdfe3b2c185776b7ad1da5a5987fc9ce6e..327b06d66d5d4f303c519f9353693763073fe001 100644 (file)
--- a/source3/modules/vfs_aixacl2.c
+++ b/source3/modules/vfs_aixacl2.c
@@ -18,6 +18,8 @@
  */
 
 #include "includes.h"
  */
 
 #include "includes.h"

+#include "system/filesys.h"
+#include "smbd/smbd.h"

 #include "nfs4_acls.h"
 
 #undef DBGC_CLASS
 #include "nfs4_acls.h"
 
 #undef DBGC_CLASS


@@ -25,11 +27,6 @@
 
 #define AIXACL2_MODULE_NAME "aixacl2"
 
 
 #define AIXACL2_MODULE_NAME "aixacl2"
 

-extern struct current_user current_user;
-extern int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid);
-extern bool unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp,
-       uint32 security_info_sent, SEC_DESC *psd);
-

 extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
 extern struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
 
 extern SMB_ACL_T aixacl_to_smbacl( struct acl *file_acl);
 extern struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl);
 


@@ -160,28 +157,34 @@ static bool aixjfs2_get_nfs4_acl(const char *name,
 
 static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle,
        files_struct *fsp, uint32 security_info,
 
 static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle,
        files_struct *fsp, uint32 security_info,

-       SEC_DESC **ppdesc)
+       TALLOC_CTX *mem_ctx,
+       struct security_descriptor **ppdesc)

 {
        SMB4ACL_T *pacl = NULL;
        bool    result;
        bool    retryPosix = False;
 
        *ppdesc = NULL;
 {
        SMB4ACL_T *pacl = NULL;
        bool    result;
        bool    retryPosix = False;
 
        *ppdesc = NULL;

-       result = aixjfs2_get_nfs4_acl(fsp->fsp_name, &pacl, &retryPosix);
+       result = aixjfs2_get_nfs4_acl(fsp->fsp_name->base_name, &pacl,
+                                     &retryPosix);

        if (retryPosix)
        {
                DEBUG(10, ("retrying with posix acl...\n"));
        if (retryPosix)
        {
                DEBUG(10, ("retrying with posix acl...\n"));

-               return posix_fget_nt_acl(fsp, security_info, ppdesc);
+               return posix_fget_nt_acl(fsp, security_info,
+                                        mem_ctx, ppdesc);

        }
        if (result==False)
                return NT_STATUS_ACCESS_DENIED;
 
        }
        if (result==False)
                return NT_STATUS_ACCESS_DENIED;
 

-       return smb_fget_nt_acl_nfs4(fsp, security_info, ppdesc, pacl);
+       return smb_fget_nt_acl_nfs4(fsp, security_info, ppdesc,
+                                   mem_ctx, pacl);

 }
 
 static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,
 }
 
 static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,

-       files_struct *fsp, const char *name,
-       uint32 security_info, SEC_DESC **ppdesc)
+       const char *name,
+       uint32 security_info,
+       TALLOC_CTX *mem_ctx,
+       struct security_descriptor **ppdesc)

 {
        SMB4ACL_T *pacl = NULL;
        bool    result;
 {
        SMB4ACL_T *pacl = NULL;
        bool    result;


@@ -192,17 +195,54 @@ static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle,
        if (retryPosix)
        {
                DEBUG(10, ("retrying with posix acl...\n"));
        if (retryPosix)
        {
                DEBUG(10, ("retrying with posix acl...\n"));

-               return posix_get_nt_acl(handle->conn, name security_info,
-                                       ppdesc);
+               return posix_get_nt_acl(handle->conn, name, security_info,
+                                       mem_ctx, ppdesc);

        }
        if (result==False)
                return NT_STATUS_ACCESS_DENIED;
 
        }
        if (result==False)
                return NT_STATUS_ACCESS_DENIED;
 

-       return smb_get_nt_acl_nfs4(handle->conn, name, security_info, ppdesc,
+       return smb_get_nt_acl_nfs4(handle->conn, name, security_info,
+                                  mem_ctx, ppdesc,

                                   pacl);
 }
 
                                   pacl);
 }
 

-static SMB_ACL_T aixjfs2_get_posix_acl(const char *path, acl_type_t type)
+static int aixjfs2_sys_acl_blob_get_file(vfs_handle_struct *handle, const char *path_p, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob)
+{
+       SMB4ACL_T *pacl = NULL;
+       bool    result;
+       bool    retryPosix = False;
+
+       *ppdesc = NULL;
+       result = aixjfs2_get_nfs4_acl(path_p, &pacl, &retryPosix);
+       if (retryPosix)
+       {
+               return posix_sys_acl_blob_get_file(handle, path_p, mem_ctx,
+                                                  blob_description, blob);
+       }
+       /* Now way to linarlise NFS4 ACLs at the moment, but the NT ACL is pretty close in this case */
+       errno = ENOSYS;
+       return -1;
+}
+
+static int aixjfs2_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob)
+{
+       SMB4ACL_T *pacl = NULL;
+       bool    result;
+       bool    retryPosix = False;
+
+       result = aixjfs2_get_nfs4_acl(fsp->fsp_name->base_name, &pacl,
+                                     &retryPosix);
+       if (retryPosix)
+       {
+               return posix_sys_acl_blob_get_fd(handle, fsp, mem_ctx, blob_description, blob);
+       }
+
+       /* Now way to linarlise NFS4 ACLs at the moment, but the NT ACL is pretty close in this case */
+       errno = ENOSYS;
+       return -1;
+}
+
+static SMB_ACL_T aixjfs2_get_posix_acl(const char *path, acl_type_t type, TALLOC_CTX *mem_ctx)

 {
         aixc_acl_t *pacl;
        AIXJFS2_ACL_T *acl;
 {
         aixc_acl_t *pacl;
        AIXJFS2_ACL_T *acl;


@@ -224,21 +264,22 @@ static SMB_ACL_T aixjfs2_get_posix_acl(const char *path, acl_type_t type)
         DEBUG(10, ("len: %d, mode: %d\n",
                    pacl->acl_len, pacl->acl_mode));
 
         DEBUG(10, ("len: %d, mode: %d\n",
                    pacl->acl_len, pacl->acl_mode));
 

-        result = aixacl_to_smbacl(pacl);
+        result = aixacl_to_smbacl(pacl, mem_ctx);

         if (result == NULL) {
                 goto done;
         }
 
  done:
         if (errno != 0) {
         if (result == NULL) {
                 goto done;
         }
 
  done:
         if (errno != 0) {

-                SAFE_FREE(result);
+                TALLOC_FREE(result);

         }
         return result;
 }
 
 SMB_ACL_T aixjfs2_sys_acl_get_file(vfs_handle_struct *handle,
                                     const char *path_p,
         }
         return result;
 }
 
 SMB_ACL_T aixjfs2_sys_acl_get_file(vfs_handle_struct *handle,
                                     const char *path_p,

-                                    SMB_ACL_TYPE_T type)
+                                  SMB_ACL_TYPE_T type,
+                                  TALLOC_CTX *mem_ctx)

 {
         acl_type_t aixjfs2_type;
 
 {
         acl_type_t aixjfs2_type;
 


@@ -254,7 +295,7 @@ SMB_ACL_T aixjfs2_sys_acl_get_file(vfs_handle_struct *handle,
                 smb_panic("exiting");
         }
 
                 smb_panic("exiting");
         }
 

-        return aixjfs2_get_posix_acl(path_p, aixjfs2_type);
+        return aixjfs2_get_posix_acl(path_p, aixjfs2_type, mem_ctx);

 }
 
 SMB_ACL_T aixjfs2_sys_acl_get_fd(vfs_handle_struct *handle,
 }
 
 SMB_ACL_T aixjfs2_sys_acl_get_fd(vfs_handle_struct *handle,


@@ -263,7 +304,7 @@ SMB_ACL_T aixjfs2_sys_acl_get_fd(vfs_handle_struct *handle,
         acl_type_t aixjfs2_type;
         aixjfs2_type.u64 = ACL_AIXC;
 
         acl_type_t aixjfs2_type;
         aixjfs2_type.u64 = ACL_AIXC;
 

-       return aixjfs2_get_posix_acl(fsp->fsp_name, aixjfs2_type);
+       return aixjfs2_get_posix_acl(fsp->fsp_name->base_name, aixjfs2_type);

 }
 
 /*
 }
 
 /*


@@ -309,7 +350,7 @@ static bool aixjfs2_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl)
        int     rc;
        acl_type_t      acltype;
 
        int     rc;
        acl_type_t      acltype;
 

-       DEBUG(10, ("jfs2_process_smbacl invoked on %s\n", fsp->fsp_name));
+       DEBUG(10, ("jfs2_process_smbacl invoked on %s\n", fsp_str_dbg(fsp)));

 
        /* no need to be freed which is alloced with mem_ctx */
        mem_ctx = talloc_tos();
 
        /* no need to be freed which is alloced with mem_ctx */
        mem_ctx = talloc_tos();


@@ -358,7 +399,7 @@ static bool aixjfs2_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl)
 
        /* won't set S_ISUID - the only one JFS2/NFS4 accepts */
        rc = aclx_put(
 
        /* won't set S_ISUID - the only one JFS2/NFS4 accepts */
        rc = aclx_put(

-               fsp->fsp_name,
+               fsp->fsp_name->base_name,

                SET_ACL, /* set only the ACL, not mode bits */
                acltype, /* not a pointer !!! */
                jfs2acl,
                SET_ACL, /* set only the ACL, not mode bits */
                acltype, /* not a pointer !!! */
                jfs2acl,


@@ -374,7 +415,7 @@ static bool aixjfs2_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl)
        return True;
 }
 
        return True;
 }
 

-static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
+static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)

 {
        acl_type_t      acl_type_info;
        NTSTATUS        result = NT_STATUS_ACCESS_DENIED;
 {
        acl_type_t      acl_type_info;
        NTSTATUS        result = NT_STATUS_ACCESS_DENIED;


@@ -398,12 +439,7 @@ static NTSTATUS aixjfs2_set_nt_acl_common(files_struct *fsp, uint32 security_inf
        return result;
 }
 
        return result;
 }
 

-NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd)
-{
-       return aixjfs2_set_nt_acl_common(fsp, security_info_sent, psd);
-}
-
-NTSTATUS aixjfs2_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, SEC_DESC *psd)
+NTSTATUS aixjfs2_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)

 {
        return aixjfs2_set_nt_acl_common(fsp, security_info_sent, psd);
 }
 {
        return aixjfs2_set_nt_acl_common(fsp, security_info_sent, psd);
 }


@@ -454,9 +490,10 @@ int aixjfs2_sys_acl_set_fd(vfs_handle_struct *handle,
        acl_type_t      acl_type_info;
        int     rc;
 
        acl_type_t      acl_type_info;
        int     rc;
 

-       DEBUG(10, ("aixjfs2_sys_acl_set_fd invoked for %s", fsp->fsp_name));
+       DEBUG(10, ("aixjfs2_sys_acl_set_fd invoked for %s", fsp_str_dbg(fsp)));

 
 

-       rc = aixjfs2_query_acl_support(fsp->fsp_name, ACL_AIXC, &acl_type_info);
+       rc = aixjfs2_query_acl_support(fsp->fsp_name->base_name, ACL_AIXC,
+                                      &acl_type_info);

        if (rc) {
                DEBUG(8, ("jfs2_set_nt_acl: AIXC support not found\n"));
                return -1;
        if (rc) {
                DEBUG(8, ("jfs2_set_nt_acl: AIXC support not found\n"));
                return -1;


@@ -476,7 +513,7 @@ int aixjfs2_sys_acl_set_fd(vfs_handle_struct *handle,
        );
        if (rc) {
                DEBUG(2, ("aclx_fput failed with %s for %s\n",
        );
        if (rc) {
                DEBUG(2, ("aclx_fput failed with %s for %s\n",

-                       strerror(errno), fsp->fsp_name));
+                       strerror(errno), fsp_str_dbg(fsp)));

                return -1;
        }
 
                return -1;
        }
 


@@ -492,55 +529,22 @@ int aixjfs2_sys_acl_delete_def_file(vfs_handle_struct *handle,
        return 0;
 }
 
        return 0;
 }
 

-
-/* VFS operations structure */
-
-static vfs_op_tuple aixjfs2_ops[] =
-{
-       {SMB_VFS_OP(aixjfs2_fget_nt_acl),
-       SMB_VFS_OP_FGET_NT_ACL,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_get_nt_acl),
-       SMB_VFS_OP_GET_NT_ACL,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_fset_nt_acl),
-       SMB_VFS_OP_FSET_NT_ACL,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_set_nt_acl),
-       SMB_VFS_OP_SET_NT_ACL,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_sys_acl_get_file),
-       SMB_VFS_OP_SYS_ACL_GET_FILE,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_sys_acl_get_fd),
-       SMB_VFS_OP_SYS_ACL_GET_FD,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_sys_acl_set_file),
-       SMB_VFS_OP_SYS_ACL_SET_FILE,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_sys_acl_set_fd),
-       SMB_VFS_OP_SYS_ACL_SET_FD,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(aixjfs2_sys_acl_delete_def_file),
-       SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
-       SMB_VFS_LAYER_TRANSPARENT},
-
-       {SMB_VFS_OP(NULL),
-       SMB_VFS_OP_NOOP,
-       SMB_VFS_LAYER_NOOP}
+static struct vfs_fn_pointers vfs_aixacl2_fns = {
+       .fget_nt_acl_fn = aixjfs2_fget_nt_acl,
+       .get_nt_acl_fn = aixjfs2_get_nt_acl,
+       .fset_nt_acl_fn = aixjfs2_fset_nt_acl,
+       .sys_acl_get_file_fn = aixjfs2_sys_acl_get_file,
+       .sys_acl_get_fd_fn = aixjfs2_sys_acl_get_fd,
+       .sys_acl_blob_get_file_fn = aixjfs2_sys_acl_blob_get_file,
+       .sys_acl_blob_get_fd_fn = aixjfs2_sys_acl_blob_get_fd,
+       .sys_acl_set_file_fn = aixjfs2_sys_acl_set_file,
+       .sys_acl_set_fd_fn = aixjfs2_sys_acl_set_fd,
+       .sys_acl_delete_def_file_fn = aixjfs2_sys_acl_delete_def_file

 };
 
 NTSTATUS vfs_aixacl2_init(void);
 NTSTATUS vfs_aixacl2_init(void)
 {
         return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, AIXACL2_MODULE_NAME,
 };
 
 NTSTATUS vfs_aixacl2_init(void);
 NTSTATUS vfs_aixacl2_init(void)
 {
         return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, AIXACL2_MODULE_NAME,

-                                aixjfs2_ops);
+                               &vfs_aixacl2_fns);

 }
 }