From 22a96cbe31875a1adfbfc7157b308eebb5d0f2ec Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 9 Jan 2009 16:25:47 +0100 Subject: s3-svcctl: remove last traces of hand-marshalled svcctl code. Guenther --- source3/include/includes.h | 1 - source3/include/proto.h | 9 -------- source3/include/rpc_svcctl.h | 49 -------------------------------------------- 3 files changed, 59 deletions(-) delete mode 100644 source3/include/rpc_svcctl.h (limited to 'source3/include') diff --git a/source3/include/includes.h b/source3/include/includes.h index 8b0ff71c4e..10d37eefd9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -620,7 +620,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "ntlmssp.h" #include "auth.h" #include "ntdomain.h" -#include "rpc_svcctl.h" #include "rpc_lsa.h" #include "reg_objects.h" #include "reg_db.h" diff --git a/source3/include/proto.h b/source3/include/proto.h index ff79803a31..d4aefeae4a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5451,8 +5451,6 @@ WERROR rpccli_spoolss_rffpcnex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *localmachine, uint32 printerlocal, SPOOL_NOTIFY_OPTION *option); -/* The following definitions come from rpc_client/cli_svcctl.c */ - /* The following definitions come from rpc_client/init_lsa.c */ void init_lsa_String(struct lsa_String *name, const char *s); @@ -6150,8 +6148,6 @@ bool spoolss_io_r_xcvdataport(const char *desc, SPOOL_R_XCVDATAPORT *r_u, prs_st bool make_monitorui_buf( RPC_BUFFER *buf, const char *dllname ); bool convert_port_data_1( NT_PORT_DATA_1 *port1, RPC_BUFFER *buf ) ; -/* The following definitions come from rpc_parse/parse_svcctl.c */ - /* The following definitions come from rpc_server/srv_eventlog.c */ NTSTATUS rpc_eventlog2_init(void); @@ -6381,11 +6377,6 @@ WERROR _spoolss_xcvdataport(pipes_struct *p, SPOOL_Q_XCVDATAPORT *q_u, SPOOL_R_X char *valid_share_pathname(TALLOC_CTX *ctx, const char *dos_pathname); -/* The following definitions come from rpc_server/srv_svcctl.c */ - -void svcctl2_get_pipe_fns( struct api_struct **fns, int *n_fns ); -NTSTATUS rpc_svcctl2_init(void); - /* The following definitions come from rpc_server/srv_svcctl_nt.c */ bool init_service_op_table( void ); diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h deleted file mode 100644 index 9b5859b07a..0000000000 --- a/source3/include/rpc_svcctl.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB parameters and setup - Copyright (C) Andrew Tridgell 1992-1997, - Copyright (C) Gerald (Jerry) Carter 2005 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef _RPC_SVCCTL_H /* _RPC_SVCCTL_H */ -#define _RPC_SVCCTL_H - -/* svcctl pipe */ - -#define SVCCTL_CLOSE_SERVICE 0x00 -#define SVCCTL_CONTROL_SERVICE 0x01 -#define SVCCTL_LOCK_SERVICE_DB 0x03 -#define SVCCTL_QUERY_SERVICE_SEC 0x04 -#define SVCCTL_SET_SERVICE_SEC 0x05 -#define SVCCTL_QUERY_STATUS 0x06 -#define SVCCTL_UNLOCK_SERVICE_DB 0x08 -#define SVCCTL_ENUM_DEPENDENT_SERVICES_W 0x0d -#define SVCCTL_ENUM_SERVICES_STATUS_W 0x0e -#define SVCCTL_OPEN_SCMANAGER_W 0x0f -#define SVCCTL_OPEN_SERVICE_W 0x10 -#define SVCCTL_QUERY_SERVICE_CONFIG_W 0x11 -#define SVCCTL_START_SERVICE_W 0x13 -#define SVCCTL_GET_DISPLAY_NAME 0x14 -#define SVCCTL_QUERY_SERVICE_CONFIG2_W 0x27 -#define SVCCTL_QUERY_SERVICE_STATUSEX_W 0x28 - -/* ANSI versions not implemented currently -#define SVCCTL_ENUM_SERVICES_STATUS_A 0x0e -#define SVCCTL_OPEN_SCMANAGER_A 0x1b -*/ - -#endif /* _RPC_SVCCTL_H */ - -- cgit