s3-spoolss: remove old spoolss_GetPrinterDriver2.

Guenther

4 files changed, 0 insertions, 624 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 72bc3a9a77..075af413b0 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5842,10 +5842,6 @@ bool smb_io_printer_info_5(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_5
 bool smb_io_printer_info_6(const char *desc, RPC_BUFFER *buffer,
 			   PRINTER_INFO_6 *info, int depth);
 bool smb_io_printer_info_7(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_7 *info, int depth);
-bool smb_io_printer_driver_info_1(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_1 *info, int depth) ;
-bool smb_io_printer_driver_info_2(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_2 *info, int depth) ;
-bool smb_io_printer_driver_info_3(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_3 *info, int depth);
-bool smb_io_printer_driver_info_6(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_6 *info, int depth);
 uint32 spoolss_size_printer_info_0(PRINTER_INFO_0 *info);
 uint32 spoolss_size_printer_info_1(PRINTER_INFO_1 *info);
 uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info);
@@ -5854,14 +5850,8 @@ uint32 spoolss_size_printer_info_5(PRINTER_INFO_5 *info);
 uint32 spoolss_size_printer_info_6(PRINTER_INFO_6 *info);
 uint32 spoolss_size_printer_info_3(PRINTER_INFO_3 *info);
 uint32 spoolss_size_printer_info_7(PRINTER_INFO_7 *info);
-uint32 spoolss_size_printer_driver_info_1(DRIVER_INFO_1 *info);
-uint32 spoolss_size_printer_driver_info_2(DRIVER_INFO_2 *info);
 uint32 spoolss_size_string_array(uint16 *string);
-uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3 *info);
-uint32 spoolss_size_printer_driver_info_6(DRIVER_INFO_6 *info);
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
-bool spoolss_io_q_getprinterdriver2(const char *desc, SPOOL_Q_GETPRINTERDRIVER2 *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_getprinterdriver2(const char *desc, SPOOL_R_GETPRINTERDRIVER2 *r_u, prs_struct *ps, int depth);
 bool make_spoolss_q_enumprinters(
 	SPOOL_Q_ENUMPRINTERS *q_u, 
 	uint32 flags, 
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 66f5303dfa..4556ff5795 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -492,93 +492,6 @@ typedef struct spool_r_getprinter
 	WERROR status;
 } SPOOL_R_GETPRINTER;
 
-typedef struct driver_info_1
-{
-	UNISTR name;
-} DRIVER_INFO_1;
-
-typedef struct driver_info_2
-{
-	uint32 version;
-	UNISTR name;
-	UNISTR architecture;
-	UNISTR driverpath;
-	UNISTR datafile;
-	UNISTR configfile;
-} DRIVER_INFO_2;
-
-typedef struct driver_info_3
-{
-	uint32 version;
-	UNISTR name;
-	UNISTR architecture;
-	UNISTR driverpath;
-	UNISTR datafile;
-	UNISTR configfile;
-	UNISTR helpfile;
-	uint16 *dependentfiles;
-	UNISTR monitorname;
-	UNISTR defaultdatatype;
-}
-DRIVER_INFO_3;
-
-typedef struct driver_info_6
-{
-	uint32 version;
-	UNISTR name;
-	UNISTR architecture;
-	UNISTR driverpath;
-	UNISTR datafile;
-	UNISTR configfile;
-	UNISTR helpfile;
-	uint16 *dependentfiles;
-	UNISTR monitorname;
-	UNISTR defaultdatatype;
-	uint16* previousdrivernames;
-	NTTIME driver_date;
-	uint32 padding;
-	uint32 driver_version_low;
-	uint32 driver_version_high;
-	UNISTR mfgname;
-	UNISTR oem_url;
-	UNISTR hardware_id;
-	UNISTR provider;
-}
-DRIVER_INFO_6;
-
-typedef struct driver_info_info
-{
-	DRIVER_INFO_1 *info1;
-	DRIVER_INFO_2 *info2;
-	DRIVER_INFO_3 *info3;
-	DRIVER_INFO_6 *info6;
-}
-PRINTER_DRIVER_CTR;
-
-typedef struct spool_q_getprinterdriver2
-{
-	POLICY_HND handle;
-	uint32 architecture_ptr;
-	UNISTR2 architecture;
-	uint32 level;
-	RPC_BUFFER *buffer;
-	uint32 offered;
-	uint32 clientmajorversion;
-	uint32 clientminorversion;
-}
-SPOOL_Q_GETPRINTERDRIVER2;
-
-typedef struct spool_r_getprinterdriver2
-{
-	RPC_BUFFER *buffer;
-	uint32 needed;
-	uint32 servermajorversion;
-	uint32 serverminorversion;
-	WERROR status;
-}
-SPOOL_R_GETPRINTERDRIVER2;
-
-
 typedef struct add_jobinfo_1
 {
 	UNISTR path;
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index b3fb6a6827..d77199d624 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.
  ********************************************************************/
 
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index fcb571ba9b..5b4a4b4b63 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5451,15 +5451,6 @@ static WERROR fill_printer_driver_info6(TALLOC_CTX *mem_ctx,
 }
 
 /********************************************************************
- * fill a DRIVER_INFO_1 struct
- ********************************************************************/
-
-static void fill_printer_driver_info_1(DRIVER_INFO_1 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername, fstring architecture)
-{
-	init_unistr( &info->name, driver.info_3->name);
-}
-
-/********************************************************************
  * construct_printer_driver_info_1
  ********************************************************************/
 
@@ -5496,53 +5487,6 @@ static WERROR construct_printer_driver_info_1(TALLOC_CTX *mem_ctx,
  * fill a printer_info_2 struct
  ********************************************************************/
 
-static void fill_printer_driver_info_2(DRIVER_INFO_2 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername)
-{
-	TALLOC_CTX *ctx = talloc_tos();
-	char *temp = NULL;
-	const char *cservername = canon_servername(servername);
-
-	info->version=driver.info_3->cversion;
-
-	init_unistr( &info->name, driver.info_3->name );
-	init_unistr( &info->architecture, driver.info_3->environment );
-
-	if (strlen(driver.info_3->driverpath)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->driverpath);
-		init_unistr( &info->driverpath, temp );
-	} else {
-		init_unistr( &info->driverpath, "" );
-	}
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->datafile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->datafile);
-		init_unistr( &info->datafile, temp );
-	} else
-		init_unistr( &info->datafile, "" );
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->configfile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->configfile);
-		init_unistr( &info->configfile, temp );
-	} else
-		init_unistr( &info->configfile, "" );
-}
-
-/********************************************************************
- * construct_printer_driver_info_2
- * fill a printer_info_2 struct
- ********************************************************************/
-
 static WERROR construct_printer_driver_info_2(TALLOC_CTX *mem_ctx,
 					      struct spoolss_DriverInfo2 *r,
 					      int snum,
@@ -5650,71 +5594,6 @@ static uint32 init_unistr_array(uint16 **uni_array, fstring *char_array, const c
  * fill a printer_info_3 struct
  ********************************************************************/
 
-static void fill_printer_driver_info_3(DRIVER_INFO_3 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername)
-{
-	char *temp = NULL;
-	TALLOC_CTX *ctx = talloc_tos();
-	const char *cservername = canon_servername(servername);
-
-	ZERO_STRUCTP(info);
-
-	info->version=driver.info_3->cversion;
-
-	init_unistr( &info->name, driver.info_3->name );
-	init_unistr( &info->architecture, driver.info_3->environment );
-
-	if (strlen(driver.info_3->driverpath)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->driverpath);
-		init_unistr( &info->driverpath, temp );
-	} else
-		init_unistr( &info->driverpath, "" );
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->datafile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->datafile);
-		init_unistr( &info->datafile, temp );
-	} else
-		init_unistr( &info->datafile, "" );
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->configfile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->configfile);
-		init_unistr( &info->configfile, temp );
-	} else
-		init_unistr( &info->configfile, "" );
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->helpfile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->helpfile);
-		init_unistr( &info->helpfile, temp );
-	} else
-		init_unistr( &info->helpfile, "" );
-
-	TALLOC_FREE(temp);
-	init_unistr( &info->monitorname, driver.info_3->monitorname );
-	init_unistr( &info->defaultdatatype, driver.info_3->defaultdatatype );
-
-	info->dependentfiles=NULL;
-	init_unistr_array(&info->dependentfiles, driver.info_3->dependentfiles, cservername);
-}
-
-/********************************************************************
- * construct_printer_info_3
- * fill a printer_info_3 struct
- ********************************************************************/
-
 static WERROR construct_printer_driver_info_3(TALLOC_CTX *mem_ctx,
 					      struct spoolss_DriverInfo3 *r,
 					      int snum,
@@ -5776,87 +5655,6 @@ static WERROR construct_printer_driver_info_3(TALLOC_CTX *mem_ctx,
 
 /********************************************************************
  * construct_printer_info_6
- * fill a printer_info_6 struct - we know that driver is really level 3. This sucks. JRA.
- ********************************************************************/
-
-static void fill_printer_driver_info_6(DRIVER_INFO_6 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername)
-{
-	char *temp = NULL;
-	fstring nullstr;
-	TALLOC_CTX *ctx = talloc_tos();
-	const char *cservername = canon_servername(servername);
-
-	ZERO_STRUCTP(info);
-	memset(&nullstr, '\0', sizeof(fstring));
-
-	info->version=driver.info_3->cversion;
-
-	init_unistr( &info->name, driver.info_3->name );
-	init_unistr( &info->architecture, driver.info_3->environment );
-
-	if (strlen(driver.info_3->driverpath)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->driverpath);
-		init_unistr( &info->driverpath, temp );
-	} else
-		init_unistr( &info->driverpath, "" );
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->datafile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->datafile);
-		init_unistr( &info->datafile, temp );
-	} else
-		init_unistr( &info->datafile, "" );
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->configfile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->configfile);
-		init_unistr( &info->configfile, temp );
-	} else
-		init_unistr( &info->configfile, "" );
-
-	TALLOC_FREE(temp);
-	if (strlen(driver.info_3->helpfile)) {
-		temp = talloc_asprintf(ctx,
-				"\\\\%s%s",
-				cservername,
-				driver.info_3->helpfile);
-		init_unistr( &info->helpfile, temp );
-	} else
-		init_unistr( &info->helpfile, "" );
-
-	TALLOC_FREE(temp);
-	init_unistr( &info->monitorname, driver.info_3->monitorname );
-	init_unistr( &info->defaultdatatype, driver.info_3->defaultdatatype );
-
-	info->dependentfiles = NULL;
-	init_unistr_array( &info->dependentfiles, driver.info_3->dependentfiles, servername );
-
-	info->previousdrivernames=NULL;
-	init_unistr_array(&info->previousdrivernames, &nullstr, servername);
-
-	info->driver_date=0;
-
-	info->padding=0;
-	info->driver_version_low=0;
-	info->driver_version_high=0;
-
-	init_unistr( &info->mfgname, "");
-	init_unistr( &info->oem_url, "");
-	init_unistr( &info->hardware_id, "");
-	init_unistr( &info->provider, "");
-}
-
-/********************************************************************
- * construct_printer_info_6
  * fill a printer_info_6 struct
  ********************************************************************/
 
@@ -5913,22 +5711,6 @@ static WERROR construct_printer_driver_info_6(TALLOC_CTX *mem_ctx,
 	return status;
 }
 
-/****************************************************************************
-****************************************************************************/
-
-static void free_printer_driver_info_3(DRIVER_INFO_3 *info)
-{
-	SAFE_FREE(info->dependentfiles);
-}
-
-/****************************************************************************
-****************************************************************************/
-
-static void free_printer_driver_info_6(DRIVER_INFO_6 *info)
-{
-	SAFE_FREE(info->dependentfiles);
-}
-
 /****************************************************************
  _spoolss_GetPrinterDriver2
 ****************************************************************/