From f36ffa768129f01b0c12d30bff5e4e205dd3676c Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Thu, 23 Oct 2008 18:34:28 +0200
Subject: [PATCH] s3-build: remove duplicate svcctl bits and re-run make
 samba3-idl.

Guenther
---
 source3/include/rpc_secdes.h    | 70 ---------------------------------
 source3/librpc/gen_ndr/svcctl.h |  8 ++++
 2 files changed, 8 insertions(+), 70 deletions(-)

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 71fba41fe94..fb73498b0df 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -385,76 +385,6 @@ struct standard_mapping {
 		(STANDARD_RIGHTS_EXECUTE_ACCESS	| \
 		SA_RIGHT_ALIAS_LOOKUP_INFO )	/* 0x00020008 */
 
-/*
- * Acces bits for the svcctl objects
- */
-
-/* Service Control Manager Bits */ 
-
-#if 0
-#define SC_RIGHT_MGR_CONNECT			0x0001
-#define SC_RIGHT_MGR_CREATE_SERVICE		0x0002
-#define SC_RIGHT_MGR_ENUMERATE_SERVICE		0x0004
-#define SC_RIGHT_MGR_LOCK			0x0008
-#define SC_RIGHT_MGR_QUERY_LOCK_STATUS		0x0010
-#define SC_RIGHT_MGR_MODIFY_BOOT_CONFIG		0x0020
-
-#endif
-
-#define SC_MANAGER_READ_ACCESS \
-	( STANDARD_RIGHTS_READ_ACCESS		| \
-	  SC_RIGHT_MGR_CONNECT			| \
-	  SC_RIGHT_MGR_ENUMERATE_SERVICE	| \
-	  SC_RIGHT_MGR_QUERY_LOCK_STATUS )
-
-#define SC_MANAGER_EXECUTE_ACCESS SC_MANAGER_READ_ACCESS
-
-#define SC_MANAGER_WRITE_ACCESS \
-	( STANDARD_RIGHTS_REQUIRED_ACCESS	| \
-	  SC_MANAGER_READ_ACCESS		| \
-	  SC_RIGHT_MGR_CREATE_SERVICE		| \
-	  SC_RIGHT_MGR_LOCK			| \
-	  SC_RIGHT_MGR_MODIFY_BOOT_CONFIG )
-
-#define SC_MANAGER_ALL_ACCESS SC_MANAGER_WRITE_ACCESS
-
-/* Service Object Bits */
-
-#if 0
-#define SC_RIGHT_SVC_QUERY_CONFIG		0x0001
-#define SC_RIGHT_SVC_CHANGE_CONFIG		0x0002
-#define SC_RIGHT_SVC_QUERY_STATUS		0x0004
-#define SC_RIGHT_SVC_ENUMERATE_DEPENDENTS	0x0008
-#define SC_RIGHT_SVC_START			0x0010
-#define SC_RIGHT_SVC_STOP			0x0020
-#define SC_RIGHT_SVC_PAUSE_CONTINUE		0x0040
-#define SC_RIGHT_SVC_INTERROGATE		0x0080
-#define SC_RIGHT_SVC_USER_DEFINED_CONTROL	0x0100
-
-#endif
-
-#define SERVICE_READ_ACCESS \
-	( STANDARD_RIGHTS_READ_ACCESS		| \
-	  SC_RIGHT_SVC_ENUMERATE_DEPENDENTS	| \
-	  SC_RIGHT_SVC_INTERROGATE		| \
-	  SC_RIGHT_SVC_QUERY_CONFIG		| \
-	  SC_RIGHT_SVC_QUERY_STATUS		| \
-	  SC_RIGHT_SVC_USER_DEFINED_CONTROL )
-
-#define SERVICE_EXECUTE_ACCESS \
-	( SERVICE_READ_ACCESS 			| \
-	  SC_RIGHT_SVC_START			| \
-	  SC_RIGHT_SVC_STOP			| \
-	  SC_RIGHT_SVC_PAUSE_CONTINUE )
-
-#define SERVICE_WRITE_ACCESS \
-	( STANDARD_RIGHTS_REQUIRED_ACCESS	| \
-	  SERVICE_READ_ACCESS			| \
-	  SERVICE_EXECUTE_ACCESS		| \
-	  SC_RIGHT_SVC_CHANGE_CONFIG )
-
-#define SERVICE_ALL_ACCESS SERVICE_WRITE_ACCESS
-
 /*
  * Access Bits for registry ACLS
  */
diff --git a/source3/librpc/gen_ndr/svcctl.h b/source3/librpc/gen_ndr/svcctl.h
index 42ed0397844..5da69794d21 100644
--- a/source3/librpc/gen_ndr/svcctl.h
+++ b/source3/librpc/gen_ndr/svcctl.h
@@ -18,6 +18,14 @@
 #define SERVICE_STATE_INACTIVE	( 0x02 )
 #define SERVICE_STATE_ALL	( 0x03 )
 #define SV_TYPE_ALL	( 0xFFFFFFFF )
+#define SC_MANAGER_READ_ACCESS	( (STANDARD_RIGHTS_READ_ACCESS|SC_RIGHT_MGR_CONNECT|SC_RIGHT_MGR_ENUMERATE_SERVICE|SC_RIGHT_MGR_QUERY_LOCK_STATUS) )
+#define SC_MANAGER_EXECUTE_ACCESS	( SC_MANAGER_READ_ACCESS )
+#define SC_MANAGER_WRITE_ACCESS	( (STANDARD_RIGHTS_REQUIRED_ACCESS|SC_MANAGER_READ_ACCESS|SC_RIGHT_MGR_CREATE_SERVICE|SC_RIGHT_MGR_LOCK|SC_RIGHT_MGR_MODIFY_BOOT_CONFIG) )
+#define SC_MANAGER_ALL_ACCESS	( SC_MANAGER_WRITE_ACCESS )
+#define SERVICE_READ_ACCESS	( (STANDARD_RIGHTS_READ_ACCESS|SC_RIGHT_SVC_ENUMERATE_DEPENDENTS|SC_RIGHT_SVC_INTERROGATE|SC_RIGHT_SVC_QUERY_CONFIG|SC_RIGHT_SVC_QUERY_STATUS|SC_RIGHT_SVC_USER_DEFINED_CONTROL) )
+#define SERVICE_EXECUTE_ACCESS	( (SERVICE_READ_ACCESS|SC_RIGHT_SVC_START|SC_RIGHT_SVC_STOP|SC_RIGHT_SVC_PAUSE_CONTINUE) )
+#define SERVICE_WRITE_ACCESS	( (STANDARD_RIGHTS_REQUIRED_ACCESS|SERVICE_READ_ACCESS|SERVICE_EXECUTE_ACCESS|SC_RIGHT_SVC_CHANGE_CONFIG) )
+#define SERVICE_ALL_ACCESS	( SERVICE_WRITE_ACCESS )
 struct SERVICE_LOCK_STATUS {
 	uint32_t is_locked;
 	const char *lock_owner;/* [unique,charset(UTF16)] */
-- 
2.34.1