Add iconv_convenience argument to size functions.
[metze/samba/wip.git] / source3 / rpc_server / srv_svcctl_nt.c
index 580d000d123c9ec0a1fc6ae46c53855e7fdc89ad..187fb368e2032b98c91a7c45116108aa5193db5a 100644 (file)
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
- *  Copyright (C) Gerald (Jerry) Carter             2005,
+ *
  *  Copyright (C) Marcin Krzysztof Porwit           2005.
- *  
+ *
+ *  Largely Rewritten (Again) by:
+ *  Copyright (C) Gerald (Jerry) Carter             2005.
+ *  Copyright (C) Guenther Deschner                 2008.
+ *
  *  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 2 of the License, or
+ *  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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-/* TODO - Do the OpenService service name matching case-independently, or at least make it an option. */
-
-
 #include "includes.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-#define SERVICEDB_VERSION_V1 1 /* Will there be more? */
-#define INTERNAL_SERVICES_LIST "NETLOGON Spooler"
-
-/*                                                                                                                     */
-/* scripts will execute from the following libdir, if they are in the enable svcctl=<list of scripts>                  */
-/* these should likely be symbolic links. Note that information about them will be extracted from the files themselves */
-/* using the LSB standard keynames for various information                                                             */
-
-#define SVCCTL_SCRIPT_DIR  "/svcctl/"
-
-
-struct service_control_op_table {
+struct service_control_op {
        const char *name;
        SERVICE_CONTROL_OPS *ops;
 };
 
+#define SVCCTL_NUM_INTERNAL_SERVICES   4
+
+/* handle external services */
+extern SERVICE_CONTROL_OPS rcinit_svc_ops;
+
+/* builtin services (see service_db.c and services/svc_*.c */
 extern SERVICE_CONTROL_OPS spoolss_svc_ops;
+extern SERVICE_CONTROL_OPS netlogon_svc_ops;
+extern SERVICE_CONTROL_OPS winreg_svc_ops;
+extern SERVICE_CONTROL_OPS wins_svc_ops;
 
-struct service_control_op_table svcctl_ops[] = { 
-       { "Spooler",    &spoolss_svc_ops },
-       { "NETLOGON",   NULL },
-       { NULL,         NULL }
-};
+/* make sure this number patches the number of builtin
+   SERVICE_CONTROL_OPS structure listed above */
+
+#define SVCCTL_NUM_INTERNAL_SERVICES   4
+
+struct service_control_op *svcctl_ops;
+
+static const struct generic_mapping scm_generic_map =
+       { SC_MANAGER_READ_ACCESS, SC_MANAGER_WRITE_ACCESS, SC_MANAGER_EXECUTE_ACCESS, SC_MANAGER_ALL_ACCESS };
+static const struct generic_mapping svc_generic_map =
+       { SERVICE_READ_ACCESS, SERVICE_WRITE_ACCESS, SERVICE_EXECUTE_ACCESS, SERVICE_ALL_ACCESS };
 
 
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS svcctl_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token, 
-                                     uint32 access_desired, uint32 *access_granted )
+bool init_service_op_table( void )
 {
-       NTSTATUS result;
-       
-       /* maybe add privilege checks in here later */
-       
-       se_access_check( sec_desc, token, access_desired, access_granted, &result );
-       
-       return result;
+       const char **service_list = lp_svcctl_list();
+       int num_services = SVCCTL_NUM_INTERNAL_SERVICES + str_list_length( service_list );
+       int i;
+
+       if ( !(svcctl_ops = TALLOC_ARRAY( NULL, struct service_control_op, num_services+1)) ) {
+               DEBUG(0,("init_service_op_table: talloc() failed!\n"));
+               return False;
+       }
+
+       /* services listed in smb.conf get the rc.init interface */
+
+       for ( i=0; service_list && service_list[i]; i++ ) {
+               svcctl_ops[i].name = talloc_strdup( svcctl_ops, service_list[i] );
+               svcctl_ops[i].ops  = &rcinit_svc_ops;
+       }
+
+       /* add builtin services */
+
+       svcctl_ops[i].name = talloc_strdup( svcctl_ops, "Spooler" );
+       svcctl_ops[i].ops  = &spoolss_svc_ops;
+       i++;
+
+       svcctl_ops[i].name = talloc_strdup( svcctl_ops, "NETLOGON" );
+       svcctl_ops[i].ops  = &netlogon_svc_ops;
+       i++;
+
+       svcctl_ops[i].name = talloc_strdup( svcctl_ops, "RemoteRegistry" );
+       svcctl_ops[i].ops  = &winreg_svc_ops;
+       i++;
+
+       svcctl_ops[i].name = talloc_strdup( svcctl_ops, "WINS" );
+       svcctl_ops[i].ops  = &wins_svc_ops;
+       i++;
+
+       /* NULL terminate the array */
+
+       svcctl_ops[i].name = NULL;
+       svcctl_ops[i].ops  = NULL;
+
+       return True;
 }
 
 /********************************************************************
 ********************************************************************/
 
