s3:pylibsmb: Make .list() work for SMBv2
[samba.git] / source3 / utils / net_rpc_service.c
index 242d653017d6c58ea67bf331e6a6ce90d72c701d..35111a7931f6b100c0fe3a7122bf32e0576645f0 100644 (file)
 
 #include "includes.h"
 #include "utils/net.h"
+#include "rpc_client/rpc_client.h"
+#include "../librpc/gen_ndr/ndr_svcctl.h"
+#include "../librpc/gen_ndr/ndr_svcctl_c.h"
+
+struct svc_state_msg {
+       uint32_t flag;
+       const char *message;
+};
+
+static struct svc_state_msg state_msg_table[] = {
+       { SVCCTL_STOPPED,            N_("stopped") },
+       { SVCCTL_START_PENDING,      N_("start pending") },
+       { SVCCTL_STOP_PENDING,       N_("stop pending") },
+       { SVCCTL_RUNNING,            N_("running") },
+       { SVCCTL_CONTINUE_PENDING,   N_("resume pending") },
+       { SVCCTL_PAUSE_PENDING,      N_("pause pending") },
+       { SVCCTL_PAUSED,             N_("paused") },
+       { 0,                          NULL }
+};
 
 
-#define CLI_SERVER_NAME_SLASH(_ctx, _p, _cli) \
-       _p = talloc_asprintf(_ctx, "\\\\%s", _cli->cli->desthost);
+/********************************************************************
+********************************************************************/
+const char *svc_status_string( uint32_t state )
+{
+       fstring msg;
+       int i;
+
+       fstr_sprintf( msg, _("Unknown State [%d]"), state );
+
+       for ( i=0; state_msg_table[i].message; i++ ) {
+               if ( state_msg_table[i].flag == state ) {
+                       fstrcpy( msg, state_msg_table[i].message );
+                       break;
+               }
+       }
+
+       return talloc_strdup(talloc_tos(), msg);
+}
+
+/********************************************************************
+********************************************************************/
+
+static WERROR open_service(struct dcerpc_binding_handle *b,
+                          TALLOC_CTX *mem_ctx,
+                          struct policy_handle *hSCM,
+                          const char *service,
+                          uint32_t access_mask,
+                          struct policy_handle *hService)
+{
+       NTSTATUS status;
+       WERROR result;
+
+       status = dcerpc_svcctl_OpenServiceW(b, mem_ctx,
+                                           hSCM,
+                                           service,
+                                           access_mask,
+                                           hService,
+                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr, _("Failed to open service.  [%s]\n"),
+                         nt_errstr(status));
+               return result;
+       }
+       if (!W_ERROR_IS_OK(result) ) {
+               d_fprintf(stderr, _("Failed to open service.  [%s]\n"),
+                         win_errstr(result));
+               return result;
+       }
+
+       return WERR_OK;
+}
+
+/********************************************************************
+********************************************************************/
+
+static WERROR open_scm(struct dcerpc_binding_handle *b,
+                      TALLOC_CTX *mem_ctx,
+                      const char *server_name,
+                      uint32_t access_mask,
+                      struct policy_handle *hSCM)
+{
+       NTSTATUS status;
+       WERROR result;
+
+       status = dcerpc_svcctl_OpenSCManagerW(b, mem_ctx,
+                                             server_name,
+                                             NULL,
+                                             access_mask,
+                                             hSCM,
+                                             &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr,
+                         _("Failed to open Service Control Manager. [%s]\n"),
+                         nt_errstr(status));
+               return result;
+       }
+       if (!W_ERROR_IS_OK(result)) {
+               d_fprintf(stderr,
+                         _("Failed to open Service Control Manager. [%s]\n"),
+                         win_errstr(result));
+               return result;
+       }
+
+       return WERR_OK;
+}
 
 /********************************************************************
 ********************************************************************/
 
 static WERROR query_service_state(struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx,
-                               POLICY_HND *hSCM,
+                               struct policy_handle *hSCM,
                                const char *service,
-                               uint32 *state )
+                               uint32_t *state )
 {
-       POLICY_HND hService;
-       SERVICE_STATUS service_status;
-       WERROR result = WERR_GENERAL_FAILURE;
+       struct policy_handle hService;
+       struct SERVICE_STATUS service_status;
+       WERROR result = WERR_GEN_FAILURE;
        NTSTATUS status;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
        /* now cycle until the status is actually 'watch_state' */
 
-       status = rpccli_svcctl_OpenServiceW(pipe_hnd, mem_ctx,
-                                           hSCM,
-                                           service,
-                                           SC_RIGHT_SVC_QUERY_STATUS,
-                                           &hService,
-                                           &result);
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Failed to open service.  [%s]\n", dos_errstr(result));
+       result = open_service(b, mem_ctx, hSCM, service,
+                             SC_RIGHT_SVC_QUERY_STATUS,
+                             &hService);
+       if (!W_ERROR_IS_OK(result) ) {
                return result;
        }
 
-       status = rpccli_svcctl_QueryServiceStatus(pipe_hnd, mem_ctx,
+       status = dcerpc_svcctl_QueryServiceStatus(b, mem_ctx,
                                                  &hService,
                                                  &service_status,
                                                  &result);
-
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               *state = service_status.state;
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
+               goto done;
        }
 
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
+       *state = service_status.state;
+
+ done:
+       if (is_valid_policy_hnd(&hService)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hService, &_result);
+       }
 
        return result;
 }
