From 8951c8301ac8436d49e1641b2cc7775dda44d914 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 18 May 2010 03:30:40 +0200
Subject: s3-secdesc: remove "typedef struct security_acl SEC_ACL".

Guenther
---
 source3/rpc_server/srv_lsa_nt.c       | 2 +-
 source3/rpc_server/srv_samr_nt.c      | 4 ++--
 source3/rpc_server/srv_spoolss_nt.c   | 2 +-
 source3/rpc_server/srv_spoolss_util.c | 2 +-
 source3/rpc_server/srv_srvsvc_nt.c    | 2 +-
 source3/rpc_server/srv_svcctl_nt.c    | 2 +-
 6 files changed, 7 insertions(+), 7 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 dd0fe1c4f8..9477ec0ba2 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -320,7 +320,7 @@ static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *s
 	struct security_ace ace[5];
 	size_t i = 0;
 
-	SEC_ACL *psa = NULL;
+	struct security_acl *psa = NULL;
 
 	/* READ|EXECUTE access for Everyone */
 
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 2620f2d3e5..100a1762c7 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -130,7 +130,7 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd
 	struct security_ace ace[5];		/* at most 5 entries */
 	size_t i = 0;
 
-	SEC_ACL *psa = NULL;
+	struct security_acl *psa = NULL;
 
 	/* basic access for Everyone */
 
@@ -674,7 +674,7 @@ NTSTATUS _samr_SetSecurity(pipes_struct *p,
 {
 	struct samr_user_info *uinfo;
 	uint32 i;
-	SEC_ACL *dacl;
+	struct security_acl *dacl;
 	bool ret;
 	struct samu *sampass=NULL;
 	NTSTATUS status;
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 50d40e1dce..749108f416 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5443,7 +5443,7 @@ static WERROR update_printer_sec(struct policy_handle *handle,
 	}
 
 	if (DEBUGLEVEL >= 10) {
-		SEC_ACL *the_acl;
+		struct security_acl *the_acl;
 		int i;
 
 		the_acl = old_secdesc_ctr->sd->dacl;
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index 2a5e95b280..58dd03d90d 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -2387,7 +2387,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
 	 */
 	if (!secdesc->owner_sid || !secdesc->group_sid) {
 		DOM_SID *owner_sid, *group_sid;
-		SEC_ACL *dacl, *sacl;
+		struct security_acl *dacl, *sacl;
 		size_t size;
 
 		result = winreg_get_printer_secdesc(tmp_ctx,
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 50c37c3ce0..904664f223 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -324,7 +324,7 @@ static void init_srv_share_info_2(pipes_struct *p, struct srvsvc_NetShareInfo2 *
 static void map_generic_share_sd_bits(SEC_DESC *psd)
 {
 	int i;
-	SEC_ACL *ps_dacl = NULL;
+	struct security_acl *ps_dacl = NULL;
 
 	if (!psd)
 		return;
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index d664306e4d..0975ef98c7 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -140,7 +140,7 @@ static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx )
 	struct security_ace ace[2];
 	size_t i = 0;
 	SEC_DESC *sd;
-	SEC_ACL *theacl;
+	struct security_acl *theacl;
 	size_t sd_size;
 
 	/* basic access for Everyone */
-- 
cgit