s3-svcctl: remove last traces of hand-marshalled svcctl code.

Guenther

8 files changed, 4 insertions, 328 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 257f4d48c6..d693bb57da 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -456,7 +456,6 @@ RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o
 LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
 	       $(RPC_CLIENT_OBJ1) rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \
 	       rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o  \
-	       rpc_client/cli_svcctl.o \
 	       rpc_client/init_samr.o \
 		   librpc/rpc/dcerpc.o \
 		   ../librpc/rpc/binding.o
@@ -550,7 +549,7 @@ RPC_SVC_OBJ = rpc_server/srv_srvsvc_nt.o \
 
 RPC_WKS_OBJ =  ../librpc/gen_ndr/srv_wkssvc.o rpc_server/srv_wkssvc_nt.o
 
-RPC_SVCCTL_OBJ =  rpc_server/srv_svcctl.o rpc_server/srv_svcctl_nt.o \
+RPC_SVCCTL_OBJ =  rpc_server/srv_svcctl_nt.o \
 		  ../librpc/gen_ndr/srv_svcctl.o \
                   services/svc_spoolss.o services/svc_rcinit.o services/services_db.o \
                   services/svc_netlogon.o services/svc_winreg.o \
@@ -575,8 +574,7 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ)
 
 RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \
                 rpc_parse/parse_spoolss.o \
-	        rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o \
-                rpc_parse/parse_svcctl.o
+	        rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o
 
 RPC_CLIENT_OBJ = rpc_client/cli_pipe.o
 
diff --git a/source3/configure.in b/source3/configure.in
index 6727181e1c..fb5e7b377f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -406,7 +406,7 @@ AC_SUBST(DYNEXP)
 
 dnl Add modules that have to be built by default here
 dnl These have to be built static:
-default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
+default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
 
 dnl These are preferably build shared, and static if dlopen() is not available
 default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer"
