s3-lsa: move remaining lsa policy access_mask defines to idl.

Guenther

4 files changed, 41 insertions, 61 deletions

diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h
index ee8a31138d..00fa1230e1 100644
--- a/librpc/gen_ndr/lsa.h
+++ b/librpc/gen_ndr/lsa.h
@@ -7,6 +7,10 @@
 #ifndef _HEADER_lsarpc
 #define _HEADER_lsarpc
 
+#define LSA_POLICY_ALL_ACCESS	( (STANDARD_RIGHTS_REQUIRED_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_VIEW_AUDIT_INFORMATION|LSA_POLICY_GET_PRIVATE_INFORMATION|LSA_POLICY_TRUST_ADMIN|LSA_POLICY_CREATE_ACCOUNT|LSA_POLICY_CREATE_SECRET|LSA_POLICY_CREATE_PRIVILEGE|LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS|LSA_POLICY_SET_AUDIT_REQUIREMENTS|LSA_POLICY_AUDIT_LOG_ADMIN|LSA_POLICY_SERVER_ADMIN|LSA_POLICY_LOOKUP_NAMES) )
+#define LSA_POLICY_READ	( (STANDARD_RIGHTS_READ_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_VIEW_AUDIT_INFORMATION|LSA_POLICY_GET_PRIVATE_INFORMATION) )
+#define LSA_POLICY_WRITE	( (STD_RIGHT_READ_CONTROL_ACCESS|LSA_POLICY_TRUST_ADMIN|LSA_POLICY_CREATE_ACCOUNT|LSA_POLICY_CREATE_SECRET|LSA_POLICY_CREATE_PRIVILEGE|LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS|LSA_POLICY_SET_AUDIT_REQUIREMENTS|LSA_POLICY_AUDIT_LOG_ADMIN|LSA_POLICY_SERVER_ADMIN) )
+#define LSA_POLICY_EXECUTE	( (STANDARD_RIGHTS_EXECUTE_ACCESS|LSA_POLICY_VIEW_LOCAL_INFORMATION|LSA_POLICY_LOOKUP_NAMES) )
 #define LSA_ENUM_TRUST_DOMAIN_MULTIPLIER	( 60 )
 #define LSA_REF_DOMAIN_LIST_MULTIPLIER	( 32 )
 #define LSA_ENUM_TRUST_DOMAIN_EX_MULTIPLIER	( 82 )
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index db5ca31720..afe613d412 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -143,6 +143,43 @@ import "misc.idl", "security.idl";
 		LSA_POLICY_LOOKUP_NAMES			= 0x00000800
 	} lsa_PolicyAccessMask;
 