-static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx )
+static struct service_control_op* find_service_by_name( const char *name )
 {
-       SEC_ACE ace[2]; 
-       SEC_ACCESS mask;
-       size_t i = 0;
-       SEC_DESC *sd;
-       SEC_ACL *acl;
-       uint32 sd_size;
+       int i;
 
-       /* basic access for Everyone */
-       
-       init_sec_access(&mask, SC_MANAGER_READ_ACCESS );
-       init_sec_ace(&ace[i++], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-       
-       /* Full Access 'BUILTIN\Administrators' */
-       
-       init_sec_access(&mask,SC_MANAGER_ALL_ACCESS );
-       init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-       
-       
-       /* create the security descriptor */
-       
-       if ( !(acl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
-               return NULL;
+       for ( i=0; svcctl_ops[i].name; i++ ) {
+               if ( strequal( name, svcctl_ops[i].name ) )
+                       return &svcctl_ops[i];
+       }
 
-       if ( !(sd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, acl, &sd_size)) )
-               return NULL;
+       return NULL;
+}
+/********************************************************************
+********************************************************************/
 
-       return sd;
+static NTSTATUS svcctl_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token,
+                                     uint32 access_desired, uint32 *access_granted )
+{
+       if ( geteuid() == sec_initial_uid() ) {
+               DEBUG(5,("svcctl_access_check: using root's token\n"));
+               token = get_root_nt_token();
+       }
+
+       return se_access_check( sec_desc, token, access_desired, access_granted);
 }
 
 /********************************************************************
 ********************************************************************/
 
-static SEC_DESC* construct_service_sd( TALLOC_CTX *ctx )
+static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx )
 {
-       SEC_ACE ace[4]; 
-       SEC_ACCESS mask;
+       SEC_ACE ace[2];
        size_t i = 0;
        SEC_DESC *sd;
        SEC_ACL *acl;
-       uint32 sd_size;
+       size_t sd_size;
 
        /* basic access for Everyone */
-       
-       init_sec_access(&mask, SERVICE_READ_ACCESS );
-       init_sec_ace(&ace[i++], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-               
-       init_sec_access(&mask,SERVICE_EXECUTE_ACCESS );
-       init_sec_ace(&ace[i++], &global_sid_Builtin_Power_Users, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-       
-       init_sec_access(&mask,SERVICE_ALL_ACCESS );
-       init_sec_ace(&ace[i++], &global_sid_Builtin_Server_Operators, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-       init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-       
+
+       init_sec_ace(&ace[i++], &global_sid_World,
+               SEC_ACE_TYPE_ACCESS_ALLOWED, SC_MANAGER_READ_ACCESS, 0);
+
+       /* Full Access 'BUILTIN\Administrators' */
+
+       init_sec_ace(&ace[i++], &global_sid_Builtin_Administrators,
+               SEC_ACE_TYPE_ACCESS_ALLOWED, SC_MANAGER_ALL_ACCESS, 0);
+
+
        /* create the security descriptor */
-       
+
        if ( !(acl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
                return NULL;
 
-       if ( !(sd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, acl, &sd_size)) )
+       if ( !(sd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1,
+                                 SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL,
+                                 acl, &sd_size)) )
                return NULL;
 
        return sd;
@@ -139,13 +169,10 @@ static SEC_DESC* construct_service_sd( TALLOC_CTX *ctx )
 /******************************************************************
  free() function for REGISTRY_KEY
  *****************************************************************/
+
 static void free_service_handle_info(void *ptr)
 {
-       SERVICE_INFO *info = (SERVICE_INFO*)ptr;
-       
-       SAFE_FREE(info->name);
-       SAFE_FREE(info);
+       TALLOC_FREE( ptr );
 }
 
 /******************************************************************
@@ -156,8 +183,8 @@ static SERVICE_INFO *find_service_info_by_hnd(pipes_struct *p, POLICY_HND *hnd)
 {
        SERVICE_INFO *service_info = NULL;
 
-       if( !find_policy_by_hnd( p, hnd, (void **)&service_info) ) {
-               DEBUG(2,("find_service_info_by_hnd: handle not found"));
+       if( !find_policy_by_hnd( p, hnd, (void **)(void *)&service_info) ) {
+               DEBUG(2,("find_service_info_by_hnd: handle not found\n"));
                return NULL;
        }
 
@@ -166,56 +193,62 @@ static SERVICE_INFO *find_service_info_by_hnd(pipes_struct *p, POLICY_HND *hnd)
 
 /******************************************************************
  *****************************************************************/
-static WERROR create_open_service_handle( pipes_struct *p, POLICY_HND *handle, 
+
+static WERROR create_open_service_handle( pipes_struct *p, POLICY_HND *handle, uint32 type,
                                           const char *service, uint32 access_granted )
 {
        SERVICE_INFO *info = NULL;
        WERROR result = WERR_OK;
-       
-       if ( !(info = SMB_MALLOC_P( SERVICE_INFO )) )
+       struct service_control_op *s_op;
+
+       if ( !(info = TALLOC_ZERO_P( NULL, SERVICE_INFO )) )
                return WERR_NOMEM;
 
-       ZERO_STRUCTP( info );
-               
        /* the Service Manager has a NULL name */
-       
-       if ( !service ) {
+
+       info->type = SVC_HANDLE_IS_SCM;
+
+       switch ( type ) {
+       case SVC_HANDLE_IS_SCM:
                info->type = SVC_HANDLE_IS_SCM;
-       } else {
-               int i;
+               break;
+
+       case SVC_HANDLE_IS_DBLOCK:
+               info->type = SVC_HANDLE_IS_DBLOCK;
+               break;
 
+       case SVC_HANDLE_IS_SERVICE:
                info->type = SVC_HANDLE_IS_SERVICE;
-               
-               /* lookup the SERVICE_CONTROL_OPS */
 
-               for ( i=0; svcctl_ops[i].name; i++ ) {
-                       if ( strequal( svcctl_ops[i].name, service ) )  {
-                               info->ops = svcctl_ops[i].ops;
-                               break;
-                       }
-               }
+               /* lookup the SERVICE_CONTROL_OPS */
 
-               if ( !svcctl_ops[i].name ) {
+               if ( !(s_op = find_service_by_name( service )) ) {
                        result = WERR_NO_SUCH_SERVICE;
                        goto done;
                }
 
-               if ( !(info->name  = SMB_STRDUP( service )) ) {
+               info->ops = s_op->ops;
+
+               if ( !(info->name  = talloc_strdup( info, s_op->name )) ) {
                        result = WERR_NOMEM;
                        goto done;
                }
+               break;
+
+       default:
+               result = WERR_NO_SUCH_SERVICE;
+               goto done;
        }
 
-       info->access_granted = access_granted;  
-       
+       info->access_granted = access_granted;
+
        /* store the SERVICE_INFO and create an open handle */
-       
+
        if ( !create_policy_hnd( p, handle, free_service_handle_info, info ) ) {
                result = WERR_ACCESS_DENIED;
                goto done;
        }
-               
+
 done:
        if ( !W_ERROR_IS_OK(result) )
                free_service_handle_info( info );
@@ -226,193 +259,161 @@ done:
 /********************************************************************
 ********************************************************************/
 
-WERROR _svcctl_open_scmanager(pipes_struct *p, SVCCTL_Q_OPEN_SCMANAGER *q_u, SVCCTL_R_OPEN_SCMANAGER *r_u)
+WERROR _svcctl_OpenSCManagerW(pipes_struct *p,
+                             struct svcctl_OpenSCManagerW *r)
 {
        SEC_DESC *sec_desc;
        uint32 access_granted = 0;
        NTSTATUS status;
-       
+
        /* perform access checks */
-       
+
        if ( !(sec_desc = construct_scm_sd( p->mem_ctx )) )
                return WERR_NOMEM;
-               
-       status = svcctl_access_check( sec_desc, p->pipe_user.nt_user_token, q_u->access, &access_granted );
+
+       se_map_generic( &r->in.access_mask, &scm_generic_map );
+       status = svcctl_access_check( sec_desc, p->server_info->ptok,
+                                     r->in.access_mask, &access_granted );
        if ( !NT_STATUS_IS_OK(status) )
                return ntstatus_to_werror( status );
-               
-       return create_open_service_handle( p, &r_u->handle, NULL, access_granted );
+
+       return create_open_service_handle( p, r->out.handle, SVC_HANDLE_IS_SCM, NULL, access_granted );
 }
 
 /********************************************************************
+ _svcctl_OpenServiceW
 ********************************************************************/
 
-WERROR _svcctl_open_service(pipes_struct *p, SVCCTL_Q_OPEN_SERVICE *q_u, SVCCTL_R_OPEN_SERVICE *r_u)
+WERROR _svcctl_OpenServiceW(pipes_struct *p,
+                           struct svcctl_OpenServiceW *r)
 {
        SEC_DESC *sec_desc;
        uint32 access_granted = 0;
        NTSTATUS status;
-       pstring service;
-       SERVICE_INFO *scm_info;
+       const char *service = NULL;
 
-       rpcstr_pull(service, q_u->servicename.buffer, sizeof(service), q_u->servicename.uni_str_len*2, 0);
-       
-       DEBUG(5, ("_svcctl_open_service: Attempting to open Service [%s], \n", service));
+       service = r->in.ServiceName;
+       if (!service) {
+               return WERR_NOMEM;
+       }
+       DEBUG(5, ("_svcctl_OpenServiceW: Attempting to open Service [%s], \n", service));
 
-       
        /* based on my tests you can open a service if you have a valid scm handle */
-       
-       if ( !(scm_info = find_service_info_by_hnd( p, &q_u->handle )) )
+
+       if ( !find_service_info_by_hnd( p, r->in.scmanager_handle) )
                return WERR_BADFID;
-                       
-       /* perform access checks */
-       
-       if ( !(sec_desc = construct_service_sd( p->mem_ctx )) )
+
+       /* perform access checks.  Use the root token in order to ensure that we
+          retrieve the security descriptor */
+
+       if ( !(sec_desc = svcctl_get_secdesc( p->mem_ctx, service, get_root_nt_token() )) )
                return WERR_NOMEM;
-               
-       status = svcctl_access_check( sec_desc, p->pipe_user.nt_user_token, q_u->access, &access_granted );
+
+       se_map_generic( &r->in.access_mask, &svc_generic_map );
+       status = svcctl_access_check( sec_desc, p->server_info->ptok,
+                                     r->in.access_mask, &access_granted );
        if ( !NT_STATUS_IS_OK(status) )
                return ntstatus_to_werror( status );
-               
-#if 0  /* FIXME!!! */
-       if ( ! get_service_info(service_tdb, service, info) ) {
-               return WERR_NO_SUCH_SERVICE;
-#endif
-       
-       return create_open_service_handle( p, &r_u->handle, service, access_granted );
+
+       return create_open_service_handle( p, r->out.handle, SVC_HANDLE_IS_SERVICE, service, access_granted );
 }
 
 /********************************************************************
 ********************************************************************/
 
-WERROR _svcctl_close_service(pipes_struct *p, SVCCTL_Q_CLOSE_SERVICE *q_u, SVCCTL_R_CLOSE_SERVICE *r_u)
+WERROR _svcctl_CloseServiceHandle(pipes_struct *p, struct svcctl_CloseServiceHandle *r)
 {
-       return close_policy_hnd( p, &q_u->handle ) ? WERR_OK : WERR_BADFID;
+       if ( !close_policy_hnd( p, r->in.handle ) )
+               return  WERR_BADFID;
+
+       ZERO_STRUCTP(r->out.handle);
+
+       return WERR_OK;
 }
 
 /********************************************************************
+ _svcctl_GetServiceDisplayNameW
 ********************************************************************/
 
-WERROR _svcctl_get_display_name(pipes_struct *p, SVCCTL_Q_GET_DISPLAY_NAME *q_u, SVCCTL_R_GET_DISPLAY_NAME *r_u)
+WERROR _svcctl_GetServiceDisplayNameW(pipes_struct *p,
+                                     struct svcctl_GetServiceDisplayNameW *r)
 {
-       fstring service;
-       fstring displayname;
-       SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       const char *service;
+       const char *display_name;
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+
        /* can only use an SCM handle here */
-       
+
        if ( !info || (info->type != SVC_HANDLE_IS_SCM) )
                return WERR_BADFID;
-               
-       rpcstr_pull(service, q_u->servicename.buffer, sizeof(service), q_u->servicename.uni_str_len*2, 0);
 
-       /* need a tdb lookup here or something */
-       
-       fstrcpy( displayname, "FIX ME!" );
+       service = r->in.service_name;
 
-       init_svcctl_r_get_display_name( r_u, displayname );
+       display_name = svcctl_lookup_dispname(p->mem_ctx, service,
+                                             p->server_info->ptok);
+       if (!display_name) {
+               display_name = "";
+       }
+
+       *r->out.display_name = display_name;
+       *r->out.display_name_length = strlen(display_name);
 
        return WERR_OK;
 }
 
 /********************************************************************
+ _svcctl_QueryServiceStatus
 ********************************************************************/
 
-WERROR _svcctl_query_status(pipes_struct *p, SVCCTL_Q_QUERY_STATUS *q_u, SVCCTL_R_QUERY_STATUS *r_u)
+WERROR _svcctl_QueryServiceStatus(pipes_struct *p,
+                                 struct svcctl_QueryServiceStatus *r)
 {
-       SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+
        /* perform access checks */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SERVICE) )
                return WERR_BADFID;
-               
+
        if ( !(info->access_granted & SC_RIGHT_SVC_QUERY_STATUS) )
                return WERR_ACCESS_DENIED;
-               
-       /* try the service specific status call */
-
-       if ( info->ops ) 
-               return info->ops->service_status( &r_u->svc_status );
-
-       /* default action for now */
 
-       r_u->svc_status.type = 0x0020;
-       r_u->svc_status.state = 0x0004;
-       r_u->svc_status.controls_accepted = 0x0005;
+       /* try the service specific status call */
 
-       return WERR_OK;
+       return info->ops->service_status( info->name, r->out.service_status );
 }
 
+/********************************************************************
+********************************************************************/
 
-/*********************************************************************
- TODO - for internal services, do similar to external services, except 
- we have to call the right status routine...
-**********************************************************************/
-
-static WERROR enum_internal_services(TALLOC_CTX *tcx,ENUM_SERVICES_STATUS **svc_ptr, int existing_services, uint32 *added) 
+static int enumerate_status( TALLOC_CTX *ctx, ENUM_SERVICES_STATUS **status, NT_USER_TOKEN *token )
 {
-       int num_services = 2;
-       int i = 0;
-       ENUM_SERVICES_STATUS *services=NULL;
+       int num_services = 0;
+       int i;
+       ENUM_SERVICES_STATUS *st;
+       const char *display_name;
+
+       /* just count */
+       while ( svcctl_ops[num_services].name )
+               num_services++;
+
+       if ( !(st = TALLOC_ARRAY( ctx, ENUM_SERVICES_STATUS, num_services )) ) {
+               DEBUG(0,("enumerate_status: talloc() failed!\n"));
+               return -1;
+       }
 
-       if (!svc_ptr || !(*svc_ptr)) 
-               return WERR_NOMEM;
+       for ( i=0; i<num_services; i++ ) {
+               init_unistr( &st[i].servicename, svcctl_ops[i].name );
 
-       services = *svc_ptr;
-
-#if 0
-       /* *svc_ptr has the pointer to the array if there is one already. NULL if not. */
-       if ((existing_services>0) && svc_ptr && *svc_ptr) { /* reallocate vs. allocate */
-               DEBUG(8,("enum_internal_services: REALLOCing %d services\n", num_services));
-               services = TALLOC_REALLOC_ARRAY(tcx,*svc_ptr,ENUM_SERVICES_STATUS,existing_services+num_services);
-               if (!rsvcs) 
-                       return WERR_NOMEM;
-               *svc_ptr = services;
-       } else {
-               if ( !(services = TALLOC_ARRAY( tcx, ENUM_SERVICES_STATUS, num_services )) )
-                       return WERR_NOMEM;
-       }
-#endif
+               display_name = svcctl_lookup_dispname(ctx, svcctl_ops[i].name, token );
+               init_unistr( &st[i].displayname, display_name ? display_name : "");
 
-       if (existing_services > 0) {
-               i += existing_services;
+               svcctl_ops[i].ops->service_status( svcctl_ops[i].name, &st[i].status );
        }
-       DEBUG(8,("enum_internal_services: Creating %d services, starting index %d\n", num_services,existing_services));
-                               
-       init_unistr( &services[i].servicename, "Spooler" );
-       init_unistr( &services[i].displayname, "Print Spooler" );
-       
-       services[i].status.type               = 0x110;
-       services[i].status.controls_accepted  = 0x0;
-       services[i].status.win32_exit_code    = 0x0;
-       services[i].status.service_exit_code  = 0x0;
-       services[i].status.check_point        = 0x0;
-       services[i].status.wait_hint          = 0x0;
-       if ( !lp_disable_spoolss() ) 
-               services[i].status.state              = SVCCTL_RUNNING;
-       else
-               services[i].status.state              = SVCCTL_STOPPED;
-
-       i++;            
-       
-       init_unistr( &services[i].servicename, "NETLOGON" );
-       init_unistr( &services[i].displayname, "Net Logon" );
-       
-       services[i].status.type               = 0x20;   
-       services[i].status.controls_accepted  = 0x0;
-       services[i].status.win32_exit_code    = 0x0;
-       services[i].status.service_exit_code  = 0x0;
-       services[i].status.check_point        = 0x0;
-       services[i].status.wait_hint          = 0x0;
-       if ( lp_servicenumber("NETLOGON") != -1 ) 
-               services[i].status.state              = SVCCTL_RUNNING;
-       else
-               services[i].status.state              = SVCCTL_STOPPED;
 
-       *added = num_services;
+       *status = st;
 
-       return WERR_OK;
+       return num_services;
 }
 
 /********************************************************************
@@ -421,74 +422,47 @@ static WERROR enum_internal_services(TALLOC_CTX *tcx,ENUM_SERVICES_STATUS **svc_
 WERROR _svcctl_enum_services_status(pipes_struct *p, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, SVCCTL_R_ENUM_SERVICES_STATUS *r_u)
 {
        ENUM_SERVICES_STATUS *services = NULL;
-       uint32 num_int_services = 0;
-       uint32 num_ext_services = 0;
+       int num_services;
        int i = 0;
-       size_t buffer_size;
+       size_t buffer_size = 0;
        WERROR result = WERR_OK;
-       WERROR ext_result = WERR_OK;
        SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       NT_USER_TOKEN *token = p->server_info->ptok;
+
        /* perform access checks */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SCM) )
                return WERR_BADFID;
-               
-       if ( !(info->access_granted & SC_RIGHT_MGR_ENUMERATE_SERVICE) )
-               return WERR_ACCESS_DENIED;
-
-       /* num_services = str_list_count( lp_enable_svcctl() ); */
-
-       /* here's where we'll read the db of external services */
-       /* _svcctl_read_LSB_data(NULL,NULL); */
-       /* init_svcctl_db(); */
-       
-       /* num_int_services = num_internal_services(); */
-
-       /* num_ext_services =  num_external_services(); */
-
-       if ( !(services = TALLOC_ARRAY(p->mem_ctx, ENUM_SERVICES_STATUS, num_int_services+num_ext_services )) )
-          return WERR_NOMEM;
-
-        result = enum_internal_services(p->mem_ctx, &services, 0, &num_int_services);
-
-       if (W_ERROR_IS_OK(result)) {
-               DEBUG(8,("_svcctl_enum_services_status: Got %d internal services\n", num_int_services));
-       } 
 
-       /* ext_result=enum_external_services(p->mem_ctx, &services, num_int_services, &num_ext_services); */
-
-       if (W_ERROR_IS_OK(ext_result)) {
-               DEBUG(8,("_svcctl_enum_services_status: Got %d external services\n", num_ext_services));
-       } 
+       if ( !(info->access_granted & SC_RIGHT_MGR_ENUMERATE_SERVICE) ) {
+               return WERR_ACCESS_DENIED;
+       }
 
-        DEBUG(8,("_svcctl_enum_services_status: total of %d services\n", num_int_services+num_ext_services));
+       num_services = enumerate_status( p->mem_ctx, &services, token );
+       if (num_services == -1 ) {
+               return WERR_NOMEM;
+       }
 
-       buffer_size = 0;
-        for (i=0;i<num_int_services+num_ext_services;i++) {
-         buffer_size += svcctl_sizeof_enum_services_status(&services[i]);
+        for ( i=0; i<num_services; i++ ) {
+               buffer_size += svcctl_sizeof_enum_services_status(&services[i]);
        }
 
-       /* */
        buffer_size += buffer_size % 4;
-       DEBUG(8,("_svcctl_enum_services_status: buffer size passed %d, we need %d\n",
-                q_u->buffer_size, buffer_size));
 
        if (buffer_size > q_u->buffer_size ) {
-               num_int_services = 0;
-               num_ext_services = 0;
+               num_services = 0;
                result = WERR_MORE_DATA;
        }
 
        rpcbuf_init(&r_u->buffer, q_u->buffer_size, p->mem_ctx);
 
        if ( W_ERROR_IS_OK(result) ) {
-               for ( i=0; i<num_int_services+num_ext_services; i++ )
+               for ( i=0; i<num_services; i++ )
                        svcctl_io_enum_services_status( "", &services[i], &r_u->buffer, 0 );
        }
 
        r_u->needed      = (buffer_size > q_u->buffer_size) ? buffer_size : q_u->buffer_size;
-       r_u->returned    = num_int_services+num_ext_services;
+       r_u->returned    = (uint32)num_services;
 
        if ( !(r_u->resume = TALLOC_P( p->mem_ctx, uint32 )) )
                return WERR_NOMEM;
@@ -499,69 +473,83 @@ WERROR _svcctl_enum_services_status(pipes_struct *p, SVCCTL_Q_ENUM_SERVICES_STAT
 }
 
 /********************************************************************
+ _svcctl_StartServiceW
 ********************************************************************/
 
-WERROR _svcctl_start_service(pipes_struct *p, SVCCTL_Q_START_SERVICE *q_u, SVCCTL_R_START_SERVICE *r_u)
+WERROR _svcctl_StartServiceW(pipes_struct *p,
+                            struct svcctl_StartServiceW *r)
 {
-       SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+
        /* perform access checks */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SERVICE) )
                return WERR_BADFID;
-       
+
        if ( !(info->access_granted & SC_RIGHT_SVC_START) )
                return WERR_ACCESS_DENIED;
-               
-       return info->ops->start_service();
+
+       return info->ops->start_service( info->name );
 }
 
 /********************************************************************
+ _svcctl_ControlService
 ********************************************************************/
 
-WERROR _svcctl_control_service(pipes_struct *p, SVCCTL_Q_CONTROL_SERVICE *q_u, SVCCTL_R_CONTROL_SERVICE *r_u)
+WERROR _svcctl_ControlService(pipes_struct *p,
+                             struct svcctl_ControlService *r)
 {
-       SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+
        /* perform access checks */
-       /* we only support stop so don't get complicated */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SERVICE) )
-               return WERR_BADFID;     
-       
-       if ( q_u->control != SVCCTL_CONTROL_STOP )
-               return WERR_ACCESS_DENIED;
-               
-       if ( !(info->access_granted & SC_RIGHT_SVC_STOP) )
+               return WERR_BADFID;
+
+       switch ( r->in.control ) {
+       case SVCCTL_CONTROL_STOP:
+               if ( !(info->access_granted & SC_RIGHT_SVC_STOP) )
+                       return WERR_ACCESS_DENIED;
+
+               return info->ops->stop_service( info->name,
+                                               r->out.service_status );
+
+       case SVCCTL_CONTROL_INTERROGATE:
+               if ( !(info->access_granted & SC_RIGHT_SVC_QUERY_STATUS) )
+                       return WERR_ACCESS_DENIED;
+
+               return info->ops->service_status( info->name,
+                                                 r->out.service_status );
+       default:
                return WERR_ACCESS_DENIED;
-               
-       return info->ops->stop_service( &r_u->svc_status );
+       }
 }
 
 /********************************************************************
+ _svcctl_EnumDependentServicesW
 ********************************************************************/
 
-WERROR _svcctl_enum_dependent_services( pipes_struct *p, SVCCTL_Q_ENUM_DEPENDENT_SERVICES *q_u, SVCCTL_R_ENUM_DEPENDENT_SERVICES *r_u )
+WERROR _svcctl_EnumDependentServicesW(pipes_struct *p,
+                                     struct svcctl_EnumDependentServicesW *r)
 {
-       SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.service );
+
        /* perform access checks */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SERVICE) )
-               return WERR_BADFID;     
-       
+               return WERR_BADFID;
+
        if ( !(info->access_granted & SC_RIGHT_SVC_ENUMERATE_DEPENDENTS) )
                return WERR_ACCESS_DENIED;
-                       
-       /* we have to set the outgoing buffer size to the same as the 
+
+       /* we have to set the outgoing buffer size to the same as the
           incoming buffer size (even in the case of failure */
+       /* this is done in the autogenerated server already - gd */
+
+       *r->out.bytes_needed = r->in.buf_size;
 
-       rpcbuf_init( &r_u->buffer, q_u->buffer_size, p->mem_ctx );
-                               
-       r_u->needed      = q_u->buffer_size;
-       
        /* no dependent services...basically a stub function */
-       r_u->returned    = 0;
+       *r->out.services_returned = 0;
 
        return WERR_OK;
 }
@@ -571,190 +559,141 @@ WERROR _svcctl_enum_dependent_services( pipes_struct *p, SVCCTL_Q_ENUM_DEPENDENT
 
 WERROR _svcctl_query_service_status_ex( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_STATUSEX *q_u, SVCCTL_R_QUERY_SERVICE_STATUSEX *r_u )
 {
-        SERVICE_STATUS_PROCESS ssp;
-       POLICY_HND *handle;
-       SERVICE_INFO *service_info;
-       pstring     command;
        SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       uint32 buffer_size;
+
        /* perform access checks */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SERVICE) )
-               return WERR_BADFID;     
-       
+               return WERR_BADFID;
+
        if ( !(info->access_granted & SC_RIGHT_SVC_QUERY_STATUS) )
                return WERR_ACCESS_DENIED;
 
-       /* we have to set the outgoing buffer size to the same as the 
-          incoming buffer size (even in the case of failure */
+       /* we have to set the outgoing buffer size to the same as the
+          incoming buffer size (even in the case of failure) */
 
-       r_u->needed      = q_u->buffer_size;
+       rpcbuf_init( &r_u->buffer, q_u->buffer_size, p->mem_ctx );
+       r_u->needed = q_u->buffer_size;
 
-        /* need to find the service name by the handle that is open */
-       handle = &(q_u->handle);
+       switch ( q_u->level ) {
+               case SVC_STATUS_PROCESS_INFO:
+               {
+                       SERVICE_STATUS_PROCESS svc_stat_proc;
 
+                       /* Get the status of the service.. */
+                       info->ops->service_status( info->name, &svc_stat_proc.status );
+                       svc_stat_proc.process_id     = sys_getpid();
+                       svc_stat_proc.service_flags  = 0x0;
 
-       /* get rid of the easy errors */
+                       svcctl_io_service_status_process( "", &svc_stat_proc, &r_u->buffer, 0 );
+                       buffer_size = sizeof(SERVICE_STATUS_PROCESS);
+                       break;
+               }
 
-       if (q_u->info_level != SVC_STATUS_PROCESS_INFO) {
-               DEBUG(10, ("_svcctl_query_service_status_ex :  Invalid information level specified\n"));
-               return WERR_UNKNOWN_LEVEL; 
+               default:
+                       return WERR_UNKNOWN_LEVEL;
        }
 
-       service_info = find_service_info_by_hnd(p, handle);
 
-       if (!service_info) {
-               DEBUG(10, ("_svcctl_query_service_status_ex : Can't find the service for the handle\n"));
-               return WERR_BADFID; 
-       }
-       
-       if (r_u->needed < (sizeof(SERVICE_STATUS_PROCESS)+sizeof(uint32)+sizeof(uint32))) {
-               DEBUG(10, ("_svcctl_query_service_status_ex : buffer size of [%d] is too small.\n",r_u->needed));
-               return WERR_INSUFFICIENT_BUFFER;
-       }
+        buffer_size += buffer_size % 4;
+       r_u->needed = (buffer_size > q_u->buffer_size) ? buffer_size : q_u->buffer_size;
 
-       ZERO_STRUCT(ssp); 
-           
-#if 0
-        if (!strwicmp(service_info->servicetype,"EXTERNAL")) 
-               ssp.type = SVCCTL_WIN32_OWN_PROC;
-       else 
-               ssp.type = SVCCTL_WIN32_SHARED_PROC;
-#endif
+        if (buffer_size > q_u->buffer_size )
+                return WERR_MORE_DATA;
 
-       /* Get the status of the service.. */
+       return WERR_OK;
+}
+
+/********************************************************************
+********************************************************************/
 
-        memset(command, 0, sizeof(command));
+static WERROR fill_svc_config( TALLOC_CTX *ctx, const char *name,
+                              struct QUERY_SERVICE_CONFIG *config,
+                              NT_USER_TOKEN *token )
+{
+       REGVAL_CTR *values;
+       REGISTRY_VALUE *val;
 
-#if 0
-       slprintf(command, sizeof(command)-1, "%s%s%s %s", dyn_LIBDIR, SVCCTL_SCRIPT_DIR, service_info->filename, "status");
+       /* retrieve the registry values for this service */
 
-        DEBUG(10, ("_svcctl_query_service_status_ex: status command is [%s]\n", command));
+       if ( !(values = svcctl_fetch_regvalues( name, token )) )
+               return WERR_REG_CORRUPT;
 
-       /* TODO  - wrap in privilege check */
+       /* now fill in the individual values */
 
-       ret = smbrun(command, &fd);
-       DEBUGADD(10, ("returned [%d]\n", ret));
-        close(fd);
-       if(ret != 0)
-               DEBUG(10, ("_svcctl_query_service_status_ex: Command returned  [%d]\n", ret));
+       if ( (val = regval_ctr_getvalue( values, "DisplayName" )) != NULL )
+               config->displayname = regval_sz(val);
+       else
+               config->displayname = name;
 
-       /* SET all service_stats bits here... */
-       if (ret == 0) {
-               ssp.state              = SVCCTL_RUNNING;
-               ssp.controls_accepted  = SVCCTL_CONTROL_SHUTDOWN | SVCCTL_CONTROL_STOP;
-       } else {
-               ssp.state              = SVCCTL_STOPPED;
-               ssp.controls_accepted  = 0;
+       if ( (val = regval_ctr_getvalue( values, "ObjectName" )) != NULL ) {
+               config->startname = regval_sz(val);
        }
-#endif
+
+       if ( (val = regval_ctr_getvalue( values, "ImagePath" )) != NULL ) {
+               config->executablepath = regval_sz(val);
+       }
+
+       /* a few hard coded values */
+       /* loadordergroup and dependencies are empty */
+
+       config->tag_id           = 0x00000000;                  /* unassigned loadorder group */
+       config->service_type     = SVCCTL_WIN32_OWN_PROC;
+       config->error_control    = SVCCTL_SVC_ERROR_NORMAL;
+
+       /* set the start type.  NetLogon and WINS are disabled to prevent
+          the client from showing the "Start" button (if of course the services
+          are not running */
+
+       if ( strequal( name, "NETLOGON" ) && ( lp_servicenumber(name) == -1 ) )
+               config->start_type = SVCCTL_DISABLED;
+       else if ( strequal( name, "WINS" ) && ( !lp_wins_support() ))
+               config->start_type = SVCCTL_DISABLED;
+       else
+               config->start_type = SVCCTL_DEMAND_START;
+
+
+       TALLOC_FREE( values );
 
        return WERR_OK;
 }
 
 /********************************************************************
+ _svcctl_QueryServiceConfigW
 ********************************************************************/
 
-WERROR _svcctl_query_service_config( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CONFIG *q_u, SVCCTL_R_QUERY_SERVICE_CONFIG *r_u )
+WERROR _svcctl_QueryServiceConfigW(pipes_struct *p,
+                                  struct svcctl_QueryServiceConfigW *r)
 {
-       POLICY_HND *handle;
-       SERVICE_INFO *service_info;
-        uint32      needed_size;
-       SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+       uint32 buffer_size;
+       WERROR wresult;
+
        /* perform access checks */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SERVICE) )
-               return WERR_BADFID;     
-       
+               return WERR_BADFID;
+
        if ( !(info->access_granted & SC_RIGHT_SVC_QUERY_CONFIG) )
                return WERR_ACCESS_DENIED;
 
-       /* we have to set the outgoing buffer size to the same as the 
+       /* we have to set the outgoing buffer size to the same as the
           incoming buffer size (even in the case of failure */
 
-       r_u->needed      = q_u->buffer_size;
-
-        /* need to find the service name by the handle that is open */
-       handle = &(q_u->handle);
+       *r->out.bytes_needed = r->in.buf_size;
 
-       service_info = find_service_info_by_hnd(p, handle);
+       wresult = fill_svc_config( p->mem_ctx, info->name, r->out.query,
+                                  p->server_info->ptok);
+       if ( !W_ERROR_IS_OK(wresult) )
+               return wresult;
 
-#if 0
-       if (q_u->buffer_size < sizeof(Service_info)) {
-               /* have to report need more... */
-               /* TODO worst case -- should actualy calc what we need here. */
-               r_u->needed = sizeof(Service_info)+sizeof(pstring)*5; 
-               DEBUG(10, ("_svcctl_query_service_config: NOT ENOUGH BUFFER ALLOCATED FOR RETURN DATA -- provided %d wanted %d\n",
-               q_u->buffer_size,r_u->needed));
+       buffer_size = ndr_size_QUERY_SERVICE_CONFIG(r->out.query, NULL, 0);
+       *r->out.bytes_needed = (buffer_size > r->in.buf_size) ? buffer_size : r->in.buf_size;
 
-               return WERR_INSUFFICIENT_BUFFER;
-       }
-#endif
-       if (!service_info) {
-               DEBUG(10, ("_svcctl_query_service_config : Can't find the service for the handle\n"));
-               return WERR_BADFID; 
-       }
-
-#if 0
-       if ( !(service_config = (SERVICE_CONFIG *)TALLOC_ZERO_P(p->mem_ctx, SERVICE_CONFIG)) )
-               return WERR_NOMEM;
-#endif
-
-       r_u->config.service_type       = SVCCTL_WIN32_OWN_PROC;
-       r_u->config.start_type         = SVCCTL_DEMAND_START;
-       r_u->config.error_control      = SVCCTL_SVC_ERROR_IGNORE;
-       r_u->config.tag_id = 0x00000000;
-
-       /* Init the strings */
-
-       r_u->config.executablepath = TALLOC_ZERO_P(p->mem_ctx,  UNISTR2);
-       r_u->config.loadordergroup = TALLOC_ZERO_P(p->mem_ctx,  UNISTR2);
-       r_u->config.dependencies = TALLOC_ZERO_P(p->mem_ctx,  UNISTR2);
-       r_u->config.startname = TALLOC_ZERO_P(p->mem_ctx,  UNISTR2);
-       r_u->config.displayname = TALLOC_ZERO_P(p->mem_ctx,  UNISTR2);
-
-#if 0
-       pstrcpy(fullpathinfo,dyn_LIBDIR);
-       pstrcat(fullpathinfo,SVCCTL_SCRIPT_DIR);
-       pstrcat(fullpathinfo,service_info->filename);
-       /* Get and calculate the size of the fields. Note that we're still building the fields in the "too-small buffer case"
-          even though we throw it away. */
-       
-       DEBUG(10, ("_svcctl_query_service_config: fullpath info [%s]\n",fullpathinfo));
-       init_unistr2(r_u->config.executablepath,fullpathinfo,UNI_STR_TERMINATE);
-       init_unistr2(r_u->config.loadordergroup,"",UNI_STR_TERMINATE);
-       init_unistr2(r_u->config.dependencies,service_info->dependencies,UNI_STR_TERMINATE);
-
-       /* TODO - if someone really cares, perhaps "LocalSystem" should be changed to something else here... */
-
-       init_unistr2(r_u->config.startname,"LocalSystem",UNI_STR_TERMINATE);
-       init_unistr2(r_u->config.displayname,service_info->servicename,UNI_STR_TERMINATE);
-#endif
-
-       needed_size = 0x04 + sizeof(SERVICE_CONFIG)+ 2*(
-                     r_u->config.executablepath->uni_str_len +
-                     r_u->config.loadordergroup->uni_str_len + 
-                     r_u->config.dependencies->uni_str_len + 
-                      r_u->config.startname->uni_str_len + 
-                      r_u->config.displayname->uni_str_len);
-       
-               DEBUG(10, ("_svcctl_query_service_config: ****** need to have a buffer of [%d], [%d] for struct \n",needed_size,
-                  sizeof(SERVICE_CONFIG)));
-       DEBUG(10, ("\tsize of executable path : %d\n",r_u->config.executablepath->uni_str_len));
-       DEBUG(10, ("\tsize of loadordergroup  : %d\n", r_u->config.loadordergroup->uni_str_len)); 
-       DEBUG(10, ("\tsize of dependencies    : %d\n", r_u->config.dependencies->uni_str_len)); 
-       DEBUG(10, ("\tsize of startname       : %d\n", r_u->config.startname->uni_str_len));
-       DEBUG(10, ("\tsize of displayname     : %d\n", r_u->config.displayname->uni_str_len));
-
-       if (q_u->buffer_size < needed_size) {
-               /* have to report need more...*/
-               r_u->needed = needed_size;
-                       DEBUG(10, ("_svcctl_query_service_config: ****** zeroing strings for return\n"));
-               memset(&r_u->config,0,sizeof(SERVICE_CONFIG));
-               DEBUG(10, ("_svcctl_query_service_config: Not enouh buffer provided for return -- provided %d wanted %d\n",
-                       q_u->buffer_size,needed_size));
-               return WERR_INSUFFICIENT_BUFFER;
+        if (buffer_size > r->in.buf_size ) {
+               ZERO_STRUCTP(r->out.query);
+                return WERR_INSUFFICIENT_BUFFER;
        }
 
        return WERR_OK;
@@ -765,73 +704,401 @@ WERROR _svcctl_query_service_config( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CON
 
 WERROR _svcctl_query_service_config2( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, SVCCTL_R_QUERY_SERVICE_CONFIG2 *r_u )
 {
-       POLICY_HND *handle;
-       SERVICE_INFO *service_info;
-        uint32   level;
        SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       
+       uint32 buffer_size;
+
        /* perform access checks */
 
        if ( !info || (info->type != SVC_HANDLE_IS_SERVICE) )
-               return WERR_BADFID;     
-       
+               return WERR_BADFID;
+
        if ( !(info->access_granted & SC_RIGHT_SVC_QUERY_CONFIG) )
                return WERR_ACCESS_DENIED;
-       /* we have to set the outgoing buffer size to the same as the 
+
+       /* we have to set the outgoing buffer size to the same as the
           incoming buffer size (even in the case of failure */
 
-       r_u->needed      = q_u->buffer_size;
-       r_u->description = NULL;               
-       r_u->returned = q_u->buffer_size;
-       r_u->offset = 4;                       
+       rpcbuf_init( &r_u->buffer, q_u->buffer_size, p->mem_ctx );
+       r_u->needed = q_u->buffer_size;
 
-       handle = &(q_u->handle);
+       switch ( q_u->level ) {
+       case SERVICE_CONFIG_DESCRIPTION:
+               {
+                       SERVICE_DESCRIPTION desc_buf;
+                       const char *description;
 
-       service_info = find_service_info_by_hnd(p, handle);
+                       description = svcctl_lookup_description(
+                               p->mem_ctx, info->name, p->server_info->ptok);
 
-       if (!service_info) {
-               DEBUG(10, ("_svcctl_query_service_config2 : Can't find the service for the handle\n"));
-               return WERR_BADFID; 
-       }
-       
-       /* 
-          TODO - perhaps move the RPC_DATA_BLOB into the R_QUERY_SERVICE_CONFIG structure, and to the processing in here, vs
-           in the *r_query_config2 marshalling routine...
-       */
-
-       level = q_u->info_level;
-
-#if 0
-       if (SERVICE_CONFIG_DESCRIPTION == level) {
-               if (service_info && service_info->shortdescription) {
-                       /* length of the string, plus the terminator... */
-                       string_buffer_size = strlen(service_info->shortdescription)+1; 
-                       DEBUG(10, ("_svcctl_query_service_config: copying the description [%s] length [%d]\n",
-                       service_info->shortdescription,string_buffer_size));
-           
-                       if (q_u->buffer_size >= ((string_buffer_size)*2+4)) {
-                               r_u->description = TALLOC_ZERO_P(p->mem_ctx,  UNISTR2);
-                               if (!r_u->description) return WERR_NOMEM;
-                                       init_unistr2(r_u->description,service_info->shortdescription,UNI_STR_TERMINATE);
-                       }
-               }
-               else { 
-                       string_buffer_size = 0;
+                       ZERO_STRUCTP( &desc_buf );
+
+                       init_service_description_buffer( &desc_buf, description ? description : "");
+                       svcctl_io_service_description( "", &desc_buf, &r_u->buffer, 0 );
+                       buffer_size = svcctl_sizeof_service_description( &desc_buf );
+
+                       break;
                }
-               DEBUG(10, ("_svcctl_query_service_config2: buffer needed is [%x], return buffer size is [%x]\n",
-                       string_buffer_size,q_u->buffer_size));
-               if (((string_buffer_size)*2+4) > q_u->buffer_size) {
-                       r_u->needed = (string_buffer_size+1)*2+4;
-                       DEBUG(10, ("_svcctl_query_service_config2: INSUFFICIENT BUFFER\n"));
-                       return WERR_INSUFFICIENT_BUFFER;
+               break;
+       case SERVICE_CONFIG_FAILURE_ACTIONS:
+               {
+                       SERVICE_FAILURE_ACTIONS actions;
+
+                       /* nothing to say...just service the request */
+
+                       ZERO_STRUCTP( &actions );
+                       svcctl_io_service_fa( "", &actions, &r_u->buffer, 0 );
+                       buffer_size = svcctl_sizeof_service_fa( &actions );
+
+                       break;
                }
-               DEBUG(10, ("_svcctl_query_service_config2: returning ok, needed is [%x], buffer size is [%x]\n",
-               r_u->needed,q_u->buffer_size));
+               break;
+
+       default:
+               return WERR_UNKNOWN_LEVEL;
+       }
+
+       buffer_size += buffer_size % 4;
+       r_u->needed = (buffer_size > q_u->buffer_size) ? buffer_size : q_u->buffer_size;
+
+        if (buffer_size > q_u->buffer_size )
+                return WERR_INSUFFICIENT_BUFFER;
+
+       return WERR_OK;
+}
+
+/********************************************************************
+ _svcctl_LockServiceDatabase
+********************************************************************/
+
+WERROR _svcctl_LockServiceDatabase(pipes_struct *p,
+                                  struct svcctl_LockServiceDatabase *r)
+{
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+
+       /* perform access checks */
+
+       if ( !info || (info->type != SVC_HANDLE_IS_SCM) )
+               return WERR_BADFID;
+
+       if ( !(info->access_granted & SC_RIGHT_MGR_LOCK) )
+               return WERR_ACCESS_DENIED;
+
+       /* Just open a handle.  Doesn't actually lock anything */
+
+       return create_open_service_handle( p, r->out.lock, SVC_HANDLE_IS_DBLOCK, NULL, 0 );
+}
+
+/********************************************************************
+ _svcctl_UnlockServiceDatabase
+********************************************************************/
+
+WERROR _svcctl_UnlockServiceDatabase(pipes_struct *p,
+                                    struct svcctl_UnlockServiceDatabase *r)
+{
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.lock );
+
+
+       if ( !info || (info->type != SVC_HANDLE_IS_DBLOCK) )
+               return WERR_BADFID;
+
+       return close_policy_hnd( p, r->out.lock) ? WERR_OK : WERR_BADFID;
+}
+
+/********************************************************************
+ _svcctl_QueryServiceObjectSecurity
+********************************************************************/
+
+WERROR _svcctl_QueryServiceObjectSecurity(pipes_struct *p,
+                                         struct svcctl_QueryServiceObjectSecurity *r)
+{
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+       SEC_DESC *sec_desc;
+       NTSTATUS status;
+       uint8_t *buffer = NULL;
+       size_t len = 0;
+
+
+       /* only support the SCM and individual services */
+
+       if ( !info || !(info->type & (SVC_HANDLE_IS_SERVICE|SVC_HANDLE_IS_SCM)) )
+               return WERR_BADFID;
+
+       /* check access reights (according to MSDN) */
+
+       if ( !(info->access_granted & STD_RIGHT_READ_CONTROL_ACCESS) )
+               return WERR_ACCESS_DENIED;
+
+       /* TODO: handle something besides DACL_SECURITY_INFORMATION */
+
+       if ( (r->in.security_flags & DACL_SECURITY_INFORMATION) != DACL_SECURITY_INFORMATION )
+               return WERR_INVALID_PARAM;
+
+       /* lookup the security descriptor and marshall it up for a reply */
+
+       if ( !(sec_desc = svcctl_get_secdesc( p->mem_ctx, info->name, get_root_nt_token() )) )
+                return WERR_NOMEM;
+
+       *r->out.needed = ndr_size_security_descriptor( sec_desc, NULL, 0 );
+
+       if ( *r->out.needed > r->in.buffer_size ) {
+               ZERO_STRUCTP( &r->out.buffer );
+               return WERR_INSUFFICIENT_BUFFER;
+       }
+
+       status = marshall_sec_desc(p->mem_ctx, sec_desc, &buffer, &len);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
+
+       *r->out.needed = len;
+       r->out.buffer = buffer;
+
+       return WERR_OK;
+}
+
+/********************************************************************
+ _svcctl_SetServiceObjectSecurity
+********************************************************************/
+
+WERROR _svcctl_SetServiceObjectSecurity(pipes_struct *p,
+                                       struct svcctl_SetServiceObjectSecurity *r)
+{
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+       SEC_DESC *sec_desc = NULL;
+       uint32 required_access;
+       NTSTATUS status;
+
+       if ( !info || !(info->type & (SVC_HANDLE_IS_SERVICE|SVC_HANDLE_IS_SCM))  )
+               return WERR_BADFID;
+
+       /* can't set the security de4scriptor on the ServiceControlManager */
+
+       if ( info->type == SVC_HANDLE_IS_SCM )
+               return WERR_ACCESS_DENIED;
 
-               return WERR_OK;    
-       } 
-#endif
+       /* check the access on the open handle */
+
+       switch ( r->in.security_flags ) {
+               case DACL_SECURITY_INFORMATION:
+                       required_access = STD_RIGHT_WRITE_DAC_ACCESS;
+                       break;
+
+               case OWNER_SECURITY_INFORMATION:
+               case GROUP_SECURITY_INFORMATION:
+                       required_access = STD_RIGHT_WRITE_OWNER_ACCESS;
+                       break;
+
+               case SACL_SECURITY_INFORMATION:
+                       return WERR_INVALID_PARAM;
+               default:
+                       return WERR_INVALID_PARAM;
+       }
+
+       if ( !(info->access_granted & required_access) )
+               return WERR_ACCESS_DENIED;
 
-       return WERR_ACCESS_DENIED;
+       /* read the security descfriptor */
+
+       status = unmarshall_sec_desc(p->mem_ctx,
+                                    r->in.buffer, r->in.buffer_size,
+                                    &sec_desc);
+       if (!NT_STATUS_IS_OK(status)) {
+               return ntstatus_to_werror(status);
+       }
+
+       /* store the new SD */
+
+       if ( !svcctl_set_secdesc( p->mem_ctx, info->name, sec_desc,
+                                 p->server_info->ptok) )
+               return WERR_ACCESS_DENIED;
+
+       return WERR_OK;
+}
+
+
+WERROR _svcctl_DeleteService(pipes_struct *p, struct svcctl_DeleteService *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
 }
+
+WERROR _svcctl_SetServiceStatus(pipes_struct *p, struct svcctl_SetServiceStatus *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_NotifyBootConfigStatus(pipes_struct *p, struct svcctl_NotifyBootConfigStatus *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_SCSetServiceBitsW(pipes_struct *p, struct svcctl_SCSetServiceBitsW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_ChangeServiceConfigW(pipes_struct *p, struct svcctl_ChangeServiceConfigW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_CreateServiceW(pipes_struct *p, struct svcctl_CreateServiceW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_EnumServicesStatusW(pipes_struct *p, struct svcctl_EnumServicesStatusW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_QueryServiceLockStatusW(pipes_struct *p, struct svcctl_QueryServiceLockStatusW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_GetServiceKeyNameW(pipes_struct *p, struct svcctl_GetServiceKeyNameW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_SCSetServiceBitsA(pipes_struct *p, struct svcctl_SCSetServiceBitsA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_ChangeServiceConfigA(pipes_struct *p, struct svcctl_ChangeServiceConfigA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_CreateServiceA(pipes_struct *p, struct svcctl_CreateServiceA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_EnumDependentServicesA(pipes_struct *p, struct svcctl_EnumDependentServicesA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_EnumServicesStatusA(pipes_struct *p, struct svcctl_EnumServicesStatusA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_OpenSCManagerA(pipes_struct *p, struct svcctl_OpenSCManagerA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_OpenServiceA(pipes_struct *p, struct svcctl_OpenServiceA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_QueryServiceConfigA(pipes_struct *p, struct svcctl_QueryServiceConfigA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_QueryServiceLockStatusA(pipes_struct *p, struct svcctl_QueryServiceLockStatusA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_StartServiceA(pipes_struct *p, struct svcctl_StartServiceA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_GetServiceDisplayNameA(pipes_struct *p, struct svcctl_GetServiceDisplayNameA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_GetServiceKeyNameA(pipes_struct *p, struct svcctl_GetServiceKeyNameA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_GetCurrentGroupeStateW(pipes_struct *p, struct svcctl_GetCurrentGroupeStateW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_EnumServiceGroupW(pipes_struct *p, struct svcctl_EnumServiceGroupW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_ChangeServiceConfig2A(pipes_struct *p, struct svcctl_ChangeServiceConfig2A *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_ChangeServiceConfig2W(pipes_struct *p, struct svcctl_ChangeServiceConfig2W *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_QueryServiceConfig2A(pipes_struct *p, struct svcctl_QueryServiceConfig2A *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_QueryServiceConfig2W(pipes_struct *p, struct svcctl_QueryServiceConfig2W *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_QueryServiceStatusEx(pipes_struct *p, struct svcctl_QueryServiceStatusEx *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _EnumServicesStatusExA(pipes_struct *p, struct EnumServicesStatusExA *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _EnumServicesStatusExW(pipes_struct *p, struct EnumServicesStatusExW *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+
+WERROR _svcctl_SCSendTSMessage(pipes_struct *p, struct svcctl_SCSendTSMessage *r)
+{
+       p->rng_fault_state = True;
+       return WERR_NOT_SUPPORTED;
+}
+