From a8b01d1f3b4025af7e7a9d8b61deec6156737322 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 18 May 2010 03:25:38 +0200
Subject: s3-secdesc: remove "typedef struct security_ace SEC_ACE".

Guenther
---
 source3/rpc_server/srv_lsa_nt.c    | 2 +-
 source3/rpc_server/srv_samr_nt.c   | 2 +-
 source3/rpc_server/srv_srvsvc_nt.c | 2 +-
 source3/rpc_server/srv_svcctl_nt.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/rpc_server')

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index afb85baef2..dd0fe1c4f8 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -317,7 +317,7 @@ static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *s
 					DOM_SID *sid, uint32_t sid_access)
 {
 	DOM_SID adm_sid;
-	SEC_ACE ace[5];
+	struct security_ace ace[5];
 	size_t i = 0;
 
 	SEC_ACL *psa = NULL;
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 832ada5bc1..2620f2d3e5 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -127,7 +127,7 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd
 				     DOM_SID *sid, uint32 sid_access )
 {
 	DOM_SID domadmin_sid;
-	SEC_ACE ace[5];		/* at most 5 entries */
+	struct security_ace ace[5];		/* at most 5 entries */
 	size_t i = 0;
 
 	SEC_ACL *psa = NULL;
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 73875c1c08..50c37c3ce0 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -334,7 +334,7 @@ static void map_generic_share_sd_bits(SEC_DESC *psd)
 		return;
 
 	for (i = 0; i < ps_dacl->num_aces; i++) {
-		SEC_ACE *psa = &ps_dacl->aces[i];
+		struct security_ace *psa = &ps_dacl->aces[i];
 		uint32 orig_mask = psa->access_mask;
 
 		se_map_generic(&psa->access_mask, &file_generic_mapping);
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index ab446f9c0b..d664306e4d 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -137,7 +137,7 @@ static NTSTATUS svcctl_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token,
 
 static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx )
 {
-	SEC_ACE ace[2];
+	struct security_ace ace[2];
 	size_t i = 0;
 	SEC_DESC *sd;
 	SEC_ACL *theacl;
-- 
cgit