Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 0 insertions, 116 deletions

diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c
index c5d93864ba..7d31f4b2f0 100644
--- a/source3/rpc_parse/parse_svcctl.c
+++ b/source3/rpc_parse/parse_svcctl.c
@@ -58,51 +58,6 @@ static bool svcctl_io_service_status( const char *desc, SERVICE_STATUS *status,
 /*******************************************************************
 ********************************************************************/
 
-static bool svcctl_io_service_config( const char *desc, SERVICE_CONFIG *config, prs_struct *ps, int depth )
-{
-
-	prs_debug(ps, depth, desc, "svcctl_io_service_config");
-	depth++;
-
-	if(!prs_uint32("service_type", ps, depth, &config->service_type))
-		return False;
-	if(!prs_uint32("start_type", ps, depth, &config->start_type))
-		return False;
-	if(!prs_uint32("error_control", ps, depth, &config->error_control))
-		return False;
-
-	if (!prs_io_unistr2_p("", ps, depth, &config->executablepath))
-		return False;
-	if (!prs_io_unistr2_p("", ps, depth, &config->loadordergroup))
-		return False;
-
-	if(!prs_uint32("tag_id", ps, depth, &config->tag_id))
-		return False;
-
-	if (!prs_io_unistr2_p("", ps, depth, &config->dependencies))
-		return False;
-	if (!prs_io_unistr2_p("", ps, depth, &config->startname))
-		return False;
-	if (!prs_io_unistr2_p("", ps, depth, &config->displayname))
-		return False;
-
-	if (!prs_io_unistr2("", ps, depth, config->executablepath))
-		return False;
-	if (!prs_io_unistr2("", ps, depth, config->loadordergroup))
-		return False;
-	if (!prs_io_unistr2("", ps, depth, config->dependencies))
-		return False;
-	if (!prs_io_unistr2("", ps, depth, config->startname))
-		return False;
-	if (!prs_io_unistr2("", ps, depth, config->displayname))
-		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;
@@ -175,26 +130,6 @@ static uint32 sizeof_unistr2( UNISTR2 *string )
 	return size;
 }
 
-/********************************************************************
-********************************************************************/
-
-uint32 svcctl_sizeof_service_config( SERVICE_CONFIG *config )
-{
-	uint32 size = 0;
-
-	size = sizeof(uint32) * 4;	/* static uint32 fields */
-
-	/* now add the UNISTR2 + pointer sizes */
-
-	size += sizeof(uint32) * sizeof_unistr2(config->executablepath);
-	size += sizeof(uint32) * sizeof_unistr2(config->loadordergroup);
-	size += sizeof(uint32) * sizeof_unistr2(config->dependencies);
-	size += sizeof(uint32) * sizeof_unistr2(config->startname);
-	size += sizeof(uint32) * sizeof_unistr2(config->displayname);
-	
-	return size;
-}
-
 /*******************************************************************
 ********************************************************************/
 
@@ -262,57 +197,6 @@ bool svcctl_io_r_enum_services_status(const char *desc, SVCCTL_R_ENUM_SERVICES_S
 /*******************************************************************
 ********************************************************************/
 
-bool svcctl_io_q_query_service_config(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG *q_u, prs_struct *ps, int depth)
-{
-	if (q_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "svcctl_io_q_query_service_config");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!smb_io_pol_hnd("service_pol", &q_u->handle, ps, depth))
-		return False;
-
-	if(!prs_uint32("buffer_size", ps, depth, &q_u->buffer_size))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
-bool svcctl_io_r_query_service_config(const char *desc, SVCCTL_R_QUERY_SERVICE_CONFIG *r_u, prs_struct *ps, int depth)
-{
-	if (r_u == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "svcctl_io_r_query_service_config");
-	depth++;
-
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!svcctl_io_service_config("config", &r_u->config, ps, depth))
-		return False;
-
-	if(!prs_uint32("needed", ps, depth, &r_u->needed))
-		return False;
-
-	if(!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-
- 	return True;
-}
-
-/*******************************************************************
-********************************************************************/
-
 bool svcctl_io_q_query_service_config2(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, prs_struct *ps, int depth)
 {
 	if (q_u == NULL)