s3-spoolss: remove old _spoolss_EnumForms.

Guenther

4 files changed, 0 insertions, 164 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8395e2ad4d..ffdef43d19 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5818,7 +5818,6 @@ bool smb_io_printer_driver_info_3(const char *desc, RPC_BUFFER *buffer, DRIVER_I
 bool smb_io_printer_driver_info_6(const char *desc, RPC_BUFFER *buffer, DRIVER_INFO_6 *info, int depth);
 bool smb_io_job_info_1(const char *desc, RPC_BUFFER *buffer, JOB_INFO_1 *info, int depth);
 bool smb_io_job_info_2(const char *desc, RPC_BUFFER *buffer, JOB_INFO_2 *info, int depth);
-bool smb_io_form_1(const char *desc, RPC_BUFFER *buffer, FORM_1 *info, int depth);
 bool smb_io_port_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1 *info, int depth);
 bool smb_io_port_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2 *info, int depth);
 bool smb_io_printprocessor_info_1(const char *desc, RPC_BUFFER *buffer, PRINTPROCESSOR_1 *info, int depth);
@@ -5840,7 +5839,6 @@ 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_job_info_1(JOB_INFO_1 *info);
 uint32 spoolss_size_job_info_2(JOB_INFO_2 *info);
-uint32 spoolss_size_form_1(FORM_1 *info);
 uint32 spoolss_size_port_info_1(PORT_INFO_1 *info);
 uint32 spoolss_size_port_info_2(PORT_INFO_2 *info);
 uint32 spoolss_size_printprocessor_info_1(PRINTPROCESSOR_1 *info);
@@ -5880,8 +5878,6 @@ bool make_spoolss_q_enumprinterdrivers(SPOOL_Q_ENUMPRINTERDRIVERS *q_u,
                                 uint32 level,
                                 RPC_BUFFER *buffer, uint32 offered);
 bool spoolss_io_q_enumprinterdrivers(const char *desc, SPOOL_Q_ENUMPRINTERDRIVERS *q_u, prs_struct *ps, int depth);
-bool spoolss_io_q_enumforms(const char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_enumforms(const char *desc, SPOOL_R_ENUMFORMS *r_u, prs_struct *ps, int depth);
 bool spoolss_io_r_enumports(const char *desc, SPOOL_R_ENUMPORTS *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_enumports(const char *desc, SPOOL_Q_ENUMPORTS *q_u, prs_struct *ps, int depth);
 bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, uint16 *src);
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 2b4a036ce8..e101a27ca8 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -769,41 +769,6 @@ typedef struct spool_r_enumprinterdrivers
 }
 SPOOL_R_ENUMPRINTERDRIVERS;
 
