[SCM] Samba Shared Repository - branch master updated - 22a96cbe31875a1adfbfc7157b308eebb5d0f2ec

Günther Deschner gd at samba.org
Fri Jan 9 16:08:45 GMT 2009


The branch, master has been updated
       via  22a96cbe31875a1adfbfc7157b308eebb5d0f2ec (commit)
       via  03611c6c9d84b2654481dc51ce2af2665205e755 (commit)
       via  2d218c93cd18f8c26fc0f549f7d059cf4b139893 (commit)
       via  fa6053fe6d854e9cae986d8144a72f2ff487cdcc (commit)
       via  9e6e3bc0105d81076ad838d1424b494243318619 (commit)
       via  f2dd351a1e63f57e030a7b6e8660fcf43e401e9d (commit)
      from  b516a2abcadb4a58fe7058ddbb4e38f53a467426 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 22a96cbe31875a1adfbfc7157b308eebb5d0f2ec
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 9 16:25:47 2009 +0100

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

commit 03611c6c9d84b2654481dc51ce2af2665205e755
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 9 16:22:03 2009 +0100

    s3-svcctl: remove old marshalling of svcctl_EnumServicesStatusW.
    
    Guenther

commit 2d218c93cd18f8c26fc0f549f7d059cf4b139893
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 9 16:20:09 2009 +0100

    s3-svcctl: build svcctl marshalling helper.
    
    Guenther

commit fa6053fe6d854e9cae986d8144a72f2ff487cdcc
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 9 16:19:37 2009 +0100

    s3-svcctl: use pidl for _svcctl_EnumServicesStatusW.
    
    Guenther

commit 9e6e3bc0105d81076ad838d1424b494243318619
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 9 16:18:51 2009 +0100

    s3-net: use rpccli_svcctl_EnumServicesStatusW.
    
    Guenther

commit f2dd351a1e63f57e030a7b6e8660fcf43e401e9d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 9 16:16:11 2009 +0100

    s4-smbtorture: print hand-decoded service status array in svcctl torture test.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in                |    9 +-
 source3/configure.in               |    4 +-
 source3/include/includes.h         |    1 -
 source3/include/proto.h            |   19 ---
 source3/include/rpc_svcctl.h       |   77 ------------
 source3/rpc_client/cli_svcctl.c    |   92 ---------------
 source3/rpc_parse/parse_svcctl.c   |  155 ------------------------
 source3/rpc_server/srv_svcctl.c    |  227 ------------------------------------
 source3/rpc_server/srv_svcctl_nt.c |   58 +++++----
 source3/utils/net_rpc_service.c    |   87 +++++++++++---
 source4/librpc/config.mk           |    2 +-
 source4/torture/rpc/svcctl.c       |   30 +++++-
 12 files changed, 135 insertions(+), 626 deletions(-)
 delete mode 100644 source3/include/rpc_svcctl.h
 delete mode 100644 source3/rpc_client/cli_svcctl.c
 delete mode 100644 source3/rpc_parse/parse_svcctl.c
 delete mode 100644 source3/rpc_server/srv_svcctl.c


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 33d0959..d693bb5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -408,7 +408,8 @@ LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
 	     ../libcli/netlogon.o \
 	     ../libcli/ndr_netlogon.o \
 	     ../librpc/gen_ndr/ndr_nbt.o \
-	     ../librpc/gen_ndr/ndr_svcctl.o
+	     ../librpc/gen_ndr/ndr_svcctl.o \
+	     ../librpc/ndr/ndr_svcctl.o
 
 LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
 	     libsmb/namequery.o libsmb/conncache.o libads/dns.o
@@ -455,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
@@ -549,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 \
@@ -574,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 6727181..fb5e7b3 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 8b0ff71..10d37ee 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 96b2e26..d4aefea 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5451,12 +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  */
-
-WERROR rpccli_svcctl_enumerate_services( struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                      POLICY_HND *hSCM, uint32 type, uint32 state, 
-				      uint32 *returned, ENUM_SERVICES_STATUS **service_array  );
-
 /* The following definitions come from rpc_client/init_lsa.c  */
 
 void init_lsa_String(struct lsa_String *name, const char *s);
