libcli/security Provide a common, top level libcli/security/security.h
[kai/samba.git] / source3 / rpc_server / srv_svcctl_nt.c
index 1caf4941a4cbec02b9d11c7dad4119096d17c5be..2a7ef816456f29e7776d7d2ff533481e478e8e7f 100644 (file)
@@ -6,6 +6,7 @@
  *
  *  Largely Rewritten (Again) by:
  *  Copyright (C) Gerald (Jerry) Carter             2005.
+ *  Copyright (C) Guenther Deschner                 2008,2009.
  *
  *  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
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/srv_svcctl.h"
+#include "services/services.h"
+#include "../libcli/security/security.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
@@ -31,8 +36,6 @@ struct service_control_op {
        SERVICE_CONTROL_OPS *ops;
 };
 
-#define SVCCTL_NUM_INTERNAL_SERVICES   4
-
 /* handle external services */
 extern SERVICE_CONTROL_OPS rcinit_svc_ops;
 
@@ -119,30 +122,26 @@ static struct service_control_op* find_service_by_name( const char *name )
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS svcctl_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token,
+static NTSTATUS svcctl_access_check( struct security_descriptor *sec_desc, struct security_token *token,
                                      uint32 access_desired, uint32 *access_granted )
 {
-       NTSTATUS result;
-
        if ( geteuid() == sec_initial_uid() ) {
                DEBUG(5,("svcctl_access_check: using root's token\n"));
                token = get_root_nt_token();
        }
 
-       se_access_check( sec_desc, token, access_desired, access_granted, &result );
-
-       return result;
+       return se_access_check( sec_desc, token, access_desired, access_granted);
 }
 
 /********************************************************************
 ********************************************************************/
 
-static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx )
+static struct security_descriptor* construct_scm_sd( TALLOC_CTX *ctx )
 {
-       SEC_ACE ace[2];
+       struct security_ace ace[2];
        size_t i = 0;
-       SEC_DESC *sd;
-       SEC_ACL *acl;
+       struct security_descriptor *sd;
+       struct security_acl *theacl;
        size_t sd_size;
 
        /* basic access for Everyone */
@@ -158,31 +157,23 @@ static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx )
 
        /* create the security descriptor */
 
-       if ( !(acl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
+       if ( !(theacl = make_sec_acl(ctx, NT4_ACL_REVISION, i, ace)) )
                return NULL;
 
        if ( !(sd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1,
                                  SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL,
-                                 acl, &sd_size)) )
+                                 theacl, &sd_size)) )
                return NULL;
 
        return sd;
 }
 
-/******************************************************************
- free() function for REGISTRY_KEY
- *****************************************************************/
-
-static void free_service_handle_info(void *ptr)
-{
-       TALLOC_FREE( ptr );
-}
-
 /******************************************************************
  Find a registry key handle and return a SERVICE_INFO
  *****************************************************************/
 
