From 102b0cfe62c6486846cdfb4938a83e2be4aad912 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 3 Jun 2010 01:27:50 +0200
Subject: security: move generic_mapping and standard_mapping to security.idl.

Guenther
---
 librpc/idl/security.idl      | 18 ++++++++++++++++++
 source3/include/rpc_secdes.h | 17 -----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index fb1dc0dcc0..7f9e7dbb4e 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -519,4 +519,22 @@ interface security
 	const string GUID_DRS_MONITOR_TOPOLOGY        = "f98340fb-7c5b-4cdb-a00b-2ebdfa115a96";
 	const string GUID_DRS_REPL_SYNCRONIZE         = "1131f6ab-9c07-11d1-f79f-00c04fc2dcd2";
 	const string GUID_DRS_RO_REPL_SECRET_SYNC     = "1131f6ae-9c07-11d1-f79f-00c04fc2dcd2";
+
+
+	/* A type to describe the mapping of generic access rights to object
+	   specific access rights. */
+
+	typedef struct {
+		uint32 generic_read;
+		uint32 generic_write;
+		uint32 generic_execute;
+		uint32 generic_all;
+	} generic_mapping;
+
+	typedef	struct {
+		uint32 std_read;
+		uint32 std_write;
+		uint32 std_execute;
+		uint32 std_all;
+	} standard_mapping;
 }
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 97ccc9b0d1..216f8830eb 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -24,23 +24,6 @@
 /* for ADS */
 #define SEC_RIGHTS_FULL_CTRL		0xf01ff
 
-/* A type to describe the mapping of generic access rights to object
-   specific access rights. */
-
-struct generic_mapping {
-	uint32 generic_read;
-	uint32 generic_write;
-	uint32 generic_execute;
-	uint32 generic_all;
-};
-
-struct standard_mapping {
-	uint32 std_read;
-	uint32 std_write;
-	uint32 std_execute;
-	uint32 std_all;
-};
-
 /* Standard access rights. */
 
 #define STD_RIGHT_DELETE_ACCESS		0x00010000
-- 
cgit