s3-secdesc: remove "typedef struct security_ace SEC_ACE".

Guenther

3 files changed, 16 insertions, 16 deletions

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 80bd65f5b8..7696d5e664 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -200,13 +200,13 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
 	DOM_SID *psid_owner, /* in */
 	DOM_SID *psid_group, /* in */
 	bool is_directory, /* in */
-	SEC_ACE **ppnt_ace_list, /* out */
+	struct security_ace **ppnt_ace_list, /* out */
 	int *pgood_aces /* out */
 )
 {
 	SMB_ACL4_INT_T *aclint = (SMB_ACL4_INT_T *)theacl;
 	SMB_ACE4_INT_T *aceint;
-	SEC_ACE *nt_ace_list = NULL;
+	struct security_ace *nt_ace_list = NULL;
 	int good_aces = 0;
 
 	DEBUG(10, ("smbacl_nfs42win entered\n"));
@@ -214,7 +214,7 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
 	aclint = get_validated_aclint(theacl);
 	/* We do not check for naces being 0 or theacl being NULL here because it is done upstream */
 	/* in smb_get_nt_acl_nfs4(). */
-	nt_ace_list = (SEC_ACE *)TALLOC_ZERO_SIZE(mem_ctx, aclint->naces * sizeof(SEC_ACE));
+	nt_ace_list = (struct security_ace *)TALLOC_ZERO_SIZE(mem_ctx, aclint->naces * sizeof(struct security_ace));
 	if (nt_ace_list==NULL)
 	{
 		DEBUG(10, ("talloc error"));
@@ -295,7 +295,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
 	int	good_aces = 0;
 	DOM_SID sid_owner, sid_group;
 	size_t sd_size = 0;
-	SEC_ACE *nt_ace_list = NULL;
+	struct security_ace *nt_ace_list = NULL;
 	SEC_ACL *psa = NULL;
 	TALLOC_CTX *mem_ctx = talloc_tos();
 
@@ -543,7 +543,7 @@ static bool smbacl4_fill_ace4(
 	smbacl4_vfs_params *params,
 	uid_t ownerUID,
 	gid_t ownerGID,
-	const SEC_ACE *ace_nt, /* input */
+	const struct security_ace *ace_nt, /* input */
 	SMB_ACE4PROP_T *ace_v4 /* output */
 )
 {
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index 2593012805..81ee81e787 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -167,7 +167,7 @@ sid_in_ignore_list(DOM_SID * sid, int snum)
  * Convert a trustee to a struct identity
  */
 static bool
-onefs_samba_ace_to_ace(SEC_ACE * samba_ace, struct ifs_ace * ace,
+onefs_samba_ace_to_ace(struct security_ace * samba_ace, struct ifs_ace * ace,
     bool *mapped, int snum)
 {
 	struct ifs_identity ident = {.type=IFS_ID_TYPE_LAST, .id.uid=0};
@@ -240,7 +240,7 @@ onefs_samba_acl_to_acl(SEC_ACL *samba_acl, struct ifs_security_acl **acl,
 {
 	int num_aces = 0;
 	struct ifs_ace *aces = NULL;
-	SEC_ACE *samba_aces;
+	struct security_ace *samba_aces;
 	bool mapped;
 	int i, j;
 
@@ -292,7 +292,7 @@ err_free:
 static bool
 onefs_acl_to_samba_acl(struct ifs_security_acl *acl, SEC_ACL **samba_acl)
 {
-	SEC_ACE *samba_aces = NULL;
+	struct security_ace *samba_aces = NULL;
 	SEC_ACL *tmp_samba_acl = NULL;
 	int i, num_aces = 0;
 
@@ -313,13 +313,13 @@ onefs_acl_to_samba_acl(struct ifs_security_acl *acl, SEC_ACL **samba_acl)
 
 	/* Allocate the ace list. */
 	if (num_aces > 0) {
-		if ((samba_aces = SMB_MALLOC_ARRAY(SEC_ACE, num_aces)) == NULL)
+		if ((samba_aces = SMB_MALLOC_ARRAY(struct security_ace, num_aces)) == NULL)
 		{
 			DEBUG(0, ("Unable to malloc space for %d aces.\n",
 			    num_aces));
 			return false;
 		}
-		memset(samba_aces, '\0', (num_aces) * sizeof(SEC_ACE));
+		memset(samba_aces, '\0', (num_aces) * sizeof(struct security_ace));
 	}
 
 	for (i = 0; i < num_aces; i++) {
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 82c1799129..1bf8366acc 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -528,7 +528,7 @@ static struct static_dir_ace_mapping {
 	{ 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 +569,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;
@@ -590,7 +590,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
 				   uint32 security_info,
 				   struct security_descriptor **ppdesc)
 {
-	SEC_ACE *nt_ace_list;
+	struct security_ace *nt_ace_list;
 	DOM_SID owner_sid, group_sid;
 	SEC_ACL *psa = NULL;
 	int good_aces;
@@ -603,7 +603,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
 	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;
@@ -723,7 +723,7 @@ static bool nt_to_afs_acl(const char *filename,
 			  uint32 security_info_sent,
 			  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)
 {
 	const SEC_ACL *dacl;
@@ -741,7 +741,7 @@ static bool nt_to_afs_acl(const char *filename,
 	dacl = psd->dacl;
 
 	for (i = 0; i < dacl->num_aces; i++) {
-		const 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;