-static SERVICE_INFO *find_service_info_by_hnd(pipes_struct *p, POLICY_HND *hnd)
+static SERVICE_INFO *find_service_info_by_hnd(struct pipes_struct *p,
+                                             struct policy_handle *hnd)
 {
        SERVICE_INFO *service_info = NULL;
 
@@ -197,8 +188,11 @@ 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, uint32 type,
-                                          const char *service, uint32 access_granted )
+static WERROR create_open_service_handle(struct pipes_struct *p,
+                                        struct policy_handle *handle,
+                                        uint32_t type,
+                                        const char *service,
+                                        uint32_t access_granted)
 {
        SERVICE_INFO *info = NULL;
        WERROR result = WERR_OK;
@@ -247,25 +241,26 @@ static WERROR create_open_service_handle( pipes_struct *p, POLICY_HND *handle, u
 
        /* store the SERVICE_INFO and create an open handle */
 
-       if ( !create_policy_hnd( p, handle, free_service_handle_info, info ) ) {
+       if ( !create_policy_hnd( p, handle, info ) ) {
                result = WERR_ACCESS_DENIED;
                goto done;
        }
 
 done:
        if ( !W_ERROR_IS_OK(result) )
-               free_service_handle_info( info );
+               TALLOC_FREE(info);
 
        return result;
 }
 
 /********************************************************************
+ _svcctl_OpenSCManagerW
 ********************************************************************/
 
-WERROR _svcctl_OpenSCManagerW(pipes_struct *p,
+WERROR _svcctl_OpenSCManagerW(struct pipes_struct *p,
                              struct svcctl_OpenSCManagerW *r)
 {
-       SEC_DESC *sec_desc;
+       struct security_descriptor *sec_desc;
        uint32 access_granted = 0;
        NTSTATUS status;
 
@@ -275,7 +270,8 @@ WERROR _svcctl_OpenSCManagerW(pipes_struct *p,
                return WERR_NOMEM;
 
        se_map_generic( &r->in.access_mask, &scm_generic_map );
-       status = svcctl_access_check( sec_desc, p->pipe_user.nt_user_token, r->in.access_mask, &access_granted );
+       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 );
 
@@ -286,10 +282,10 @@ WERROR _svcctl_OpenSCManagerW(pipes_struct *p,
  _svcctl_OpenServiceW
 ********************************************************************/
 
-WERROR _svcctl_OpenServiceW(pipes_struct *p,
+WERROR _svcctl_OpenServiceW(struct pipes_struct *p,
                            struct svcctl_OpenServiceW *r)
 {
-       SEC_DESC *sec_desc;
+       struct security_descriptor *sec_desc;
        uint32 access_granted = 0;
        NTSTATUS status;
        const char *service = NULL;
@@ -312,7 +308,8 @@ WERROR _svcctl_OpenServiceW(pipes_struct *p,
                return WERR_NOMEM;
 
        se_map_generic( &r->in.access_mask, &svc_generic_map );
-       status = svcctl_access_check( sec_desc, p->pipe_user.nt_user_token, r->in.access_mask, &access_granted );
+       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 );
 
@@ -320,9 +317,11 @@ WERROR _svcctl_OpenServiceW(pipes_struct *p,
 }
 
 /********************************************************************
+ _svcctl_CloseServiceHandle
 ********************************************************************/
 
-WERROR _svcctl_CloseServiceHandle(pipes_struct *p, struct svcctl_CloseServiceHandle *r)
+WERROR _svcctl_CloseServiceHandle(struct pipes_struct *p,
+                                 struct svcctl_CloseServiceHandle *r)
 {
        if ( !close_policy_hnd( p, r->in.handle ) )
                return  WERR_BADFID;
@@ -336,7 +335,7 @@ WERROR _svcctl_CloseServiceHandle(pipes_struct *p, struct svcctl_CloseServiceHan
  _svcctl_GetServiceDisplayNameW
 ********************************************************************/
 
-WERROR _svcctl_GetServiceDisplayNameW(pipes_struct *p,
+WERROR _svcctl_GetServiceDisplayNameW(struct pipes_struct *p,
                                      struct svcctl_GetServiceDisplayNameW *r)
 {
        const char *service;
@@ -350,7 +349,8 @@ WERROR _svcctl_GetServiceDisplayNameW(pipes_struct *p,
 
        service = r->in.service_name;
 
-       display_name = svcctl_lookup_dispname(p->mem_ctx, service, p->pipe_user.nt_user_token );
+       display_name = svcctl_lookup_dispname(p->mem_ctx, service,
+                                             p->server_info->ptok);
        if (!display_name) {
                display_name = "";
        }
@@ -365,7 +365,7 @@ WERROR _svcctl_GetServiceDisplayNameW(pipes_struct *p,
  _svcctl_QueryServiceStatus
 ********************************************************************/
 
-WERROR _svcctl_QueryServiceStatus(pipes_struct *p,
+WERROR _svcctl_QueryServiceStatus(struct pipes_struct *p,
                                  struct svcctl_QueryServiceStatus *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
@@ -386,27 +386,27 @@ WERROR _svcctl_QueryServiceStatus(pipes_struct *p,
 /********************************************************************
 ********************************************************************/
 
-static int enumerate_status( TALLOC_CTX *ctx, ENUM_SERVICES_STATUS **status, NT_USER_TOKEN *token )
+static int enumerate_status( TALLOC_CTX *ctx, struct ENUM_SERVICE_STATUSW **status, struct security_token *token )
 {
        int num_services = 0;
        int i;
-       ENUM_SERVICES_STATUS *st;
+       struct ENUM_SERVICE_STATUSW *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 )) ) {
+       if ( !(st = TALLOC_ARRAY( ctx, struct ENUM_SERVICE_STATUSW, num_services )) ) {
                DEBUG(0,("enumerate_status: talloc() failed!\n"));
                return -1;
        }
 
        for ( i=0; i<num_services; i++ ) {
-               init_unistr( &st[i].servicename, svcctl_ops[i].name );
+               st[i].service_name = talloc_strdup(st, svcctl_ops[i].name );
 
                display_name = svcctl_lookup_dispname(ctx, svcctl_ops[i].name, token );
-               init_unistr( &st[i].displayname, display_name ? display_name : "");
+               st[i].display_name = talloc_strdup(st, display_name ? display_name : "");
 
                svcctl_ops[i].ops->service_status( svcctl_ops[i].name, &st[i].status );
        }
@@ -417,17 +417,20 @@ static int enumerate_status( TALLOC_CTX *ctx, ENUM_SERVICES_STATUS **status, NT_
 }
 
 /********************************************************************
+ _svcctl_EnumServicesStatusW
 ********************************************************************/
 
-WERROR _svcctl_enum_services_status(pipes_struct *p, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, SVCCTL_R_ENUM_SERVICES_STATUS *r_u)
+WERROR _svcctl_EnumServicesStatusW(struct pipes_struct *p,
+                                  struct svcctl_EnumServicesStatusW *r)
 {
-       ENUM_SERVICES_STATUS *services = NULL;
+       struct ENUM_SERVICE_STATUSW *services = NULL;
        int num_services;
        int i = 0;
        size_t buffer_size = 0;
        WERROR result = WERR_OK;
-       SERVICE_INFO *info = find_service_info_by_hnd( p, &q_u->handle );
-       NT_USER_TOKEN *token = p->pipe_user.nt_user_token;
+       SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
+       struct security_token *token = p->server_info->ptok;
+       DATA_BLOB blob = data_blob_null;
 
        /* perform access checks */
 
@@ -444,30 +447,40 @@ WERROR _svcctl_enum_services_status(pipes_struct *p, SVCCTL_Q_ENUM_SERVICES_STAT
        }
 
         for ( i=0; i<num_services; i++ ) {
-               buffer_size += svcctl_sizeof_enum_services_status(&services[i]);
+               buffer_size += ndr_size_ENUM_SERVICE_STATUSW(&services[i], 0);
        }
 
        buffer_size += buffer_size % 4;
 
-       if (buffer_size > q_u->buffer_size ) {
+       if (buffer_size > r->in.offered) {
                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_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    = (uint32)num_services;
+               enum ndr_err_code ndr_err;
+               struct ndr_push *ndr;
 
-       if ( !(r_u->resume = TALLOC_P( p->mem_ctx, uint32 )) )
-               return WERR_NOMEM;
+               ndr = ndr_push_init_ctx(p->mem_ctx);
+               if (ndr == NULL) {
+                       return WERR_INVALID_PARAM;
+               }
+
+               ndr_err = ndr_push_ENUM_SERVICE_STATUSW_array(
+                       ndr, num_services, services);
+               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                       return ntstatus_to_werror(ndr_map_error2ntstatus(ndr_err));
+               }
+               blob = ndr_push_blob(ndr);
+               memcpy(r->out.service, blob.data, MIN(blob.length, r->in.offered));
+       }
 
-       *r_u->resume = 0x0;
+       *r->out.needed                  = (buffer_size > r->in.offered) ? buffer_size : r->in.offered;
+       *r->out.services_returned       = (uint32)num_services;
+       if (r->out.resume_handle) {
+               *r->out.resume_handle   = 0;
+       }
 
        return result;
 }
@@ -476,7 +489,7 @@ WERROR _svcctl_enum_services_status(pipes_struct *p, SVCCTL_Q_ENUM_SERVICES_STAT
  _svcctl_StartServiceW
 ********************************************************************/
 
-WERROR _svcctl_StartServiceW(pipes_struct *p,
+WERROR _svcctl_StartServiceW(struct pipes_struct *p,
                             struct svcctl_StartServiceW *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
@@ -496,7 +509,7 @@ WERROR _svcctl_StartServiceW(pipes_struct *p,
  _svcctl_ControlService
 ********************************************************************/
 
-WERROR _svcctl_ControlService(pipes_struct *p,
+WERROR _svcctl_ControlService(struct pipes_struct *p,
                              struct svcctl_ControlService *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
@@ -520,18 +533,16 @@ WERROR _svcctl_ControlService(pipes_struct *p,
 
                return info->ops->service_status( info->name,
                                                  r->out.service_status );
+       default:
+               return WERR_INVALID_PARAM;
        }
-
-       /* default control action */
-
-       return WERR_ACCESS_DENIED;
 }
 
 /********************************************************************
  _svcctl_EnumDependentServicesW
 ********************************************************************/
 
-WERROR _svcctl_EnumDependentServicesW(pipes_struct *p,
+WERROR _svcctl_EnumDependentServicesW(struct pipes_struct *p,
                                      struct svcctl_EnumDependentServicesW *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.service );
@@ -544,11 +555,20 @@ WERROR _svcctl_EnumDependentServicesW(pipes_struct *p,
        if ( !(info->access_granted & SC_RIGHT_SVC_ENUMERATE_DEPENDENTS) )
                return WERR_ACCESS_DENIED;
 
+       switch (r->in.state) {
+       case SERVICE_STATE_ACTIVE:
+       case SERVICE_STATE_INACTIVE:
+       case SERVICE_STATE_ALL:
+               break;
+       default:
+               return WERR_INVALID_PARAM;
+       }
+
        /* 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;
+       *r->out.needed = r->in.offered;
 
        /* no dependent services...basically a stub function */
        *r->out.services_returned = 0;
@@ -557,11 +577,13 @@ WERROR _svcctl_EnumDependentServicesW(pipes_struct *p,
 }
 
 /********************************************************************
+ _svcctl_QueryServiceStatusEx
 ********************************************************************/
 
-WERROR _svcctl_query_service_status_ex( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_STATUSEX *q_u, SVCCTL_R_QUERY_SERVICE_STATUSEX *r_u )
+WERROR _svcctl_QueryServiceStatusEx(struct pipes_struct *p,
+                                   struct svcctl_QueryServiceStatusEx *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 );
        uint32 buffer_size;
 
        /* perform access checks */
@@ -574,22 +596,28 @@ WERROR _svcctl_query_service_status_ex( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_
 
        /* we have to set the outgoing buffer size to the same as the
           incoming buffer size (even in the case of failure) */
+       *r->out.needed = r->in.offered;
 
-       rpcbuf_init( &r_u->buffer, q_u->buffer_size, p->mem_ctx );
-       r_u->needed = q_u->buffer_size;
-
-       switch ( q_u->level ) {
+       switch ( r->in.info_level ) {
                case SVC_STATUS_PROCESS_INFO:
                {
-                       SERVICE_STATUS_PROCESS svc_stat_proc;
+                       struct SERVICE_STATUS_PROCESS svc_stat_proc;
+                       enum ndr_err_code ndr_err;
+                       DATA_BLOB blob;
 
                        /* 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;
 
-                       svcctl_io_service_status_process( "", &svc_stat_proc, &r_u->buffer, 0 );
-                       buffer_size = sizeof(SERVICE_STATUS_PROCESS);
+                       ndr_err = ndr_push_struct_blob(&blob, p->mem_ctx, &svc_stat_proc,
+                                                      (ndr_push_flags_fn_t)ndr_push_SERVICE_STATUS_PROCESS);
+                       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                               return WERR_INVALID_PARAM;
+                       }
+
+                       r->out.buffer = blob.data;
+                       buffer_size = sizeof(struct SERVICE_STATUS_PROCESS);
                        break;
                }
 
@@ -599,10 +627,11 @@ WERROR _svcctl_query_service_status_ex( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_
 
 
         buffer_size += buffer_size % 4;
-       r_u->needed = (buffer_size > q_u->buffer_size) ? buffer_size : q_u->buffer_size;
+       *r->out.needed = (buffer_size > r->in.offered) ? buffer_size : r->in.offered;
 
-        if (buffer_size > q_u->buffer_size )
-                return WERR_MORE_DATA;
+        if (buffer_size > r->in.offered ) {
+                return WERR_INSUFFICIENT_BUFFER;
+       }
 
        return WERR_OK;
 }
@@ -610,39 +639,32 @@ WERROR _svcctl_query_service_status_ex( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_
 /********************************************************************
 ********************************************************************/
 
-static WERROR fill_svc_config( TALLOC_CTX *ctx, const char *name, SERVICE_CONFIG *config, NT_USER_TOKEN *token )
+static WERROR fill_svc_config( TALLOC_CTX *ctx, const char *name,
+                              struct QUERY_SERVICE_CONFIG *config,
+                              struct security_token *token )
 {
-       REGVAL_CTR *values;
-       REGISTRY_VALUE *val;
-
-       /* retrieve the registry values for this service */
-
-       if ( !(values = svcctl_fetch_regvalues( name, token )) )
-               return WERR_REG_CORRUPT;
+       TALLOC_CTX *mem_ctx = talloc_stackframe();
+       const char *result = NULL;
 
        /* now fill in the individual values */
 
-       config->displayname = TALLOC_ZERO_P( ctx, UNISTR2 );
-       if ( (val = regval_ctr_getvalue( values, "DisplayName" )) != NULL )
-               init_unistr2( config->displayname, regval_sz( val ), UNI_STR_TERMINATE );
-       else
-               init_unistr2( config->displayname, name, UNI_STR_TERMINATE );
+       config->displayname = svcctl_lookup_dispname(mem_ctx, name, token);
 
-       if ( (val = regval_ctr_getvalue( values, "ObjectName" )) != NULL ) {
-               config->startname = TALLOC_ZERO_P( ctx, UNISTR2 );
-               init_unistr2( config->startname, regval_sz( val ), UNI_STR_TERMINATE );
+       result = svcctl_get_string_value(mem_ctx, name, "ObjectName", token);
+       if (result != NULL) {
+               config->startname = result;
        }
 
-       if ( (val = regval_ctr_getvalue( values, "ImagePath" )) != NULL ) {
-               config->executablepath = TALLOC_ZERO_P( ctx, UNISTR2 );
-               init_unistr2( config->executablepath, regval_sz( val ), UNI_STR_TERMINATE );
+       result = svcctl_get_string_value(mem_ctx, name, "ImagePath", token);
+       if (result != NULL) {
+               config->executablepath = result;
        }
 
        /* 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->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
@@ -657,17 +679,19 @@ static WERROR fill_svc_config( TALLOC_CTX *ctx, const char *name, SERVICE_CONFIG
                config->start_type = SVCCTL_DEMAND_START;
 
 
-       TALLOC_FREE( values );
+       talloc_free(mem_ctx);
 
        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(struct pipes_struct *p,
+                                  struct svcctl_QueryServiceConfigW *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 );
        uint32 buffer_size;
        WERROR wresult;
 
@@ -682,17 +706,18 @@ WERROR _svcctl_query_service_config( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CON
        /* 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->out.needed = r->in.offered;
 
-       wresult = fill_svc_config( p->mem_ctx, info->name, &r_u->config, p->pipe_user.nt_user_token );
+       wresult = fill_svc_config( p->mem_ctx, info->name, r->out.query,
+                                  p->server_info->ptok);
        if ( !W_ERROR_IS_OK(wresult) )
                return wresult;
 
-       buffer_size = svcctl_sizeof_service_config( &r_u->config );
-       r_u->needed = (buffer_size > q_u->buffer_size) ? buffer_size : q_u->buffer_size;
+       buffer_size = ndr_size_QUERY_SERVICE_CONFIG(r->out.query, 0);
+       *r->out.needed = (buffer_size > r->in.offered) ? buffer_size : r->in.offered;
 
-        if (buffer_size > q_u->buffer_size ) {
-               ZERO_STRUCTP( &r_u->config );
+        if (buffer_size > r->in.offered ) {
+               ZERO_STRUCTP(r->out.query);
                 return WERR_INSUFFICIENT_BUFFER;
        }
 
@@ -700,11 +725,13 @@ WERROR _svcctl_query_service_config( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CON
 }
 
 /********************************************************************
+ _svcctl_QueryServiceConfig2W
 ********************************************************************/
 
-WERROR _svcctl_query_service_config2( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, SVCCTL_R_QUERY_SERVICE_CONFIG2 *r_u )
+WERROR _svcctl_QueryServiceConfig2W(struct pipes_struct *p,
+                                   struct svcctl_QueryServiceConfig2W *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 );
        uint32 buffer_size;
 
        /* perform access checks */
@@ -717,36 +744,51 @@ WERROR _svcctl_query_service_config2( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CO
 
        /* we have to set the outgoing buffer size to the same as the
           incoming buffer size (even in the case of failure */
+       *r->out.needed = r->in.offered;
 
-       rpcbuf_init( &r_u->buffer, q_u->buffer_size, p->mem_ctx );
-       r_u->needed = q_u->buffer_size;
-
-       switch ( q_u->level ) {
+       switch ( r->in.info_level ) {
        case SERVICE_CONFIG_DESCRIPTION:
                {
-                       SERVICE_DESCRIPTION desc_buf;
+                       struct SERVICE_DESCRIPTION desc_buf;
                        const char *description;
+                       enum ndr_err_code ndr_err;
+                       DATA_BLOB blob;
+
+                       description = svcctl_lookup_description(
+                               p->mem_ctx, info->name, p->server_info->ptok);
 
-                       description = svcctl_lookup_description(p->mem_ctx, info->name, p->pipe_user.nt_user_token );
+                       desc_buf.description = description;
 
-                       ZERO_STRUCTP( &desc_buf );
+                       ndr_err = ndr_push_struct_blob(&blob, p->mem_ctx, &desc_buf,
+                                                      (ndr_push_flags_fn_t)ndr_push_SERVICE_DESCRIPTION);
+                       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                               return WERR_INVALID_PARAM;
+                       }
 
-                       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 );
+                       buffer_size = ndr_size_SERVICE_DESCRIPTION(&desc_buf, 0);
+                       r->out.buffer = blob.data;
 
                        break;
                }
                break;
        case SERVICE_CONFIG_FAILURE_ACTIONS:
                {
-                       SERVICE_FAILURE_ACTIONS actions;
+                       struct SERVICE_FAILURE_ACTIONS actions;
+                       enum ndr_err_code ndr_err;
+                       DATA_BLOB blob;
 
                        /* 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 );
+                       ZERO_STRUCT( actions );
+
+                       ndr_err = ndr_push_struct_blob(&blob, p->mem_ctx, &actions,
+                                                      (ndr_push_flags_fn_t)ndr_push_SERVICE_FAILURE_ACTIONS);
+                       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                               return WERR_INVALID_PARAM;
+                       }
+
+                       buffer_size = ndr_size_SERVICE_FAILURE_ACTIONS(&actions, 0);
+                       r->out.buffer = blob.data;
 
                        break;
                }
@@ -757,9 +799,9 @@ WERROR _svcctl_query_service_config2( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CO
        }
 
        buffer_size += buffer_size % 4;
-       r_u->needed = (buffer_size > q_u->buffer_size) ? buffer_size : q_u->buffer_size;
+       *r->out.needed = (buffer_size > r->in.offered) ? buffer_size : r->in.offered;
 
-        if (buffer_size > q_u->buffer_size )
+        if (buffer_size > r->in.offered)
                 return WERR_INSUFFICIENT_BUFFER;
 
        return WERR_OK;
@@ -769,7 +811,7 @@ WERROR _svcctl_query_service_config2( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CO
  _svcctl_LockServiceDatabase
 ********************************************************************/
 
-WERROR _svcctl_LockServiceDatabase(pipes_struct *p,
+WERROR _svcctl_LockServiceDatabase(struct pipes_struct *p,
                                   struct svcctl_LockServiceDatabase *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
@@ -791,7 +833,7 @@ WERROR _svcctl_LockServiceDatabase(pipes_struct *p,
  _svcctl_UnlockServiceDatabase
 ********************************************************************/
 
-WERROR _svcctl_UnlockServiceDatabase(pipes_struct *p,
+WERROR _svcctl_UnlockServiceDatabase(struct pipes_struct *p,
                                     struct svcctl_UnlockServiceDatabase *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.lock );
@@ -807,11 +849,11 @@ WERROR _svcctl_UnlockServiceDatabase(pipes_struct *p,
  _svcctl_QueryServiceObjectSecurity
 ********************************************************************/
 
-WERROR _svcctl_QueryServiceObjectSecurity(pipes_struct *p,
+WERROR _svcctl_QueryServiceObjectSecurity(struct pipes_struct *p,
                                          struct svcctl_QueryServiceObjectSecurity *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
-       SEC_DESC *sec_desc;
+       struct security_descriptor *sec_desc;
        NTSTATUS status;
        uint8_t *buffer = NULL;
        size_t len = 0;
@@ -824,12 +866,12 @@ WERROR _svcctl_QueryServiceObjectSecurity(pipes_struct *p,
 
        /* check access reights (according to MSDN) */
 
-       if ( !(info->access_granted & STD_RIGHT_READ_CONTROL_ACCESS) )
+       if ( !(info->access_granted & SEC_STD_READ_CONTROL) )
                return WERR_ACCESS_DENIED;
 
-       /* TODO: handle something besides DACL_SECURITY_INFORMATION */
+       /* TODO: handle something besides SECINFO_DACL */
 
-       if ( (r->in.security_flags & DACL_SECURITY_INFORMATION) != DACL_SECURITY_INFORMATION )
+       if ( (r->in.security_flags & SECINFO_DACL) != SECINFO_DACL )
                return WERR_INVALID_PARAM;
 
        /* lookup the security descriptor and marshall it up for a reply */
@@ -837,10 +879,9 @@ WERROR _svcctl_QueryServiceObjectSecurity(pipes_struct *p,
        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, 0 );
+       *r->out.needed = ndr_size_security_descriptor(sec_desc, 0);
 
-       if ( *r->out.needed > r->in.buffer_size ) {
-               ZERO_STRUCTP( &r->out.buffer );
+       if ( *r->out.needed > r->in.offered) {
                return WERR_INSUFFICIENT_BUFFER;
        }
 
@@ -859,11 +900,11 @@ WERROR _svcctl_QueryServiceObjectSecurity(pipes_struct *p,
  _svcctl_SetServiceObjectSecurity
 ********************************************************************/
 
-WERROR _svcctl_SetServiceObjectSecurity(pipes_struct *p,
+WERROR _svcctl_SetServiceObjectSecurity(struct pipes_struct *p,
                                        struct svcctl_SetServiceObjectSecurity *r)
 {
        SERVICE_INFO *info = find_service_info_by_hnd( p, r->in.handle );
-       SEC_DESC *sec_desc = NULL;
+       struct security_descriptor *sec_desc = NULL;
        uint32 required_access;
        NTSTATUS status;
 
@@ -878,16 +919,16 @@ WERROR _svcctl_SetServiceObjectSecurity(pipes_struct *p,
        /* check the access on the open handle */
 
        switch ( r->in.security_flags ) {
-               case DACL_SECURITY_INFORMATION:
-                       required_access = STD_RIGHT_WRITE_DAC_ACCESS;
+               case SECINFO_DACL:
+                       required_access = SEC_STD_WRITE_DAC;
                        break;
 
-               case OWNER_SECURITY_INFORMATION:
-               case GROUP_SECURITY_INFORMATION:
-                       required_access = STD_RIGHT_WRITE_OWNER_ACCESS;
+               case SECINFO_OWNER:
+               case SECINFO_GROUP:
+                       required_access = SEC_STD_WRITE_OWNER;
                        break;
 
-               case SACL_SECURITY_INFORMATION:
+               case SECINFO_SACL:
                        return WERR_INVALID_PARAM;
                default:
                        return WERR_INVALID_PARAM;
@@ -899,7 +940,8 @@ WERROR _svcctl_SetServiceObjectSecurity(pipes_struct *p,
        /* read the security descfriptor */
 
        status = unmarshall_sec_desc(p->mem_ctx,
-                                    r->in.buffer, r->in.buffer_size,
+                                    r->in.buffer,
+                                    r->in.offered,
                                     &sec_desc);
        if (!NT_STATUS_IS_OK(status)) {
                return ntstatus_to_werror(status);
@@ -907,200 +949,204 @@ WERROR _svcctl_SetServiceObjectSecurity(pipes_struct *p,
 
        /* store the new SD */
 
-       if ( !svcctl_set_secdesc( p->mem_ctx, info->name, sec_desc, p->pipe_user.nt_user_token ) )
+       if (!svcctl_set_secdesc(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)
+WERROR _svcctl_DeleteService(struct pipes_struct *p,
+                            struct svcctl_DeleteService *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_CreateServiceW(pipes_struct *p, struct svcctl_CreateServiceW *r)
+WERROR _svcctl_SetServiceStatus(struct pipes_struct *p,
+                               struct svcctl_SetServiceStatus *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_EnumServicesStatusW(pipes_struct *p, struct svcctl_EnumServicesStatusW *r)
+WERROR _svcctl_NotifyBootConfigStatus(struct pipes_struct *p,
+                                     struct svcctl_NotifyBootConfigStatus *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_QueryServiceConfigW(pipes_struct *p, struct svcctl_QueryServiceConfigW *r)
+WERROR _svcctl_SCSetServiceBitsW(struct pipes_struct *p,
+                                struct svcctl_SCSetServiceBitsW *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_QueryServiceLockStatusW(pipes_struct *p, struct svcctl_QueryServiceLockStatusW *r)
+WERROR _svcctl_ChangeServiceConfigW(struct pipes_struct *p,
+                                   struct svcctl_ChangeServiceConfigW *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_GetServiceKeyNameW(pipes_struct *p, struct svcctl_GetServiceKeyNameW *r)
+WERROR _svcctl_CreateServiceW(struct pipes_struct *p,
+                             struct svcctl_CreateServiceW *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_SCSetServiceBitsA(pipes_struct *p, struct svcctl_SCSetServiceBitsA *r)
+WERROR _svcctl_QueryServiceLockStatusW(struct pipes_struct *p,
+                                      struct svcctl_QueryServiceLockStatusW *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_ChangeServiceConfigA(pipes_struct *p, struct svcctl_ChangeServiceConfigA *r)
+WERROR _svcctl_GetServiceKeyNameW(struct pipes_struct *p,
+                                 struct svcctl_GetServiceKeyNameW *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_CreateServiceA(pipes_struct *p, struct svcctl_CreateServiceA *r)
+WERROR _svcctl_SCSetServiceBitsA(struct pipes_struct *p,
+                                struct svcctl_SCSetServiceBitsA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_EnumDependentServicesA(pipes_struct *p, struct svcctl_EnumDependentServicesA *r)
+WERROR _svcctl_ChangeServiceConfigA(struct pipes_struct *p,
+                                   struct svcctl_ChangeServiceConfigA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_EnumServicesStatusA(pipes_struct *p, struct svcctl_EnumServicesStatusA *r)
+WERROR _svcctl_CreateServiceA(struct pipes_struct *p,
+                             struct svcctl_CreateServiceA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_OpenSCManagerA(pipes_struct *p, struct svcctl_OpenSCManagerA *r)
+WERROR _svcctl_EnumDependentServicesA(struct pipes_struct *p,
+                                     struct svcctl_EnumDependentServicesA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_OpenServiceA(pipes_struct *p, struct svcctl_OpenServiceA *r)
+WERROR _svcctl_EnumServicesStatusA(struct pipes_struct *p,
+                                  struct svcctl_EnumServicesStatusA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_QueryServiceConfigA(pipes_struct *p, struct svcctl_QueryServiceConfigA *r)
+WERROR _svcctl_OpenSCManagerA(struct pipes_struct *p,
+                             struct svcctl_OpenSCManagerA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_QueryServiceLockStatusA(pipes_struct *p, struct svcctl_QueryServiceLockStatusA *r)
+WERROR _svcctl_OpenServiceA(struct pipes_struct *p,
+                           struct svcctl_OpenServiceA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_StartServiceA(pipes_struct *p, struct svcctl_StartServiceA *r)
+WERROR _svcctl_QueryServiceConfigA(struct pipes_struct *p,
+                                  struct svcctl_QueryServiceConfigA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_GetServiceDisplayNameA(pipes_struct *p, struct svcctl_GetServiceDisplayNameA *r)
+WERROR _svcctl_QueryServiceLockStatusA(struct pipes_struct *p,
+                                      struct svcctl_QueryServiceLockStatusA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_GetServiceKeyNameA(pipes_struct *p, struct svcctl_GetServiceKeyNameA *r)
+WERROR _svcctl_StartServiceA(struct pipes_struct *p,
+                            struct svcctl_StartServiceA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_GetCurrentGroupeStateW(pipes_struct *p, struct svcctl_GetCurrentGroupeStateW *r)
+WERROR _svcctl_GetServiceDisplayNameA(struct pipes_struct *p,
+                                     struct svcctl_GetServiceDisplayNameA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_EnumServiceGroupW(pipes_struct *p, struct svcctl_EnumServiceGroupW *r)
+WERROR _svcctl_GetServiceKeyNameA(struct pipes_struct *p,
+                                 struct svcctl_GetServiceKeyNameA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_ChangeServiceConfig2A(pipes_struct *p, struct svcctl_ChangeServiceConfig2A *r)
+WERROR _svcctl_GetCurrentGroupeStateW(struct pipes_struct *p,
+                                     struct svcctl_GetCurrentGroupeStateW *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_ChangeServiceConfig2W(pipes_struct *p, struct svcctl_ChangeServiceConfig2W *r)
+WERROR _svcctl_EnumServiceGroupW(struct pipes_struct *p,
+                                struct svcctl_EnumServiceGroupW *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_QueryServiceConfig2A(pipes_struct *p, struct svcctl_QueryServiceConfig2A *r)
+WERROR _svcctl_ChangeServiceConfig2A(struct pipes_struct *p,
+                                    struct svcctl_ChangeServiceConfig2A *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_QueryServiceConfig2W(pipes_struct *p, struct svcctl_QueryServiceConfig2W *r)
+WERROR _svcctl_ChangeServiceConfig2W(struct pipes_struct *p,
+                                    struct svcctl_ChangeServiceConfig2W *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _svcctl_QueryServiceStatusEx(pipes_struct *p, struct svcctl_QueryServiceStatusEx *r)
+WERROR _svcctl_QueryServiceConfig2A(struct pipes_struct *p,
+                                   struct svcctl_QueryServiceConfig2A *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _EnumServicesStatusExA(pipes_struct *p, struct EnumServicesStatusExA *r)
+WERROR _EnumServicesStatusExA(struct pipes_struct *p,
+                             struct EnumServicesStatusExA *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
-WERROR _EnumServicesStatusExW(pipes_struct *p, struct EnumServicesStatusExW *r)
+WERROR _EnumServicesStatusExW(struct 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)
+WERROR _svcctl_SCSendTSMessage(struct pipes_struct *p,
+                              struct svcctl_SCSendTSMessage *r)
 {
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;