@@ -6090,7 +6090,7 @@ SMB_MODULE(rpc_winreg, \$(RPC_REG_OBJ), "bin/librpc_winreg.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_initshutdown, \$(RPC_INITSHUTDOWN_OBJ), "bin/librpc_initshutdown.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_dssetup, \$(RPC_DSSETUP_OBJ), "bin/librpc_dssetup.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_wkssvc, \$(RPC_WKS_OBJ), "bin/librpc_wkssvc.$SHLIBEXT", RPC)
-SMB_MODULE(rpc_svcctl2, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl2.$SHLIBEXT", RPC)
+SMB_MODULE(rpc_svcctl, \$(RPC_SVCCTL_OBJ), "bin/librpc_svcctl.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_ntsvcs, \$(RPC_NTSVCS_OBJ), "bin/librpc_ntsvcs.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_netlogon, \$(RPC_NETLOG_OBJ), "bin/librpc_NETLOGON.$SHLIBEXT", RPC)
 SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC)
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 <http://www.gnu.org/licenses/>.
-*/
-
-#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 */
-
diff --git a/source3/rpc_client/cli_svcctl.c b/source3/rpc_client/cli_svcctl.c
deleted file mode 100644
index 360fbc7b89..0000000000
--- a/source3/rpc_client/cli_svcctl.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Gerald 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 <http://www.gnu.org/licenses/>.
- */
-
-
-#include "includes.h"
-#include "rpc_client.h"
-
-/*******************************************************************
-*******************************************************************/
diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
deleted file mode 100644
index 9cf806a73a..0000000000
--- a/source3/rpc_parse/parse_svcctl.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE
-
-/*******************************************************************
-********************************************************************/
diff --git a/source3/rpc_server/srv_svcctl.c b/source3/rpc_server/srv_svcctl.c
deleted file mode 100644
index 7e8cc80392..0000000000
--- a/source3/rpc_server/srv_svcctl.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  RPC Pipe client / server routines
- *  Copyright (C) Gerald Carter                   2005 - 2007
- *  
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#include "includes.h"
-#include "librpc/gen_ndr/srv_svcctl.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_SRV
-
-static bool proxy_svcctl_call(pipes_struct *p, uint8 opnum)
-{
-	struct api_struct *fns;
-	int n_fns;
-
-	svcctl_get_pipe_fns(&fns, &n_fns);
-
-	if (opnum >= n_fns)
-		return False;
-
-	if (fns[opnum].opnum != opnum) {
-		smb_panic("SVCCTL function table not sorted\n");
-	}
-
-	return fns[opnum].fn(p);
-}
-
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_close_service(pipes_struct *p)
-{
-	return proxy_svcctl_call( p, NDR_SVCCTL_CLOSESERVICEHANDLE );
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_open_scmanager(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_OPENSCMANAGERW);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_open_service(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_OPENSERVICEW);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_get_display_name(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_GETSERVICEDISPLAYNAMEW);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_query_status(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_QUERYSERVICESTATUS);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_enum_services_status(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_ENUMSERVICESSTATUSW);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_query_service_status_ex(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_QUERYSERVICESTATUSEX);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_enum_dependent_services(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_ENUMDEPENDENTSERVICESW);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_start_service(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_STARTSERVICEW);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_control_service(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_CONTROLSERVICE);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_query_service_config(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_QUERYSERVICECONFIGW);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_query_service_config2(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_QUERYSERVICECONFIG2W);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_lock_service_db(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_LOCKSERVICEDATABASE);
-}
-
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_unlock_service_db(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_UNLOCKSERVICEDATABASE);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_query_security_sec(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY);
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static bool api_svcctl_set_security_sec(pipes_struct *p)
-{
-	return proxy_svcctl_call(p, NDR_SVCCTL_SETSERVICEOBJECTSECURITY);
-}
-
-
-/*******************************************************************
- \PIPE\svcctl commands
- ********************************************************************/
-
-static struct api_struct api_svcctl_cmds[] =
-{
-      { "SVCCTL_CLOSE_SERVICE"              , SVCCTL_CLOSE_SERVICE              , api_svcctl_close_service },
-      { "SVCCTL_OPEN_SCMANAGER_W"           , SVCCTL_OPEN_SCMANAGER_W           , api_svcctl_open_scmanager },
-      { "SVCCTL_OPEN_SERVICE_W"             , SVCCTL_OPEN_SERVICE_W             , api_svcctl_open_service },
-      { "SVCCTL_GET_DISPLAY_NAME"           , SVCCTL_GET_DISPLAY_NAME           , api_svcctl_get_display_name },
-      { "SVCCTL_QUERY_STATUS"               , SVCCTL_QUERY_STATUS               , api_svcctl_query_status },
-      { "SVCCTL_QUERY_SERVICE_CONFIG_W"     , SVCCTL_QUERY_SERVICE_CONFIG_W     , api_svcctl_query_service_config },
-      { "SVCCTL_QUERY_SERVICE_CONFIG2_W"    , SVCCTL_QUERY_SERVICE_CONFIG2_W    , api_svcctl_query_service_config2 },
-      { "SVCCTL_ENUM_SERVICES_STATUS_W"     , SVCCTL_ENUM_SERVICES_STATUS_W     , api_svcctl_enum_services_status },
-      { "SVCCTL_ENUM_DEPENDENT_SERVICES_W"  , SVCCTL_ENUM_DEPENDENT_SERVICES_W  , api_svcctl_enum_dependent_services },
-      { "SVCCTL_START_SERVICE_W"            , SVCCTL_START_SERVICE_W            , api_svcctl_start_service },
-      { "SVCCTL_CONTROL_SERVICE"            , SVCCTL_CONTROL_SERVICE            , api_svcctl_control_service },
-      { "SVCCTL_QUERY_SERVICE_STATUSEX_W"   , SVCCTL_QUERY_SERVICE_STATUSEX_W   , api_svcctl_query_service_status_ex },
-      { "SVCCTL_LOCK_SERVICE_DB"            , SVCCTL_LOCK_SERVICE_DB            , api_svcctl_lock_service_db },
-      { "SVCCTL_UNLOCK_SERVICE_DB"          , SVCCTL_UNLOCK_SERVICE_DB          , api_svcctl_unlock_service_db },
-      { "SVCCTL_QUERY_SERVICE_SEC"          , SVCCTL_QUERY_SERVICE_SEC          , api_svcctl_query_security_sec },
-      { "SVCCTL_SET_SERVICE_SEC"            , SVCCTL_SET_SERVICE_SEC            , api_svcctl_set_security_sec }
-};
-
-
-void svcctl2_get_pipe_fns( struct api_struct **fns, int *n_fns )
-{
-        *fns = api_svcctl_cmds;
-	*n_fns = sizeof(api_svcctl_cmds) / sizeof(struct api_struct);
-}
-
-NTSTATUS rpc_svcctl2_init(void)
-{
-	return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION,
-					  "svcctl", "ntsvcs",
-					  &ndr_table_svcctl.syntax_id,
-					  api_svcctl_cmds,
-					  sizeof(api_svcctl_cmds) / sizeof(struct api_struct));
-}