s3-spoolss: remove old spoolss_GetPrinterDriver2.

Guenther
(cherry picked from commit 1b3e068e834fb5d99ca7ae9a1daa9fd401b886d5)
(cherry picked from commit d6750fc6f037971f3041e31bdfb02e4db475b63a)

1 files changed, 0 insertions, 309 deletions

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index b3fb6a68276..d77199d6248 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -817,156 +817,6 @@ bool smb_io_printer_info_7(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_7
 }
 
 /*******************************************************************
- Parse a DRIVER_INFO_1 structure.
-********************************************************************/
-
-bool smb_io_printer_driver_info_1(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_1 *info, int depth) 
-{
-	prs_struct *ps=&buffer->prs;
-
-	prs_debug(ps, depth, desc, "smb_io_printer_driver_info_1");
-	depth++;	
-	
-	buffer->struct_start=prs_offset(ps);
-
-	if (!smb_io_relstr("name", buffer, depth, &info->name))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Parse a DRIVER_INFO_2 structure.
-********************************************************************/
-
-bool smb_io_printer_driver_info_2(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_2 *info, int depth) 
-{
-	prs_struct *ps=&buffer->prs;
-
-	prs_debug(ps, depth, desc, "smb_io_printer_driver_info_2");
-	depth++;	
-	
-	buffer->struct_start=prs_offset(ps);
-
-	if (!prs_uint32("version", ps, depth, &info->version))
-		return False;
-	if (!smb_io_relstr("name", buffer, depth, &info->name))
-		return False;
-	if (!smb_io_relstr("architecture", buffer, depth, &info->architecture))
-		return False;
-	if (!smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
-		return False;
-	if (!smb_io_relstr("datafile", buffer, depth, &info->datafile))
-		return False;
-	if (!smb_io_relstr("configfile", buffer, depth, &info->configfile))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Parse a DRIVER_INFO_3 structure.
-********************************************************************/
-
-bool smb_io_printer_driver_info_3(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_3 *info, int depth)
-{
-	prs_struct *ps=&buffer->prs;
-
-	prs_debug(ps, depth, desc, "smb_io_printer_driver_info_3");
-	depth++;	
-	
-	buffer->struct_start=prs_offset(ps);
-
-	if (!prs_uint32("version", ps, depth, &info->version))
-		return False;
-	if (!smb_io_relstr("name", buffer, depth, &info->name))
-		return False;
-	if (!smb_io_relstr("architecture", buffer, depth, &info->architecture))
-		return False;
-	if (!smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
-		return False;
-	if (!smb_io_relstr("datafile", buffer, depth, &info->datafile))
-		return False;
-	if (!smb_io_relstr("configfile", buffer, depth, &info->configfile))
-		return False;
-	if (!smb_io_relstr("helpfile", buffer, depth, &info->helpfile))
-		return False;
-
-	if (!smb_io_relarraystr("dependentfiles", buffer, depth, &info->dependentfiles))
-		return False;
-
-	if (!smb_io_relstr("monitorname", buffer, depth, &info->monitorname))
-		return False;
-	if (!smb_io_relstr("defaultdatatype", buffer, depth, &info->defaultdatatype))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- Parse a DRIVER_INFO_6 structure.
-********************************************************************/
-
-bool smb_io_printer_driver_info_6(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_6 *info, int depth)
-{
-	prs_struct *ps=&buffer->prs;
-
-	prs_debug(ps, depth, desc, "smb_io_printer_driver_info_6");
-	depth++;	
-	
-	buffer->struct_start=prs_offset(ps);
-
-	if (!prs_uint32("version", ps, depth, &info->version))
-		return False;
-	if (!smb_io_relstr("name", buffer, depth, &info->name))
-		return False;
-	if (!smb_io_relstr("architecture", buffer, depth, &info->architecture))
-		return False;
-	if (!smb_io_relstr("driverpath", buffer, depth, &info->driverpath))
-		return False;
-	if (!smb_io_relstr("datafile", buffer, depth, &info->datafile))
-		return False;
-	if (!smb_io_relstr("configfile", buffer, depth, &info->configfile))
-		return False;
-	if (!smb_io_relstr("helpfile", buffer, depth, &info->helpfile))
-		return False;
-
-	if (!smb_io_relarraystr("dependentfiles", buffer, depth, &info->dependentfiles))
-		return False;
-
-	if (!smb_io_relstr("monitorname", buffer, depth, &info->monitorname))
-		return False;
-	if (!smb_io_relstr("defaultdatatype", buffer, depth, &info->defaultdatatype))
-		return False;
-
-	if (!smb_io_relarraystr("previousdrivernames", buffer, depth, &info->previousdrivernames))
-		return False;
-
-	if (!prs_uint64("date", ps, depth, &info->driver_date))
-		return False;
-
-	if (!prs_uint32("padding", ps, depth, &info->padding))
-		return False;
-
-	if (!prs_uint32("driver_version_low", ps, depth, &info->driver_version_low))
-		return False;
-
-	if (!prs_uint32("driver_version_high", ps, depth, &info->driver_version_high))
-		return False;
-
-	if (!smb_io_relstr("mfgname", buffer, depth, &info->mfgname))
-		return False;
-	if (!smb_io_relstr("oem_url", buffer, depth, &info->oem_url))
-		return False;
-	if (!smb_io_relstr("hardware_id", buffer, depth, &info->hardware_id))
-		return False;
-	if (!smb_io_relstr("provider", buffer, depth, &info->provider))
-		return False;
-	
-	return True;
-}
-
-/*******************************************************************
 return the size required by a struct in the stream
 ********************************************************************/  
 
@@ -1154,35 +1004,6 @@ uint32 spoolss_size_printer_info_7(PRINTER_INFO_7 *info)
 }
 
 /*******************************************************************
-return the size required by a struct in the stream
-********************************************************************/
-
-uint32 spoolss_size_printer_driver_info_1(DRIVER_INFO_1 *info)
-{
-	int size=0;
-	size+=size_of_relative_string( &info->name );
-
-	return size;
-}
-
-/*******************************************************************
-return the size required by a struct in the stream
-********************************************************************/
-
-uint32 spoolss_size_printer_driver_info_2(DRIVER_INFO_2 *info)
-{
-	int size=0;
-	size+=size_of_uint32( &info->version );	
-	size+=size_of_relative_string( &info->name );
-	size+=size_of_relative_string( &info->architecture );
-	size+=size_of_relative_string( &info->driverpath );
-	size+=size_of_relative_string( &info->datafile );
-	size+=size_of_relative_string( &info->configfile );
-
-	return size;
-}
-
-/*******************************************************************
 return the size required by a string array.
 ********************************************************************/
 
@@ -1202,64 +1023,6 @@ uint32 spoolss_size_string_array(uint16 *string)
 
 /*******************************************************************
 return the size required by a struct in the stream
-********************************************************************/
-
-uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3 *info)
-{
-	int size=0;
-
-	size+=size_of_uint32( &info->version );	
-	size+=size_of_relative_string( &info->name );
-	size+=size_of_relative_string( &info->architecture );
-	size+=size_of_relative_string( &info->driverpath );
-	size+=size_of_relative_string( &info->datafile );
-	size+=size_of_relative_string( &info->configfile );
-	size+=size_of_relative_string( &info->helpfile );
-	size+=size_of_relative_string( &info->monitorname );
-	size+=size_of_relative_string( &info->defaultdatatype );
-	
-	size+=spoolss_size_string_array(info->dependentfiles);
-
-	return size;
-}
-
-/*******************************************************************
-return the size required by a struct in the stream
-********************************************************************/
-
-uint32 spoolss_size_printer_driver_info_6(DRIVER_INFO_6 *info)
-{
-	uint32 size=0;
-
-	size+=size_of_uint32( &info->version );	
-	size+=size_of_relative_string( &info->name );
-	size+=size_of_relative_string( &info->architecture );
-	size+=size_of_relative_string( &info->driverpath );
-	size+=size_of_relative_string( &info->datafile );
-	size+=size_of_relative_string( &info->configfile );
-	size+=size_of_relative_string( &info->helpfile );
-
-	size+=spoolss_size_string_array(info->dependentfiles);
-
-	size+=size_of_relative_string( &info->monitorname );
-	size+=size_of_relative_string( &info->defaultdatatype );
-	
-	size+=spoolss_size_string_array(info->previousdrivernames);
-
-	size+=size_of_nttime(&info->driver_date);
-	size+=size_of_uint32( &info->padding );	
-	size+=size_of_uint32( &info->driver_version_low );	
-	size+=size_of_uint32( &info->driver_version_high );	
-	size+=size_of_relative_string( &info->mfgname );
-	size+=size_of_relative_string( &info->oem_url );
-	size+=size_of_relative_string( &info->hardware_id );
-	size+=size_of_relative_string( &info->provider );
-
-	return size;
-}
-
-/*******************************************************************
-return the size required by a struct in the stream
 ********************************************************************/  
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p)
 {
@@ -1278,78 +1041,6 @@ uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p)
 }
 
 /*******************************************************************
- * read a structure.
- * called from spoolss_getprinterdriver2 (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_q_getprinterdriver2(const char *desc, SPOOL_Q_GETPRINTERDRIVER2 *q_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_q_getprinterdriver2");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-	
-	if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
-		return False;
-	if(!prs_uint32("architecture_ptr", ps, depth, &q_u->architecture_ptr))
-		return False;
-	if(!smb_io_unistr2("architecture", &q_u->architecture, q_u->architecture_ptr, ps, depth))
-		return False;
-	
-	if(!prs_align(ps))
-		return False;
-	if(!prs_uint32("level", ps, depth, &q_u->level))
-		return False;
-		
-	if(!prs_rpcbuffer_p("", ps, depth, &q_u->buffer))
-		return False;
-
-	if(!prs_align(ps))
-		return False;
-
-	if(!prs_uint32("offered", ps, depth, &q_u->offered))
-		return False;
-		
-	if(!prs_uint32("clientmajorversion", ps, depth, &q_u->clientmajorversion))
-		return False;
-	if(!prs_uint32("clientminorversion", ps, depth, &q_u->clientminorversion))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
- * read a structure.
- * called from spoolss_getprinterdriver2 (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_r_getprinterdriver2(const char *desc, SPOOL_R_GETPRINTERDRIVER2 *r_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_r_getprinterdriver2");
-	depth++;
-
-	if (!prs_align(ps))
-		return False;
-		
-	if (!prs_rpcbuffer_p("", 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("servermajorversion", ps, depth, &r_u->servermajorversion))
-		return False;
-	if (!prs_uint32("serverminorversion", ps, depth, &r_u->serverminorversion))
-		return False;		
-	if (!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;		
-}
-
-/*******************************************************************
  * init a structure.
  ********************************************************************/