s3-spoolss: remove spoolss_EnumPrinterData.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 73290981768523a2b204fea34f7afe4426aa4618..e73237daff35ee76b7afc497698f140d56aa7c1f 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5841,8 +5841,6 @@ bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime);
 bool spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, DEVICEMODE *devmode);
 uint32 spoolss_size_printer_enum_values(PRINTER_ENUM_VALUES *p);
 bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, uint16 *src);
-bool spoolss_io_r_enumprinterdata(const char *desc, SPOOL_R_ENUMPRINTERDATA *r_u, prs_struct *ps, int depth);
-bool spoolss_io_q_enumprinterdata(const char *desc, SPOOL_Q_ENUMPRINTERDATA *q_u, prs_struct *ps, int depth);
 bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
                                      const POLICY_HND *hnd, const char *key,
                                      uint32 size);

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 26fb032aca4770a79c027f3cd6d9a7b07c70732b..7c14e73a41cb27204a74572b71d01f5f0e6ced1b 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -295,28 +295,6 @@ SYSTEMTIME;
 
 /********************************************/
 
-typedef struct spool_q_enumprinterdata
-{
-       POLICY_HND handle;
-       uint32 index;
-       uint32 valuesize;
-       uint32 datasize;
-}
-SPOOL_Q_ENUMPRINTERDATA;
-
-typedef struct spool_r_enumprinterdata
-{
-       uint32 valuesize;
-       uint16 *value;
-       uint32 realvaluesize;
-       uint32 type;
-       uint32 datasize;
-       uint8 *data;
-       uint32 realdatasize;
-       WERROR status;
-}
-SPOOL_R_ENUMPRINTERDATA;
-
 typedef struct spool_q_enumprinterkey
 {
        POLICY_HND handle;

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index b7a3768d4f3aa847727f608d14ff1a94d185d244..91cb40e55c976068cdc1176b8c2c0d78a9884522 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -313,85 +313,6 @@ bool make_spoolss_buffer5(TALLOC_CTX *mem_ctx, BUFFER5 *buf5, uint32 len, uint16
 /*******************************************************************
 ********************************************************************/  
 
-bool spoolss_io_r_enumprinterdata(const char *desc, SPOOL_R_ENUMPRINTERDATA *r_u, prs_struct *ps, int depth)
-{      
-       prs_debug(ps, depth, desc, "spoolss_io_r_enumprinterdata");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-       if(!prs_uint32("valuesize", ps, depth, &r_u->valuesize))
-               return False;
-
-       if (UNMARSHALLING(ps) && r_u->valuesize) {
-               r_u->value = PRS_ALLOC_MEM(ps, uint16, r_u->valuesize);
-               if (!r_u->value) {
-                       DEBUG(0, ("spoolss_io_r_enumprinterdata: out of memory for printerdata value\n"));
-                       return False;
-               }
-       }
-
-       if(!prs_uint16uni(False, "value", ps, depth, r_u->value, r_u->valuesize ))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("realvaluesize", ps, depth, &r_u->realvaluesize))
-               return False;
-
-       if(!prs_uint32("type", ps, depth, &r_u->type))
-               return False;
-
-       if(!prs_uint32("datasize", ps, depth, &r_u->datasize))
-               return False;
-
-       if (UNMARSHALLING(ps) && r_u->datasize) {
-               r_u->data = PRS_ALLOC_MEM(ps, uint8, r_u->datasize);
-               if (!r_u->data) {
-                       DEBUG(0, ("spoolss_io_r_enumprinterdata: out of memory for printerdata data\n"));
-                       return False;
-               }
-       }
-
-       if(!prs_uint8s(False, "data", ps, depth, r_u->data, r_u->datasize))
-               return False;
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("realdatasize", ps, depth, &r_u->realdatasize))
-               return False;
-       if(!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/  
-
-bool spoolss_io_q_enumprinterdata(const char *desc, SPOOL_Q_ENUMPRINTERDATA *q_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_q_enumprinterdata");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-       if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
-               return False;
-       if(!prs_uint32("index", ps, depth, &q_u->index))
-               return False;
-       if(!prs_uint32("valuesize", ps, depth, &q_u->valuesize))
-               return False;
-       if(!prs_uint32("datasize", ps, depth, &q_u->datasize))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-********************************************************************/  
-
 bool make_spoolss_q_enumprinterdataex(SPOOL_Q_ENUMPRINTERDATAEX *q_u,
                                      const POLICY_HND *hnd, const char *key,
                                      uint32 size)