selftest/Samba4: make use of get_cmd_env_vars() to setup all relevant env variables

[samba.git] / source3 / modules / vfs_aixacl.c

diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index 0400276f18ef04802266e7a306f7e72193f3d691..0628fae761b4c7b6b7c50ad41212e5f96edc939a 100644 (file)
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -22,65 +22,6 @@
 #include "smbd/smbd.h"
 #include "vfs_aixacl_util.h"
 
-SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle,
-                                 const struct smb_filename *smb_fname,
-                                 SMB_ACL_TYPE_T type,
-                                 TALLOC_CTX *mem_ctx)
-{
-       const char *path_p = smb_fname->base_name;
-       struct acl *file_acl = (struct acl *)NULL;
-       struct smb_acl_t *result = (struct smb_acl_t *)NULL;
-       
-       int rc = 0;
-       uid_t user_id;
-
-       /* AIX has no DEFAULT */
-       if  ( type == SMB_ACL_TYPE_DEFAULT )
-               return NULL;
-
-       /* Get the acl using statacl */
- 
-       DEBUG(10,("Entering AIX sys_acl_get_file\n"));
-       DEBUG(10,("path_p is %s\n",path_p));
-
-       file_acl = (struct acl *)SMB_MALLOC(BUFSIZ);
- 
-       if(file_acl == NULL) {
-               errno=ENOMEM;
-               DEBUG(0,("Error in AIX sys_acl_get_file: %d\n",errno));
-               return(NULL);
-       }
-
-       memset(file_acl,0,BUFSIZ);
-
-       rc = statacl((char *)path_p,0,file_acl,BUFSIZ);
-       if( (rc == -1) && (errno == ENOSPC)) {
-               struct acl *new_acl = SMB_MALLOC(file_acl->acl_len + sizeof(struct acl));
-               if( new_acl == NULL) {
-                       SAFE_FREE(file_acl);
-                       errno = ENOMEM;
-                       return NULL;
-               }
-               file_acl = new_acl;
-               rc = statacl((char *)path_p,0,file_acl,file_acl->acl_len+sizeof(struct acl));
-               if( rc == -1) {
-                       DEBUG(0,("statacl returned %d with errno %d\n",rc,errno));
-                       SAFE_FREE(file_acl);
-                       return(NULL);
-               }
-       }
-
-       DEBUG(10,("Got facl and returned it\n"));
-
-       
-       result = aixacl_to_smbacl(file_acl, mem_ctx);
-       SAFE_FREE(file_acl);
-       return result;
-       
-       /*errno = ENOTSUP;
-       return NULL;*/
-}
-
 SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle,
                                files_struct *fsp,
                                SMB_ACL_TYPE_T type,
@@ -139,27 +80,6 @@ SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle,
        return NULL;*/
 }
 
-int aixacl_sys_acl_set_file(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       SMB_ACL_TYPE_T type,
-                       SMB_ACL_T theacl)
-{
-       struct acl *file_acl = NULL;
-       unsigned int rc;
-
-       file_acl = aixacl_smb_to_aixacl(type, theacl);
-       if (!file_acl)
-               return -1;
-
-       rc = chacl((char *)smb_fname->base_name,file_acl,file_acl->acl_len);
-       DEBUG(10,("errno is %d\n",errno));
-       DEBUG(10,("return code is %d\n",rc));
-       SAFE_FREE(file_acl);
-       DEBUG(10,("Exiting the aixacl_sys_acl_set_file\n"));
-
-       return rc;
-}
-
 int aixacl_sys_acl_set_fd(vfs_handle_struct *handle,
                            files_struct *fsp,
                            SMB_ACL_TYPE_T type,
@@ -197,9 +117,7 @@ int aixacl_sys_acl_delete_def_fd(vfs_handle_struct *handle,
 }
 
 static struct vfs_fn_pointers vfs_aixacl_fns = {
-       .sys_acl_get_file_fn = aixacl_sys_acl_get_file,
        .sys_acl_get_fd_fn = aixacl_sys_acl_get_fd,
-       .sys_acl_blob_get_file_fn = posix_sys_acl_blob_get_file,
        .sys_acl_blob_get_fd_fn = posix_sys_acl_blob_get_fd,
        .sys_acl_set_fd_fn = aixacl_sys_acl_set_fd,
        .sys_acl_delete_def_fd_fn = aixacl_sys_acl_delete_def_fd,