From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Jun 2021 22:14:57 +0000 (-0700)
Subject: s3: VFS: aixacl: Remove aixacl_sys_acl_get_file().
X-Git-Tag: tevent-0.11.0~497
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7eb206517faaab6819bf248d97f2c5c3f5dd6f15;p=thirdparty%2Fsamba.git

s3: VFS: aixacl: Remove aixacl_sys_acl_get_file().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index 0400276f18e..6cf2dc1ceab 100644
--- 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,
@@ -197,7 +138,6 @@ 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,