@@ -6154,13 +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  */
-
-bool svcctl_io_enum_services_status( const char *desc, ENUM_SERVICES_STATUS *enum_status, RPC_BUFFER *buffer, int depth );
-uint32 svcctl_sizeof_enum_services_status( ENUM_SERVICES_STATUS *status );
-bool svcctl_io_q_enum_services_status(const char *desc, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, prs_struct *ps, int depth);
-bool svcctl_io_r_enum_services_status(const char *desc, SVCCTL_R_ENUM_SERVICES_STATUS *r_u, prs_struct *ps, int depth);
-
 /* The following definitions come from rpc_server/srv_eventlog.c  */
 
 NTSTATUS rpc_eventlog2_init(void);
@@ -6390,15 +6377,9 @@ 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 );
-WERROR _svcctl_enum_services_status(pipes_struct *p, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, SVCCTL_R_ENUM_SERVICES_STATUS *r_u);
 
 /* The following definitions come from rpcclient/cmd_dfs.c  */
 
diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
deleted file mode 100644
index b12cecb..0000000
--- a/source3/include/rpc_svcctl.h
+++ /dev/null
@@ -1,77 +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
-*/
-
-/* utility structures for RPCs */
-
-typedef struct {
-	UNISTR servicename;
-	UNISTR displayname;
-	struct SERVICE_STATUS status;
-} ENUM_SERVICES_STATUS;
-
-/* rpc structures */
-
-/**************************/
-
-typedef struct {
-	POLICY_HND handle;
-	uint32 type;
-	uint32 state;
-	uint32 buffer_size;
-	uint32 *resume;
-} SVCCTL_Q_ENUM_SERVICES_STATUS;
-
-typedef struct {
-	RPC_BUFFER buffer;
-	uint32 needed;
-	uint32 returned;
-	uint32 *resume;
-	WERROR status;
-} SVCCTL_R_ENUM_SERVICES_STATUS;
-
-#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 5167808..0000000
--- a/source3/rpc_client/cli_svcctl.c
+++ /dev/null
@@ -1,92 +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"
-
-/*******************************************************************
-*******************************************************************/
-
-WERROR rpccli_svcctl_enumerate_services( struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                      POLICY_HND *hSCM, uint32 type, uint32 state, 
-				      uint32 *returned, ENUM_SERVICES_STATUS **service_array  )
-{
-	SVCCTL_Q_ENUM_SERVICES_STATUS in;
-	SVCCTL_R_ENUM_SERVICES_STATUS out;
-	prs_struct qbuf, rbuf;
-	uint32 resume = 0;
-	ENUM_SERVICES_STATUS *services;
-	int i;
-
-	ZERO_STRUCT(in);
-	ZERO_STRUCT(out);
-	
-	/* setup the request */
-	
-	memcpy( &in.handle, hSCM, sizeof(POLICY_HND) );
-	
-	in.type        = type;
-	in.state       = state;
-	in.resume      = &resume;
-	
-	/* first time is to get the buffer size */
-	in.buffer_size = 0;
-
-	CLI_DO_RPC_WERR( cli, mem_ctx, &ndr_table_svcctl.syntax_id, SVCCTL_ENUM_SERVICES_STATUS_W,
-	            in, out, 
-	            qbuf, rbuf,
-	            svcctl_io_q_enum_services_status,
-	            svcctl_io_r_enum_services_status, 
-	            WERR_GENERAL_FAILURE );
-
-	/* second time with correct buffer size...should be ok */
-	
-	if ( W_ERROR_EQUAL( out.status, WERR_MORE_DATA ) ) {
-		in.buffer_size = out.needed;
-
-		CLI_DO_RPC_WERR( cli, mem_ctx, &ndr_table_svcctl.syntax_id,
-				 SVCCTL_ENUM_SERVICES_STATUS_W,
-		            in, out, 
-		            qbuf, rbuf,
-		            svcctl_io_q_enum_services_status,
-		            svcctl_io_r_enum_services_status, 
-		            WERR_GENERAL_FAILURE );
-	}
-	
-	if ( !W_ERROR_IS_OK(out.status) ) 
-		return out.status;
-		
-	/* pull out the data */
-	if (out.returned) {
-		if ( !(services = TALLOC_ARRAY( mem_ctx, ENUM_SERVICES_STATUS, out.returned )) ) 
-			return WERR_NOMEM;
-	} else {
-		services = NULL;
-	}
-		
-	for ( i=0; i<out.returned; i++ ) {
-		svcctl_io_enum_services_status( "", &services[i], &out.buffer, 0 );
-	}
-	
-	*service_array = services;
-	*returned      = out.returned;
-	
-	return out.status;
-}
diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
deleted file mode 100644
index 022ece6..0000000
--- a/source3/rpc_parse/parse_svcctl.c
+++ /dev/null
@@ -1,155 +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
-
-/*******************************************************************
-********************************************************************/
-
-static bool svcctl_io_service_status( const char *desc, struct SERVICE_STATUS *status, prs_struct *ps, int depth )
-{
-
-	prs_debug(ps, depth, desc, "svcctl_io_service_status");
-	depth++;
-
-	if(!prs_uint32("type", ps, depth, &status->type))
-		return False;
-
-	if(!prs_uint32("state", ps, depth, &status->state))
-		return False;
-
-	if(!prs_uint32("controls_accepted", ps, depth, &status->controls_accepted))
-		return False;
-
-	if(!prs_werror("win32_exit_code", ps, depth, &status->win32_exit_code))
-		return False;
-
-	if(!prs_uint32("service_exit_code", ps, depth, &status->service_exit_code))
-		return False;
-
-	if(!prs_uint32("check_point", ps, depth, &status->check_point))
-		return False;
-
-	if(!prs_uint32("wait_hint", ps, depth, &status->wait_hint))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool svcctl_io_enum_services_status( const char *desc, ENUM_SERVICES_STATUS *enum_status, RPC_BUFFER *buffer, int depth )
-{
-	prs_struct *ps=&buffer->prs;
-	
-	prs_debug(ps, depth, desc, "svcctl_io_enum_services_status");
-	depth++;
-	
-	if ( !smb_io_relstr("servicename", buffer, depth, &enum_status->servicename) )
-		return False;
-	if ( !smb_io_relstr("displayname", buffer, depth, &enum_status->displayname) )
-		return False;
-
-	if ( !svcctl_io_service_status("svc_status", &enum_status->status, ps, depth) )
-		return False;
-	
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-uint32 svcctl_sizeof_enum_services_status( ENUM_SERVICES_STATUS *status )
-{
-	uint32 size = 0;
-	
-	size += size_of_relative_string( &status->servicename );
-	size += size_of_relative_string( &status->displayname );
-	size += sizeof(struct SERVICE_STATUS);
-
-	return size;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool svcctl_io_q_enum_services_status(const char *desc, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "svcctl_io_q_enum_services_status");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("scm_pol", &q_u->handle, ps, depth))
-		return False;
-
-	if(!prs_uint32("type", ps, depth, &q_u->type))
-		return False;
-	if(!prs_uint32("state", ps, depth, &q_u->state))
-		return False;
-	if(!prs_uint32("buffer_size", ps, depth, &q_u->buffer_size))
-		return False;
-
-	if(!prs_pointer("resume", ps, depth, (void*)&q_u->resume, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
-		return False;
-	
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool svcctl_io_r_enum_services_status(const char *desc, SVCCTL_R_ENUM_SERVICES_STATUS *r_u, prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "svcctl_io_r_enum_services_status");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if (!prs_rpcbuffer("", ps, depth, &r_u->buffer))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("needed", ps, depth, &r_u->needed))
-		return False;
-	if(!prs_uint32("returned", ps, depth, &r_u->returned))
-		return False;
-
-	if(!prs_pointer("resume", ps, depth, (void*)&r_u->resume, sizeof(uint32), (PRS_POINTER_CAST)prs_uint32))
-		return False;
-
-	if(!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
diff --git a/source3/rpc_server/srv_svcctl.c b/source3/rpc_server/srv_svcctl.c
deleted file mode 100644
index 275a2f6..0000000
--- a/source3/rpc_server/srv_svcctl.c
+++ /dev/null
@@ -1,227 +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;
-


-- 
Samba Shared Repository


More information about the samba-cvs mailing list