@@ -69,14 +179,14 @@ static WERROR query_service_state(struct rpc_pipe_client *pipe_hnd,
 
 static WERROR watch_service_state(struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx,
-                               POLICY_HND *hSCM,
+                               struct policy_handle *hSCM,
                                const char *service,
-                               uint32 watch_state,
-                               uint32 *final_state )
+                               uint32_t watch_state,
+                               uint32_t *final_state )
 {
-       uint32 i;
-       uint32 state = 0;
-       WERROR result = WERR_GENERAL_FAILURE;
+       uint32_t i;
+       uint32_t state = 0;
+       WERROR result = WERR_GEN_FAILURE;
 
 
        i = 0;
@@ -90,7 +200,7 @@ static WERROR watch_service_state(struct rpc_pipe_client *pipe_hnd,
 
                d_printf(".");
                i++;
-               sys_usleep( 100 );
+               usleep( 100 );
        }
        d_printf("\n");
 
@@ -104,41 +214,44 @@ static WERROR watch_service_state(struct rpc_pipe_client *pipe_hnd,
 
 static WERROR control_service(struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx,
-                               POLICY_HND *hSCM,
+                               struct policy_handle *hSCM,
                                const char *service,
-                               uint32 control,
-                               uint32 watch_state )
+                               uint32_t control,
+                               uint32_t watch_state )
 {
-       POLICY_HND hService;
-       WERROR result = WERR_GENERAL_FAILURE;
+       struct policy_handle hService;
+       WERROR result = WERR_GEN_FAILURE;
        NTSTATUS status;
-       SERVICE_STATUS service_status;
-       uint32 state = 0;
+       struct SERVICE_STATUS service_status;
+       uint32_t state = 0;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
        /* Open the Service */
 
-       status = rpccli_svcctl_OpenServiceW(pipe_hnd, mem_ctx,
-                                           hSCM,
-                                           service,
-                                           (SC_RIGHT_SVC_STOP|SC_RIGHT_SVC_PAUSE_CONTINUE),
-                                           &hService,
-                                           &result);
-
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Failed to open service.  [%s]\n", dos_errstr(result));
-               goto done;
+       result = open_service(b, mem_ctx, hSCM, service,
+                             (SC_RIGHT_SVC_STOP|SC_RIGHT_SVC_PAUSE_CONTINUE),
+                             &hService);
+       if (!W_ERROR_IS_OK(result) ) {
+               return result;
        }
 
        /* get the status */
 
-       status = rpccli_svcctl_ControlService(pipe_hnd, mem_ctx,
+       status = dcerpc_svcctl_ControlService(b, mem_ctx,
                                              &hService,
                                              control,
                                              &service_status,
                                              &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Control service request failed.  [%s]\n", dos_errstr(result));
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr, _("Control service request failed.  [%s]\n"),
+                         nt_errstr(status));
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result) ) {
+               d_fprintf(stderr, _("Control service request failed.  [%s]\n"),
+                         win_errstr(result));
                goto done;
        }
 
@@ -146,10 +259,13 @@ static WERROR control_service(struct rpc_pipe_client *pipe_hnd,
 
        result = watch_service_state(pipe_hnd, mem_ctx, hSCM, service, watch_state, &state );
 
-       d_printf("%s service is %s.\n", service, svc_status_string(state));
+       d_printf(_("%s service is %s.\n"), service, svc_status_string(state));
 
 done:
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
+       if (is_valid_policy_hnd(&hService)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hService, &_result);
+       }
 
        return result;
 }
