From: Günther Deschner <gd@samba.org>
Date: Thu, 8 Jan 2009 12:05:29 +0000 (+0100)
Subject: s3-svcctl: remove some more redundant headers.
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=cbc2c9059f34389402aaad2d2f45ac208e68ff52

s3-svcctl: remove some more redundant headers.

Guenther
---

diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index 06218b62399..2b30bfbfb14 100644
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -45,19 +45,6 @@
 #define SVCCTL_OPEN_SCMANAGER_A			0x1b
 */
 
-/* SERVER_STATUS - type */
-
-#define SVCCTL_TYPE_WIN32		0x00000030
-#define SVCCTL_TYPE_DRIVER		0x0000000f
-
-/* Service Config - values for ServiceType field*/
-
-#define SVCCTL_KERNEL_DRVR                         0x00000001  /* doubtful we'll have these */
-#define SVCCTL_FILE_SYSTEM_DRVR                    0x00000002  
-#define SVCCTL_WIN32_OWN_PROC                      0x00000010
-#define SVCCTL_WIN32_SHARED_PROC                   0x00000020
-#define SVCCTL_WIN32_INTERACTIVE                   0x00000100 
-
 /* utility structures for RPCs */
 
 /*
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index 457e44a2df8..1b9c9b84e4c 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -650,7 +650,7 @@ static WERROR fill_svc_config( TALLOC_CTX *ctx, const char *name,
 	/* loadordergroup and dependencies are empty */
 
 	config->tag_id           = 0x00000000;			/* unassigned loadorder group */
-	config->service_type     = SVCCTL_WIN32_OWN_PROC;
+	config->service_type     = SERVICE_TYPE_WIN32_OWN_PROCESS;
 	config->error_control    = SVCCTL_SVC_ERROR_NORMAL;
 
 	/* set the start type.  NetLogon and WINS are disabled to prevent
diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index dbd2da1c656..e41524851fb 100644
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -260,7 +260,7 @@ static void fill_service_values( const char *name, REGVAL_CTR *values )
 	dword = SVCCTL_AUTO_START;
 	regval_ctr_addvalue( values, "Start", REG_DWORD, (char*)&dword, sizeof(uint32));
 
-	dword = SVCCTL_WIN32_OWN_PROC;
+	dword = SERVICE_TYPE_WIN32_OWN_PROCESS;
 	regval_ctr_addvalue( values, "Type", REG_DWORD, (char*)&dword, sizeof(uint32));
 
 	dword = SVCCTL_SVC_ERROR_NORMAL;
diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 7d1c4860aaa..2c32537e802 100644
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -224,7 +224,7 @@ static NTSTATUS rpc_service_list_internal(struct net_context *c,
 		return werror_to_ntstatus(result);
 	}
 
-	result = rpccli_svcctl_enumerate_services(pipe_hnd, mem_ctx, &hSCM, SVCCTL_TYPE_WIN32,
+	result = rpccli_svcctl_enumerate_services(pipe_hnd, mem_ctx, &hSCM, SERVICE_TYPE_WIN32,
 		SVCCTL_STATE_ALL, &num_services, &services );
 
 	if ( !W_ERROR_IS_OK(result) ) {