svn commit: samba r7603 - in branches/SAMBA_3_0/source: include rpc_server services

[jerry at samba.org]

Author: jerry
Date: 2005-06-15 03:10:36 +0000 (Wed, 15 Jun 2005)
New Revision: 7603

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7603

Log:
* fix a bug in the SERVICE_ALL_ACCESS security mask
* add calls to start and stop a service (to be filled
  in by the backend routines in services/svc_*.c



Modified:
   branches/SAMBA_3_0/source/include/rpc_secdes.h
   branches/SAMBA_3_0/source/include/rpc_svcctl.h
   branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c
   branches/SAMBA_3_0/source/services/svc_rcinit.c
   branches/SAMBA_3_0/source/services/svc_spoolss.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/rpc_secdes.h
===================================================================
--- branches/SAMBA_3_0/source/include/rpc_secdes.h	2005-06-15 02:45:11 UTC (rev 7602)
+++ branches/SAMBA_3_0/source/include/rpc_secdes.h	2005-06-15 03:10:36 UTC (rev 7603)
@@ -518,7 +518,8 @@
 #define SERVICE_ALL_ACCESS \
 	( STANDARD_RIGHTS_REQUIRED_ACCESS	| \
 	  SERVICE_READ_ACCESS			| \
-	  SERVICE_EXECUTE_ACCESS )
+	  SERVICE_EXECUTE_ACCESS		| \
+	  SC_RIGHT_SVC_CHANGE_CONFIG )
 
 	   
 

Modified: branches/SAMBA_3_0/source/include/rpc_svcctl.h
===================================================================
--- branches/SAMBA_3_0/source/include/rpc_svcctl.h	2005-06-15 02:45:11 UTC (rev 7602)
+++ branches/SAMBA_3_0/source/include/rpc_svcctl.h	2005-06-15 03:10:36 UTC (rev 7603)
@@ -204,7 +204,7 @@
  
 typedef struct {
 	/* functions for enumerating subkeys and values */	
-	WERROR 	(*stop_service)( void );
+	WERROR 	(*stop_service)( SERVICE_STATUS *status );
 	WERROR 	(*start_service) ( void );
 	WERROR 	(*service_status)( SERVICE_STATUS *status );
 } SERVICE_CONTROL_OPS;

Modified: branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c	2005-06-15 02:45:11 UTC (rev 7602)
+++ branches/SAMBA_3_0/source/rpc_server/srv_svcctl_nt.c	2005-06-15 03:10:36 UTC (rev 7603)
@@ -496,6 +496,8 @@
 	if ( !(info->access_granted & SC_RIGHT_SVC_START) )
 		return WERR_ACCESS_DENIED;
 		
+	return info->ops->start_service();
+	
 	return WERR_OK;
 }
 
@@ -518,6 +520,8 @@
 	if ( !(info->access_granted & SC_RIGHT_SVC_STOP) )
 		return WERR_ACCESS_DENIED;
 		
+	return info->ops->stop_service( &r_u->svc_status );
+		
 #if 0
 	SERVICE_INFO *service_info;
 	POLICY_HND   *handle;
@@ -582,8 +586,6 @@
 	DEBUG(10, ("_svcctl_query_service_config: Should call the commFound service [%s], [%s]\n",service_info->servicename,service_info->filename));
 
 #endif
-
-	return WERR_OK;
 }
 
 /********************************************************************

Modified: branches/SAMBA_3_0/source/services/svc_rcinit.c
===================================================================
--- branches/SAMBA_3_0/source/services/svc_rcinit.c	2005-06-15 02:45:11 UTC (rev 7602)
+++ branches/SAMBA_3_0/source/services/svc_rcinit.c	2005-06-15 03:10:36 UTC (rev 7603)
@@ -171,7 +171,7 @@
 /*********************************************************************
 *********************************************************************/
 
-static WERROR rcinit_stop( void )
+static WERROR rcinit_stop( SERVICE_STATUS *service_status )
 {
 	return WERR_OK;
 }

Modified: branches/SAMBA_3_0/source/services/svc_spoolss.c
===================================================================
--- branches/SAMBA_3_0/source/services/svc_spoolss.c	2005-06-15 02:45:11 UTC (rev 7602)
+++ branches/SAMBA_3_0/source/services/svc_spoolss.c	2005-06-15 03:10:36 UTC (rev 7603)
@@ -25,7 +25,7 @@
 /*********************************************************************
 *********************************************************************/
 
-static WERROR spoolss_stop( void )
+static WERROR spoolss_stop( SERVICE_STATUS *service_status )
 {
 	return WERR_OK;
 }