@@ -157,7 +273,8 @@ done:
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS rpc_service_list_internal(const DOM_SID *domain_sid,
+static NTSTATUS rpc_service_list_internal(struct net_context *c,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -165,63 +282,129 @@ static NTSTATUS rpc_service_list_internal(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv )
 {
-       POLICY_HND hSCM;
-       ENUM_SERVICES_STATUS *services;
-       WERROR result = WERR_GENERAL_FAILURE;
+       struct policy_handle hSCM;
+       struct ENUM_SERVICE_STATUSW *services = NULL;
+       WERROR result = WERR_GEN_FAILURE;
        NTSTATUS status;
-       fstring servicename;
-       fstring displayname;
-       uint32 num_services = 0;
-       const char *server_name;
        int i;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
+
+       uint8_t *buffer;
+       uint32_t buf_size = 0;
+       uint32_t bytes_needed = 0;
+       uint32_t num_services = 0;
+       uint32_t resume_handle = 0;
 
        if (argc != 0 ) {
-               d_printf("Usage: net rpc service list\n");
+               d_printf("%s net rpc service list\n", _("Usage:"));
                return NT_STATUS_OK;
        }
 
-       CLI_SERVER_NAME_SLASH(mem_ctx, server_name, pipe_hnd);
-       NT_STATUS_HAVE_NO_MEMORY(server_name);
-
-       status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
-                                             server_name,
-                                             NULL,
-                                             SC_RIGHT_MGR_ENUMERATE_SERVICE,
-                                             &hSCM,
-                                             &result);
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
-               d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n", dos_errstr(result));
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
                return werror_to_ntstatus(result);
        }
 
-       result = rpccli_svcctl_enumerate_services(pipe_hnd, mem_ctx, &hSCM, SVCCTL_TYPE_WIN32,
-               SVCCTL_STATE_ALL, &num_services, &services );
-
-       if ( !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Failed to enumerate services.  [%s]\n", dos_errstr(result));
+       buffer = talloc_array(mem_ctx, uint8_t, buf_size);
+       if (buffer == NULL) {
+               status = NT_STATUS_NO_MEMORY;
                goto done;
        }
 
-       if ( num_services == 0 )
-               d_printf("No services returned\n");
+       do {
+               status = dcerpc_svcctl_EnumServicesStatusW(b, mem_ctx,
+                                                          &hSCM,
+                                                          SERVICE_TYPE_WIN32,
+                                                          SERVICE_STATE_ALL,
+                                                          buffer,
+                                                          buf_size,
+                                                          &bytes_needed,
+                                                          &num_services,
+                                                          &resume_handle,
+                                                          &result);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       d_fprintf(stderr,
+                               _("Failed to enumerate services.  [%s]\n"),
+                               nt_errstr(status));
+                       break;
+               }
+
+               if (W_ERROR_EQUAL(result, WERR_MORE_DATA) && bytes_needed > 0) {
+                       buf_size = bytes_needed;
+                       buffer = talloc_realloc(mem_ctx, buffer, uint8_t, bytes_needed);
+                       if (buffer == NULL) {
+                               status = NT_STATUS_NO_MEMORY;
+                               break;
+                       }
+                       continue;
+               }
 
-       for ( i=0; i<num_services; i++ ) {
-               rpcstr_pull( servicename, services[i].servicename.buffer, sizeof(servicename), -1, STR_TERMINATE );
-               rpcstr_pull( displayname, services[i].displayname.buffer, sizeof(displayname), -1, STR_TERMINATE );
+               if (!W_ERROR_IS_OK(result)) {
+                       status = werror_to_ntstatus(result);
+                       d_fprintf(stderr,
+                               _("Failed to enumerate services.  [%s]\n"),
+                               win_errstr(result));
+                       break;
+               }
 
-               d_printf("%-20s    \"%s\"\n", servicename, displayname);
-       }
+               if ( num_services == 0 ) {
+                       d_printf(_("No services returned\n"));
+                       break;
+               }
+
+               {
+                       enum ndr_err_code ndr_err;
+                       DATA_BLOB blob;
+                       struct ndr_pull *ndr;
+
+                       blob.length = buf_size;
+                       blob.data = talloc_steal(mem_ctx, buffer);
+
+                       services = talloc_array(mem_ctx, struct ENUM_SERVICE_STATUSW, num_services);
+                       if (!services) {
+                               status = NT_STATUS_NO_MEMORY;
+                               break;
+                       }
+
+                       ndr = ndr_pull_init_blob(&blob, mem_ctx);
+                       if (ndr == NULL) {
+                               status = NT_STATUS_NO_MEMORY;
+                               break;
+                       }
+
+                       ndr_err = ndr_pull_ENUM_SERVICE_STATUSW_array(
+                               ndr, num_services, services);
+                       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                               status = ndr_map_error2ntstatus(ndr_err);
+                               break;
+                       }
+
+                       for ( i=0; i<num_services; i++ ) {
+                               d_printf("%-20s    \"%s\"\n",
+                                       services[i].service_name,
+                                       services[i].display_name);
+                       }
+               }
+
+       } while (W_ERROR_EQUAL(result, WERR_MORE_DATA));
 
 done:
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
 