+	const int LSA_POLICY_ALL_ACCESS =
+		(STANDARD_RIGHTS_REQUIRED_ACCESS	|
+		LSA_POLICY_VIEW_LOCAL_INFORMATION	|
+		LSA_POLICY_VIEW_AUDIT_INFORMATION	|
+		LSA_POLICY_GET_PRIVATE_INFORMATION	|
+		LSA_POLICY_TRUST_ADMIN			|
+		LSA_POLICY_CREATE_ACCOUNT		|
+		LSA_POLICY_CREATE_SECRET		|
+		LSA_POLICY_CREATE_PRIVILEGE		|
+		LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS	|
+		LSA_POLICY_SET_AUDIT_REQUIREMENTS	|
+		LSA_POLICY_AUDIT_LOG_ADMIN		|
+		LSA_POLICY_SERVER_ADMIN			|
+		LSA_POLICY_LOOKUP_NAMES);
+
+	const int LSA_POLICY_READ =
+		(STANDARD_RIGHTS_READ_ACCESS		|
+		LSA_POLICY_VIEW_LOCAL_INFORMATION	|
+		LSA_POLICY_VIEW_AUDIT_INFORMATION	|
+		LSA_POLICY_GET_PRIVATE_INFORMATION);
+
+	const int LSA_POLICY_WRITE =
+		(STD_RIGHT_READ_CONTROL_ACCESS		|
+		LSA_POLICY_TRUST_ADMIN			|
+		LSA_POLICY_CREATE_ACCOUNT		|
+		LSA_POLICY_CREATE_SECRET		|
+		LSA_POLICY_CREATE_PRIVILEGE		|
+		LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS	|
+		LSA_POLICY_SET_AUDIT_REQUIREMENTS	|
+		LSA_POLICY_AUDIT_LOG_ADMIN		|
+		LSA_POLICY_SERVER_ADMIN);
+
+	const int LSA_POLICY_EXECUTE =
+		(STANDARD_RIGHTS_EXECUTE_ACCESS		|
+		LSA_POLICY_VIEW_LOCAL_INFORMATION	|
+		LSA_POLICY_LOOKUP_NAMES);
+
 	/* notice the screwup with the system_name - thats why MS created
 	   OpenPolicy2 */
 	[public] NTSTATUS lsa_OpenPolicy (
diff --git a/source3/include/includes.h b/source3/include/includes.h
index a20a17c33d..4aa3c07343 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -619,7 +619,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "ntlmssp.h"
 #include "auth.h"
 #include "ntdomain.h"
-#include "rpc_lsa.h"
 #include "reg_objects.h"
 #include "reg_db.h"
 #include "rpc_spoolss.h"
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
deleted file mode 100644
index 1dc5ba4a7b..0000000000
--- a/source3/include/rpc_lsa.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Andrew Tridgell               1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton  1996-1997
-   Copyright (C) Paul Ashton                   1997
-   Copyright (C) Gerald (Jerry) Carter         2005
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _RPC_LSA_H /* _RPC_LSA_H */
-#define _RPC_LSA_H 
-
-#define LSA_POLICY_ALL_ACCESS ( STANDARD_RIGHTS_REQUIRED_ACCESS  |\
-                            LSA_POLICY_VIEW_LOCAL_INFORMATION    |\
-                            LSA_POLICY_VIEW_AUDIT_INFORMATION    |\
-                            LSA_POLICY_GET_PRIVATE_INFORMATION   |\
-                            LSA_POLICY_TRUST_ADMIN               |\
-                            LSA_POLICY_CREATE_ACCOUNT            |\
-                            LSA_POLICY_CREATE_SECRET             |\
-                            LSA_POLICY_CREATE_PRIVILEGE          |\
-                            LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS  |\
-                            LSA_POLICY_SET_AUDIT_REQUIREMENTS    |\
-                            LSA_POLICY_AUDIT_LOG_ADMIN           |\
-                            LSA_POLICY_SERVER_ADMIN              |\
-                            LSA_POLICY_LOOKUP_NAMES )
-
-
-#define LSA_POLICY_READ       ( STANDARD_RIGHTS_READ_ACCESS      |\
-                            LSA_POLICY_VIEW_LOCAL_INFORMATION    |\
-                            LSA_POLICY_VIEW_AUDIT_INFORMATION    |\
-                            LSA_POLICY_GET_PRIVATE_INFORMATION)
-
-#define LSA_POLICY_WRITE      ( STD_RIGHT_READ_CONTROL_ACCESS     |\
-                            LSA_POLICY_TRUST_ADMIN               |\
-                            LSA_POLICY_CREATE_ACCOUNT            |\
-                            LSA_POLICY_CREATE_SECRET             |\
-                            LSA_POLICY_CREATE_PRIVILEGE          |\
-                            LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS  |\
-                            LSA_POLICY_SET_AUDIT_REQUIREMENTS    |\
-                            LSA_POLICY_AUDIT_LOG_ADMIN           |\
-                            LSA_POLICY_SERVER_ADMIN)
-
-#define LSA_POLICY_EXECUTE    ( STANDARD_RIGHTS_EXECUTE_ACCESS   |\
-                            LSA_POLICY_VIEW_LOCAL_INFORMATION    |\
-                            LSA_POLICY_LOOKUP_NAMES )
-
-#endif /* _RPC_LSA_H */