-#define FORM_USER    0
-#define FORM_BUILTIN 1
-#define FORM_PRINTER 2
-
-typedef struct spool_form_1
-{
-	uint32 flag;
-	UNISTR name;
-	uint32 width;
-	uint32 length;
-	uint32 left;
-	uint32 top;
-	uint32 right;
-	uint32 bottom;
-}
-FORM_1;
-
-typedef struct spool_q_enumforms
-{
-	POLICY_HND handle;
-	uint32 level;
-	RPC_BUFFER *buffer;
-	uint32 offered;
-}
-SPOOL_Q_ENUMFORMS;
-
-typedef struct spool_r_enumforms
-{
-	RPC_BUFFER *buffer;
-	uint32 needed;
-	uint32 numofforms;
-	WERROR status;
-}
-SPOOL_R_ENUMFORMS;
-
 /********************************************/
 
 typedef struct spool_q_enumprintprocessors
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index e3236066a1..181ad0e7d2 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1136,40 +1136,6 @@ bool smb_io_job_info_2(const char *desc, RPC_BUFFER *buffer, JOB_INFO_2 *info, i
 }
 
 /*******************************************************************
-********************************************************************/  
-
-bool smb_io_form_1(const char *desc, RPC_BUFFER *buffer, FORM_1 *info, int depth)
-{
-	prs_struct *ps=&buffer->prs;
-	
-	prs_debug(ps, depth, desc, "smb_io_form_1");
-	depth++;
-		
-	buffer->struct_start=prs_offset(ps);
-	
-	if (!prs_uint32("flag", ps, depth, &info->flag))
-		return False;
-		
-	if (!smb_io_relstr("name", buffer, depth, &info->name))
-		return False;
-
-	if (!prs_uint32("width", ps, depth, &info->width))
-		return False;
-	if (!prs_uint32("length", ps, depth, &info->length))
-		return False;
-	if (!prs_uint32("left", ps, depth, &info->left))
-		return False;
-	if (!prs_uint32("top", ps, depth, &info->top))
-		return False;
-	if (!prs_uint32("right", ps, depth, &info->right))
-		return False;
-	if (!prs_uint32("bottom", ps, depth, &info->bottom))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
  Parse a PORT_INFO_1 structure.
 ********************************************************************/  
 
@@ -1646,26 +1612,6 @@ uint32 spoolss_size_job_info_2(JOB_INFO_2 *info)
 
 /*******************************************************************
 return the size required by a struct in the stream
-********************************************************************/
-
-uint32 spoolss_size_form_1(FORM_1 *info)
-{
-	int size=0;
-
-	size+=size_of_uint32( &info->flag );
-	size+=size_of_relative_string( &info->name );
-	size+=size_of_uint32( &info->width );
-	size+=size_of_uint32( &info->length );
-	size+=size_of_uint32( &info->left );
-	size+=size_of_uint32( &info->top );
-	size+=size_of_uint32( &info->right );
-	size+=size_of_uint32( &info->bottom );
-
-	return size;
-}
-
-/*******************************************************************
-return the size required by a struct in the stream
 ********************************************************************/  
 
 uint32 spoolss_size_port_info_1(PORT_INFO_1 *info)
@@ -2182,62 +2128,6 @@ bool spoolss_io_q_enumprinterdrivers(const char *desc, SPOOL_Q_ENUMPRINTERDRIVER
 }
 
 /*******************************************************************
-********************************************************************/  
-
-bool spoolss_io_q_enumforms(const char *desc, SPOOL_Q_ENUMFORMS *q_u, prs_struct *ps, int depth)
-{
-
-	prs_debug(ps, depth, desc, "spoolss_io_q_enumforms");
-	depth++;
-
-	if (!prs_align(ps))
-		return False;			
-	if (!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
-		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;
-
-	return True;
-}
-
-/*******************************************************************
-********************************************************************/  
-
-bool spoolss_io_r_enumforms(const char *desc, SPOOL_R_ENUMFORMS *r_u, prs_struct *ps, int depth)
-{
-	prs_debug(ps, depth, desc, "spoolss_io_r_enumforms");
-	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("size of buffer needed", ps, depth, &r_u->needed))
-		return False;
-		
-	if (!prs_uint32("numofforms", ps, depth, &r_u->numofforms))
-		return False;
-		
-	if (!prs_werror("status", ps, depth, &r_u->status))
-		return False;
-
-	return True;
-}
-
-/*******************************************************************
  Parse a SPOOL_R_ENUMPORTS structure.
 ********************************************************************/  
 
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index ec19279e0c..0c496b985f 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7244,21 +7244,6 @@ WERROR _spoolss_enumprinterdrivers( pipes_struct *p, SPOOL_Q_ENUMPRINTERDRIVERS
 /****************************************************************************
 ****************************************************************************/
 
-static void fill_form_1(FORM_1 *form, nt_forms_struct *list)
-{
-	form->flag=list->flag;
-	init_unistr(&form->name, list->name);
-	form->width=list->width;
-	form->length=list->length;
-	form->left=list->left;
-	form->top=list->top;
-	form->right=list->right;
-	form->bottom=list->bottom;
-}
-
-/****************************************************************************
-****************************************************************************/
-
 static WERROR fill_form_info_1(TALLOC_CTX *mem_ctx,
 			       struct spoolss_FormInfo1 *form,
 			       nt_forms_struct *list)