-       return werror_to_ntstatus(result);
+       return status;
 }
 
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS rpc_service_status_internal(const DOM_SID *domain_sid,
+static NTSTATUS rpc_service_status_internal(struct net_context *c,
+                                               const struct dom_sid *domain_sid,
                                                const char *domain_name,
                                                struct cli_state *cli,
                                                struct rpc_pipe_client *pipe_hnd,
@@ -229,107 +412,139 @@ static NTSTATUS rpc_service_status_internal(const DOM_SID *domain_sid,
                                                int argc,
                                                const char **argv )
 {
-       POLICY_HND hSCM, hService;
-       WERROR result = WERR_GENERAL_FAILURE;
+       struct policy_handle hSCM, hService;
+       WERROR result = WERR_GEN_FAILURE;
        NTSTATUS status;
-       SERVICE_STATUS service_status;
-       SERVICE_CONFIG config;
-       fstring ascii_string;
-       const char *server_name;
+       struct SERVICE_STATUS service_status;
+       struct QUERY_SERVICE_CONFIG config;
+       uint32_t buf_size = sizeof(config);
+       uint32_t ret_size = 0;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
        if (argc != 1 ) {
-               d_printf("Usage: net rpc service status <service>\n");
+               d_printf("%s net rpc service status <service>\n", _("Usage:"));
                return NT_STATUS_OK;
        }
 
        /* Open the Service Control Manager */
-       CLI_SERVER_NAME_SLASH(mem_ctx, server_name, pipe_hnd);
-       NT_STATUS_HAVE_NO_MEMORY(server_name);
-
-       status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
-                                             server_name,
-                                             NULL,
-                                             SC_RIGHT_MGR_ENUMERATE_SERVICE,
-                                             &hSCM,
-                                             &result);
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
-               d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n", dos_errstr(result));
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
                return werror_to_ntstatus(result);
        }
 
        /* Open the Service */
 
-       status = rpccli_svcctl_OpenServiceW(pipe_hnd, mem_ctx,
-                                           &hSCM,
-                                           argv[0],
-                                           (SC_RIGHT_SVC_QUERY_STATUS|SC_RIGHT_SVC_QUERY_CONFIG),
-                                           &hService,
-                                           &result);
-
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Failed to open service.  [%s]\n", dos_errstr(result));
+       result = open_service(b, mem_ctx, &hSCM, argv[0],
+                             (SC_RIGHT_SVC_QUERY_STATUS|SC_RIGHT_SVC_QUERY_CONFIG),
+                             &hService);
+       if (!W_ERROR_IS_OK(result) ) {
                goto done;
        }
 
        /* get the status */
 
-       status = rpccli_svcctl_QueryServiceStatus(pipe_hnd, mem_ctx,
+       status = dcerpc_svcctl_QueryServiceStatus(b, mem_ctx,
                                                  &hService,
                                                  &service_status,
                                                  &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr, _("Query status request failed.  [%s]\n"),
+                         nt_errstr(status));
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Query status request failed.  [%s]\n", dos_errstr(result));
+       if (!W_ERROR_IS_OK(result) ) {
+               d_fprintf(stderr, _("Query status request failed.  [%s]\n"),
+                         win_errstr(result));
                goto done;
        }
 
-       d_printf("%s service is %s.\n", argv[0], svc_status_string(service_status.state));
+       d_printf(_("%s service is %s.\n"), argv[0],
+                svc_status_string(service_status.state));
 
        /* get the config */
 
-       result = rpccli_svcctl_query_config(pipe_hnd, mem_ctx, &hService, &config  );
-       if ( !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Query config request failed.  [%s]\n", dos_errstr(result));
+       status = dcerpc_svcctl_QueryServiceConfigW(b, mem_ctx,
+                                                  &hService,
+                                                  &config,
+                                                  buf_size,
+                                                  &ret_size,
+                                                  &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr, _("Query config request failed.  [%s]\n"),
+                         nt_errstr(status));
                goto done;
        }
 
-       /* print out the configuration information for the service */
+       if (W_ERROR_EQUAL(result, WERR_INSUFFICIENT_BUFFER)) {
+               buf_size = ret_size;
+               status = dcerpc_svcctl_QueryServiceConfigW(b, mem_ctx,
+                                                          &hService,
+                                                          &config,
+                                                          buf_size,
+                                                          &ret_size,
+                                                          &result);
+               if (!NT_STATUS_IS_OK(status)) {
+                       result = ntstatus_to_werror(status);
+                       d_fprintf(stderr, _("Query config request failed.  [%s]\n"),
+                                 nt_errstr(status));
+                       goto done;
+               }
+       }
 
-       d_printf("Configuration details:\n");
-       d_printf("\tControls Accepted    = 0x%x\n", service_status.controls_accepted);
-       d_printf("\tService Type         = 0x%x\n", config.service_type);
-       d_printf("\tStart Type           = 0x%x\n", config.start_type);
-       d_printf("\tError Control        = 0x%x\n", config.error_control);
-       d_printf("\tTag ID               = 0x%x\n", config.tag_id);
+       if (!W_ERROR_IS_OK(result) ) {
+               d_fprintf(stderr, _("Query config request failed.  [%s]\n"),
+                         win_errstr(result));
+               goto done;
+       }
 
-       if ( config.executablepath ) {
-               rpcstr_pull( ascii_string, config.executablepath->buffer, sizeof(ascii_string), -1, STR_TERMINATE );
-               d_printf("\tExecutable Path      = %s\n", ascii_string);
+       /* print out the configuration information for the service */
+
+       d_printf(_("Configuration details:\n"));
+       d_printf(_("\tControls Accepted    = 0x%x\n"),
+                service_status.controls_accepted);
+       d_printf(_("\tService Type         = 0x%x\n"), config.service_type);
+       d_printf(_("\tStart Type           = 0x%x\n"), config.start_type);
+       d_printf(_("\tError Control        = 0x%x\n"), config.error_control);
+       d_printf(_("\tTag ID               = 0x%x\n"), config.tag_id);
+
+       if (config.executablepath) {
+               d_printf(_("\tExecutable Path      = %s\n"),
+                        config.executablepath);
        }
 
-       if ( config.loadordergroup ) {
-               rpcstr_pull( ascii_string, config.loadordergroup->buffer, sizeof(ascii_string), -1, STR_TERMINATE );
-               d_printf("\tLoad Order Group     = %s\n", ascii_string);
+       if (config.loadordergroup) {
+               d_printf(_("\tLoad Order Group     = %s\n"),
+                        config.loadordergroup);
        }
 
-       if ( config.dependencies ) {
-               rpcstr_pull( ascii_string, config.dependencies->buffer, sizeof(ascii_string), -1, STR_TERMINATE );
-               d_printf("\tDependencies         = %s\n", ascii_string);
+       if (config.dependencies) {
+               d_printf(_("\tDependencies         = %s\n"),
+                        config.dependencies);
        }
 
-       if ( config.startname ) {
-               rpcstr_pull( ascii_string, config.startname->buffer, sizeof(ascii_string), -1, STR_TERMINATE );
-               d_printf("\tStart Name           = %s\n", ascii_string);
+       if (config.startname) {
+               d_printf(_("\tStart Name           = %s\n"), config.startname);
        }
 
-       if ( config.displayname ) {
-               rpcstr_pull( ascii_string, config.displayname->buffer, sizeof(ascii_string), -1, STR_TERMINATE );
-               d_printf("\tDisplay Name         = %s\n", ascii_string);
+       if (config.displayname) {
+               d_printf(_("\tDisplay Name         = %s\n"),
+                        config.displayname);
        }
 
 done:
-        rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+       if (is_valid_policy_hnd(&hService)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hService, &_result);
+       }
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
 
        return werror_to_ntstatus(result);
 }
@@ -337,7 +552,8 @@ done:
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS rpc_service_stop_internal(const DOM_SID *domain_sid,
+static NTSTATUS rpc_service_stop_internal(struct net_context *c,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -345,38 +561,30 @@ static NTSTATUS rpc_service_stop_internal(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv )
 {
-       POLICY_HND hSCM;
-       WERROR result = WERR_GENERAL_FAILURE;
-       NTSTATUS status;
-       fstring servicename;
-       const char *server_name;
+       struct policy_handle hSCM;
+       WERROR result = WERR_GEN_FAILURE;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
        if (argc != 1 ) {
-               d_printf("Usage: net rpc service status <service>\n");
+               d_printf("%s net rpc service status <service>\n", _("Usage:"));
                return NT_STATUS_OK;
        }
 
-       fstrcpy( servicename, argv[0] );
-
        /* Open the Service Control Manager */
-       CLI_SERVER_NAME_SLASH(mem_ctx, server_name, pipe_hnd);
-       NT_STATUS_HAVE_NO_MEMORY(server_name);
-
-       status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
-                                             server_name,
-                                             NULL,
-                                             SC_RIGHT_MGR_ENUMERATE_SERVICE,
-                                             &hSCM,
-                                             &result);
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
-               d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n", dos_errstr(result));
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
                return werror_to_ntstatus(result);
        }
 
-       result = control_service(pipe_hnd, mem_ctx, &hSCM, servicename,
+       result = control_service(pipe_hnd, mem_ctx, &hSCM, argv[0],
                SVCCTL_CONTROL_STOP, SVCCTL_STOPPED );
 
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
 
        return werror_to_ntstatus(result);
 }
@@ -384,7 +592,8 @@ static NTSTATUS rpc_service_stop_internal(const DOM_SID *domain_sid,
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS rpc_service_pause_internal(const DOM_SID *domain_sid,
+static NTSTATUS rpc_service_pause_internal(struct net_context *c,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -392,38 +601,30 @@ static NTSTATUS rpc_service_pause_internal(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv )
 {
-       POLICY_HND hSCM;
-       WERROR result = WERR_GENERAL_FAILURE;
-       NTSTATUS status;
-       fstring servicename;
-       const char *server_name;
+       struct policy_handle hSCM;
+       WERROR result = WERR_GEN_FAILURE;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
        if (argc != 1 ) {
-               d_printf("Usage: net rpc service status <service>\n");
+               d_printf("%s net rpc service status <service>\n", _("Usage:"));
                return NT_STATUS_OK;
        }
 
-       fstrcpy( servicename, argv[0] );
-
        /* Open the Service Control Manager */
-       CLI_SERVER_NAME_SLASH(mem_ctx, server_name, pipe_hnd);
-       NT_STATUS_HAVE_NO_MEMORY(server_name);
-
-       status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
-                                             server_name,
-                                             NULL,
-                                             SC_RIGHT_MGR_ENUMERATE_SERVICE,
-                                             &hSCM,
-                                             &result);
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
-               d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n", dos_errstr(result));
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
                return werror_to_ntstatus(result);
        }
 
-       result = control_service(pipe_hnd, mem_ctx, &hSCM, servicename,
+       result = control_service(pipe_hnd, mem_ctx, &hSCM, argv[0],
                SVCCTL_CONTROL_PAUSE, SVCCTL_PAUSED );
 
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
 
        return werror_to_ntstatus(result);
 }
@@ -431,7 +632,8 @@ static NTSTATUS rpc_service_pause_internal(const DOM_SID *domain_sid,
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS rpc_service_resume_internal(const DOM_SID *domain_sid,
+static NTSTATUS rpc_service_resume_internal(struct net_context *c,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -439,38 +641,30 @@ static NTSTATUS rpc_service_resume_internal(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv )
 {
-       POLICY_HND hSCM;
-       WERROR result = WERR_GENERAL_FAILURE;
-       NTSTATUS status;
-       fstring servicename;
-       const char *server_name;
+       struct policy_handle hSCM;
+       WERROR result = WERR_GEN_FAILURE;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
        if (argc != 1 ) {
-               d_printf("Usage: net rpc service status <service>\n");
+               d_printf("%s net rpc service status <service>\n", _("Usage:"));
                return NT_STATUS_OK;
        }
 
-       fstrcpy( servicename, argv[0] );
-
        /* Open the Service Control Manager */
-       CLI_SERVER_NAME_SLASH(mem_ctx, server_name, pipe_hnd);
-       NT_STATUS_HAVE_NO_MEMORY(server_name);
-
-       status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
-                                             server_name,
-                                             NULL,
-                                             SC_RIGHT_MGR_ENUMERATE_SERVICE,
-                                             &hSCM,
-                                             &result);
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
-               d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n", dos_errstr(result));
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
                return werror_to_ntstatus(result);
        }
 
-       result = control_service(pipe_hnd, mem_ctx, &hSCM, servicename,
+       result = control_service(pipe_hnd, mem_ctx, &hSCM, argv[0],
                SVCCTL_CONTROL_CONTINUE, SVCCTL_RUNNING );
 
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
 
        return werror_to_ntstatus(result);
 }
@@ -478,7 +672,8 @@ static NTSTATUS rpc_service_resume_internal(const DOM_SID *domain_sid,
 /********************************************************************
 ********************************************************************/
 
-static NTSTATUS rpc_service_start_internal(const DOM_SID *domain_sid,
+static NTSTATUS rpc_service_start_internal(struct net_context *c,
+                                       const struct dom_sid *domain_sid,
                                        const char *domain_name,
                                        struct cli_state *cli,
                                        struct rpc_pipe_client *pipe_hnd,
@@ -486,69 +681,236 @@ static NTSTATUS rpc_service_start_internal(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv )
 {
-       POLICY_HND hSCM, hService;
-       WERROR result = WERR_GENERAL_FAILURE;
+       struct policy_handle hSCM, hService;
+       WERROR result = WERR_GEN_FAILURE;
        NTSTATUS status;
-       uint32 state = 0;
-       const char *server_name;
+       uint32_t state = 0;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
        if (argc != 1 ) {
-               d_printf("Usage: net rpc service status <service>\n");
+               d_printf("%s net rpc service status <service>\n", _("Usage:"));
                return NT_STATUS_OK;
        }
 
        /* Open the Service Control Manager */
-       CLI_SERVER_NAME_SLASH(mem_ctx, server_name, pipe_hnd);
-       NT_STATUS_HAVE_NO_MEMORY(server_name);
-
-       status = rpccli_svcctl_OpenSCManagerW(pipe_hnd, mem_ctx,
-                                             server_name,
-                                             NULL,
-                                             SC_RIGHT_MGR_ENUMERATE_SERVICE,
-                                             &hSCM,
-                                             &result);
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
-               d_fprintf(stderr, "Failed to open Service Control Manager.  [%s]\n", dos_errstr(result));
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
                return werror_to_ntstatus(result);
        }
 
-       /* Open the Service */
 
-       status = rpccli_svcctl_OpenServiceW(pipe_hnd, mem_ctx,
-                                           &hSCM,
-                                           argv[0],
-                                           SC_RIGHT_SVC_START,
-                                           &hService,
-                                           &result);
+       /* Open the Service */
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Failed to open service.  [%s]\n", dos_errstr(result));
+       result = open_service(b, mem_ctx, &hSCM, argv[0],
+                             SC_RIGHT_SVC_START,
+                             &hService);
+       if (!W_ERROR_IS_OK(result) ) {
                goto done;
        }
 
        /* get the status */
 
-       status = rpccli_svcctl_StartServiceW(pipe_hnd, mem_ctx,
+       status = dcerpc_svcctl_StartServiceW(b, mem_ctx,
                                             &hService,
                                             0,
                                             NULL,
                                             &result);
 
-       if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result) ) {
-               d_fprintf(stderr, "Query status request failed.  [%s]\n", dos_errstr(result));
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr, _("Query status request failed.  [%s]\n"),
+                         nt_errstr(status));
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result) ) {
+               d_fprintf(stderr, _("Query status request failed.  [%s]\n"),
+                         win_errstr(result));
                goto done;
        }
 
        result = watch_service_state(pipe_hnd, mem_ctx, &hSCM, argv[0], SVCCTL_RUNNING, &state  );
 
        if ( W_ERROR_IS_OK(result) && (state == SVCCTL_RUNNING) )
-               d_printf("Successfully started service: %s\n", argv[0] );
+               d_printf(_("Successfully started service: %s\n"),
+                        argv[0] );
        else
-               d_fprintf(stderr, "Failed to start service: %s [%s]\n", argv[0], dos_errstr(result) );
+               d_fprintf(stderr,_("Failed to start service: %s [%s]\n"),
+                         argv[0], win_errstr(result) );
 
 done:
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
+       if (is_valid_policy_hnd(&hService)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hService, &_result);
+       }
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
+
+       return werror_to_ntstatus(result);
+}
+
+/********************************************************************
+********************************************************************/
+
+static NTSTATUS rpc_service_delete_internal(struct net_context *c,
+                                           const struct dom_sid *domain_sid,
+                                           const char *domain_name,
+                                           struct cli_state *cli,
+                                           struct rpc_pipe_client *pipe_hnd,
+                                           TALLOC_CTX *mem_ctx,
+                                           int argc,
+                                           const char **argv)
+{
+       struct policy_handle hSCM, hService;
+       WERROR result = WERR_GEN_FAILURE;
+       NTSTATUS status;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
+
+       if (argc != 1 ) {
+               d_printf("%s net rpc service delete <service>\n", _("Usage:"));
+               return NT_STATUS_OK;
+       }
+
+       ZERO_STRUCT(hSCM);
+       ZERO_STRUCT(hService);
+
+       /* Open the Service Control Manager */
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_ENUMERATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
+               return werror_to_ntstatus(result);
+       }
+
+       /* Open the Service */
+
+       result = open_service(b, mem_ctx, &hSCM, argv[0],
+                             SERVICE_ALL_ACCESS,
+                             &hService);
+       if (!W_ERROR_IS_OK(result) ) {
+               goto done;
+       }
+
+       /* Delete the Service */
+
+       status = dcerpc_svcctl_DeleteService(b, mem_ctx,
+                                            &hService,
+                                            &result);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr, _("Delete service request failed.  [%s]\n"),
+                       nt_errstr(status));
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
+               d_fprintf(stderr, _("Delete service request failed.  [%s]\n"),
+                       win_errstr(result));
+               goto done;
+       }
+
+       d_printf(_("Successfully deleted Service: %s\n"), argv[0]);
+
+ done:
+       if (is_valid_policy_hnd(&hService)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hService, &_result);
+       }
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
+
+       return werror_to_ntstatus(result);
+}
+
+/********************************************************************
+********************************************************************/
+
+static NTSTATUS rpc_service_create_internal(struct net_context *c,
+                                           const struct dom_sid *domain_sid,
+                                           const char *domain_name,
+                                           struct cli_state *cli,
+                                           struct rpc_pipe_client *pipe_hnd,
+                                           TALLOC_CTX *mem_ctx,
+                                           int argc,
+                                           const char **argv)
+{
+       struct policy_handle hSCM, hService;
+       WERROR result = WERR_GEN_FAILURE;
+       NTSTATUS status;
+       const char *ServiceName;
+       const char *DisplayName;
+       const char *binary_path;
+       struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
+
+       if (argc != 3) {
+               d_printf("%s net rpc service create <service> "
+                        "<displayname> <binarypath>\n", _("Usage:"));
+               return NT_STATUS_OK;
+       }
+
+       ZERO_STRUCT(hSCM);
+       ZERO_STRUCT(hService);
+
+       /* Open the Service Control Manager */
+       result = open_scm(b, mem_ctx, pipe_hnd->srv_name_slash,
+                         SC_RIGHT_MGR_CREATE_SERVICE,
+                         &hSCM);
+       if (!W_ERROR_IS_OK(result)) {
+               return werror_to_ntstatus(result);
+       }
+
+       /* Create the service */
+
+       ServiceName = argv[0];
+       DisplayName = argv[1];
+       binary_path = argv[2];
+
+       status = dcerpc_svcctl_CreateServiceW(b, mem_ctx,
+                                             &hSCM,
+                                             ServiceName,
+                                             DisplayName,
+                                             SERVICE_ALL_ACCESS,
+                                             SERVICE_TYPE_WIN32_OWN_PROCESS,
+                                             SVCCTL_DEMAND_START,
+                                             SVCCTL_SVC_ERROR_NORMAL,
+                                             binary_path,
+                                             NULL, /* LoadOrderGroupKey */
+                                             NULL, /* TagId */
+                                             NULL, /* dependencies */
+                                             0, /* dependencies_size */
+                                             NULL, /* service_start_name */
+                                             NULL, /* password */
+                                             0, /* password_size */
+                                             &hService,
+                                             &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = ntstatus_to_werror(status);
+               d_fprintf(stderr, _("Create service request failed.  [%s]\n"),
+                         nt_errstr(status));
+               goto done;
+       }
+       if (!W_ERROR_IS_OK(result)) {
+               d_fprintf(stderr, _("Create service request failed.  [%s]\n"),
+                         win_errstr(result));
+               goto done;
+       }
+
+       d_printf(_("Successfully created Service: %s\n"), argv[0]);
+
+ done:
+       if (is_valid_policy_hnd(&hService)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hService, &_result);
+       }
+       if (is_valid_policy_hnd(&hSCM)) {
+               WERROR _result;
+               dcerpc_svcctl_CloseServiceHandle(b, mem_ctx, &hSCM, &_result);
+       }
 
        return werror_to_ntstatus(result);
 }
@@ -556,89 +918,220 @@ done:
 /********************************************************************
 ********************************************************************/
 
-static int rpc_service_list( int argc, const char **argv )
+static int rpc_service_list(struct net_context *c, int argc, const char **argv )
 {
-       return run_rpc_command( NULL, PI_SVCCTL, 0,
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service list\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("View configured Win32 services"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
                rpc_service_list_internal, argc, argv );
 }
 
 /********************************************************************
 ********************************************************************/
 
-static int rpc_service_start( int argc, const char **argv )
+static int rpc_service_start(struct net_context *c, int argc, const char **argv )
 {
-       return run_rpc_command( NULL, PI_SVCCTL, 0,
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service start <service>\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Start a Win32 service"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
                rpc_service_start_internal, argc, argv );
 }
 
 /********************************************************************
 ********************************************************************/
 
-static int rpc_service_stop( int argc, const char **argv )
+static int rpc_service_stop(struct net_context *c, int argc, const char **argv )
 {
-       return run_rpc_command( NULL, PI_SVCCTL, 0,
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service stop <service>\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Stop a Win32 service"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
                rpc_service_stop_internal, argc, argv );
 }
 
 /********************************************************************
 ********************************************************************/
 
-static int rpc_service_resume( int argc, const char **argv )
+static int rpc_service_resume(struct net_context *c, int argc, const char **argv )
 {
-       return run_rpc_command( NULL, PI_SVCCTL, 0,
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service resume <service>\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Resume a Win32 service"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
                rpc_service_resume_internal, argc, argv );
 }
 
 /********************************************************************
 ********************************************************************/
 
-static int rpc_service_pause( int argc, const char **argv )
+static int rpc_service_pause(struct net_context *c, int argc, const char **argv )
 {
-       return run_rpc_command( NULL, PI_SVCCTL, 0,
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service pause <service>\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Pause a Win32 service"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
                rpc_service_pause_internal, argc, argv );
 }
 
 /********************************************************************
 ********************************************************************/
 
-static int rpc_service_status( int argc, const char **argv )
+static int rpc_service_status(struct net_context *c, int argc, const char **argv )
 {
-       return run_rpc_command( NULL, PI_SVCCTL, 0,
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service status <service>\n"
+                          "     %s\n",
+                        _("Usage:"),
+                        _("Show the current status of a service"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
                rpc_service_status_internal, argc, argv );
 }
 
 /********************************************************************
 ********************************************************************/
 
-static int net_help_service( int argc, const char **argv )
+static int rpc_service_delete(struct net_context *c, int argc, const char **argv)
+{
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service delete <service>\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Delete a Win32 service"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
+               rpc_service_delete_internal, argc, argv);
+}
+
+/********************************************************************
+********************************************************************/
+
+static int rpc_service_create(struct net_context *c, int argc, const char **argv)
 {
-       d_printf("net rpc service list               View configured Win32 services\n");
-       d_printf("net rpc service start <service>    Start a service\n");
-       d_printf("net rpc service stop <service>     Stop a service\n");
-       d_printf("net rpc service pause <service>    Pause a service\n");
-       d_printf("net rpc service resume <service>   Resume a paused service\n");
-       d_printf("net rpc service status <service>   View the current status of a service\n");
-
-       return -1;
+       if (c->display_usage) {
+               d_printf(  "%s\n"
+                          "net rpc service create <service>\n"
+                          "    %s\n",
+                        _("Usage:"),
+                        _("Create a Win32 service"));
+               return 0;
+       }
+
+       return run_rpc_command(c, NULL, &ndr_table_svcctl, 0,
+               rpc_service_create_internal, argc, argv);
 }
 
 /********************************************************************
 ********************************************************************/
 
-int net_rpc_service(int argc, const char **argv)
+int net_rpc_service(struct net_context *c, int argc, const char **argv)
 {
        struct functable func[] = {
-               {"list", rpc_service_list},
-               {"start", rpc_service_start},
-               {"stop", rpc_service_stop},
-               {"pause", rpc_service_pause},
-               {"resume", rpc_service_resume},
-               {"status", rpc_service_status},
-               {NULL, NULL}
+               {
+                       "list",
+                       rpc_service_list,
+                       NET_TRANSPORT_RPC,
+                       N_("View configured Win32 services"),
+                       N_("net rpc service list\n"
+                          "    View configured Win32 services")
+               },
+               {
+                       "start",
+                       rpc_service_start,
+                       NET_TRANSPORT_RPC,
+                       N_("Start a service"),
+                       N_("net rpc service start\n"
+                          "    Start a service")
+               },
+               {
+                       "stop",
+                       rpc_service_stop,
+                       NET_TRANSPORT_RPC,
+                       N_("Stop a service"),
+                       N_("net rpc service stop\n"
+                          "    Stop a service")
+               },
+               {
+                       "pause",
+                       rpc_service_pause,
+                       NET_TRANSPORT_RPC,
+                       N_("Pause a service"),
+                       N_("net rpc service pause\n"
+                          "    Pause a service")
+               },
+               {
+                       "resume",
+                       rpc_service_resume,
+                       NET_TRANSPORT_RPC,
+                       N_("Resume a paused service"),
+                       N_("net rpc service resume\n"
+                          "    Resume a service")
+               },
+               {
+                       "status",
+                       rpc_service_status,
+                       NET_TRANSPORT_RPC,
+                       N_("View current status of a service"),
+                       N_("net rpc service status\n"
+                          "    View current status of a service")
+               },
+               {
+                       "delete",
+                       rpc_service_delete,
+                       NET_TRANSPORT_RPC,
+                       N_("Delete a service"),
+                       N_("net rpc service delete\n"
+                          "    Deletes a service")
+               },
+               {
+                       "create",
+                       rpc_service_create,
+                       NET_TRANSPORT_RPC,
+                       N_("Create a service"),
+                       N_("net rpc service create\n"
+                          "    Creates a service")
+               },
+
+               {NULL, NULL, 0, NULL, NULL}
        };
 
-       if ( argc )
-               return net_run_function( argc, argv, func, net_help_service );
-
-       return net_help_service( argc, argv );
+       return net_run_function(c, argc, argv, "net rpc service",func);
 }