s3-spoolss: remove more leftovers from old enumports call.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index df482be15645bb4cb9db395f8a7836b3068503f1..5cd4e459ae96d22f6391883d002d18860e761e8a 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5838,16 +5838,12 @@ 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_port_info_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1 *info, int depth);
-bool smb_io_port_info_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2 *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);
 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_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);
 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);
@@ -5863,8 +5859,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_port_info_1(PORT_INFO_1 *info);
-uint32 spoolss_size_port_info_2(PORT_INFO_2 *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);

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 57ac7cfdd25d49fe829f2b057a7303f0111e16fe..fdce63aba3187fee7854bfc8a80aa4df568c6568 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -683,22 +683,6 @@ typedef struct spool_r_enumjobs
 }
 SPOOL_R_ENUMJOBS;
 
-typedef struct s_port_info_1
-{
-       UNISTR port_name;
-}
-PORT_INFO_1;
-
-typedef struct s_port_info_2
-{
-       UNISTR port_name;
-       UNISTR monitor_name;
-       UNISTR description;
-       uint32 port_type;
-       uint32 reserved;
-}
-PORT_INFO_2;
-
 typedef struct job_info_info
 {
        union

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index b111fb687a4e7c5fe6a7a9b7b1cc9b008274f820..337121d70dec21f20db2653a63fb118dafe8be51 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1089,52 +1089,6 @@ bool smb_io_job_info_2(const char *desc, RPC_BUFFER *buffer, JOB_INFO_2 *info, i
        return True;
 }
 
-/*******************************************************************
- Parse a PORT_INFO_1 structure.
-********************************************************************/  
-
-bool smb_io_port_1(const char *desc, RPC_BUFFER *buffer, PORT_INFO_1 *info, int depth)
-{
-       prs_struct *ps=&buffer->prs;
-
-       prs_debug(ps, depth, desc, "smb_io_port_1");
-       depth++;
-
-       buffer->struct_start=prs_offset(ps);
-
-       if(!smb_io_relstr("port_name", buffer, depth, &info->port_name))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Parse a PORT_INFO_2 structure.
-********************************************************************/  
-
-bool smb_io_port_2(const char *desc, RPC_BUFFER *buffer, PORT_INFO_2 *info, int depth)
-{
-       prs_struct *ps=&buffer->prs;
-
-       prs_debug(ps, depth, desc, "smb_io_port_2");
-       depth++;
-
-       buffer->struct_start=prs_offset(ps);
-
-       if(!smb_io_relstr("port_name", buffer, depth, &info->port_name))
-               return False;
-       if(!smb_io_relstr("monitor_name", buffer, depth, &info->monitor_name))
-               return False;
-       if(!smb_io_relstr("description", buffer, depth, &info->description))
-               return False;
-       if(!prs_uint32("port_type", ps, depth, &info->port_type))
-               return False;
-       if(!prs_uint32("reserved", ps, depth, &info->reserved))
-               return False;
-
-       return True;
-}
-
 /*******************************************************************
 return the size required by a struct in the stream
 ********************************************************************/  
@@ -1488,37 +1442,6 @@ uint32 spoolss_size_job_info_2(JOB_INFO_2 *info)
        return size;
 }
 
-/*******************************************************************
-return the size required by a struct in the stream
-********************************************************************/  
-
-uint32 spoolss_size_port_info_1(PORT_INFO_1 *info)
-{
-       int size=0;
-
-       size+=size_of_relative_string( &info->port_name );
-
-       return size;
-}
-
-/*******************************************************************
-return the size required by a struct in the stream
-********************************************************************/  
-
-uint32 spoolss_size_port_info_2(PORT_INFO_2 *info)
-{
-       int size=0;
-
-       size+=size_of_relative_string( &info->port_name );
-       size+=size_of_relative_string( &info->monitor_name );
-       size+=size_of_relative_string( &info->description );
-
-       size+=size_of_uint32( &info->port_type );
-       size+=size_of_uint32( &info->reserved );
-
-       return size;
-}
-
 /*******************************************************************
 return the size required by a struct in the stream
 ********************************************************************/