s3-spoolss: remove old spoolss_RouterReplyPrinterEx.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5c28b5947ee56175350a537dc923d243de0912d6..2aad1e54fdc0180f653eb36ee161b4f310fddcfb 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5524,10 +5524,6 @@ WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, TALLOC_CTX *me
 
 /* The following definitions come from rpc_client/cli_spoolss_notify.c  */
 
-WERROR rpccli_spoolss_rrpcn(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
-                        POLICY_HND *pol, uint32 notify_data_len,
-                        SPOOL_NOTIFY_INFO_DATA *notify_data,
-                        uint32 change_low, uint32 change_high);
 WERROR rpccli_spoolss_rffpcnex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                            POLICY_HND *pol, uint32 flags, uint32 options,
                            const char *localmachine, uint32 printerlocal,
@@ -5992,11 +5988,6 @@ void free_printer_info_5(PRINTER_INFO_5 *printer);
 void free_printer_info_6(PRINTER_INFO_6 *printer);
 void free_printer_info_7(PRINTER_INFO_7 *printer);
 void free_job_info_2(JOB_INFO_2 *job);
-bool make_spoolss_q_reply_rrpcn(SPOOL_Q_REPLY_RRPCN *q_u, POLICY_HND *hnd,
-                               uint32 change_low, uint32 change_high,
-                               SPOOL_NOTIFY_INFO *info);
-bool spoolss_io_q_reply_rrpcn(const char *desc, SPOOL_Q_REPLY_RRPCN *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_reply_rrpcn(const char *desc, SPOOL_R_REPLY_RRPCN *r_u, prs_struct *ps, int depth);
 bool make_spoolss_q_enumprinterkey(SPOOL_Q_ENUMPRINTERKEY *q_u, 
                                   POLICY_HND *hnd, const char *key, 
                                   uint32 size);

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 3c39adc5512f934b0bf2b1e3452c4ffc06cafe79..7f7555fd8597c6a1b0b35035001c2b097a5cdba5 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -1331,25 +1331,6 @@ typedef struct spool_r_getjob
 }
 SPOOL_R_GETJOB;
 
-typedef struct spool_q_rrpcn
-{
-       POLICY_HND handle;
-       uint32 change_low;
-       uint32 change_high;
-       uint32 unknown0;
-       uint32 unknown1;
-       uint32 info_ptr;
-       SPOOL_NOTIFY_INFO info; 
-}
-SPOOL_Q_REPLY_RRPCN;
-
-typedef struct spool_r_rrpcn
-{
-       uint32 unknown0;
-       WERROR status;
-}
-SPOOL_R_REPLY_RRPCN;
-
 typedef struct spool_q_enumprinterkey
 {
        POLICY_HND handle;

diff --git a/source3/rpc_client/cli_spoolss_notify.c b/source3/rpc_client/cli_spoolss_notify.c
index 8ae7835c4e6ea995336610313ce6b4dad26bab85..df01029a8724bf2b51a69e21d99a041dc75914b8 100644 (file)
--- a/source3/rpc_client/cli_spoolss_notify.c
+++ b/source3/rpc_client/cli_spoolss_notify.c
@@ -29,60 +29,6 @@
  * back channel.
  */
 
-/*********************************************************************
- This SPOOLSS_REPLY_RRPCN function is used to send a change 
- notification event when the registration **did** use 
- SPOOL_NOTIFY_OPTION_TYPE structure to specify the events to monitor
- Also see cli_spoolss_routereplyprinter()
- *********************************************************************/
-
-WERROR rpccli_spoolss_rrpcn(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
-                        POLICY_HND *pol, uint32 notify_data_len,
-                        SPOOL_NOTIFY_INFO_DATA *notify_data,
-                        uint32 change_low, uint32 change_high)
-{
-       prs_struct qbuf, rbuf;
-       SPOOL_Q_REPLY_RRPCN q;
-       SPOOL_R_REPLY_RRPCN r;
-       WERROR result = W_ERROR(ERRgeneral);
-       SPOOL_NOTIFY_INFO       notify_info;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       ZERO_STRUCT(notify_info);
-
-       /* Initialise input parameters */
-
-       notify_info.version = 0x2;
-       notify_info.flags   = 0x00020000;       /* ?? */
-       notify_info.count   = notify_data_len;
-       notify_info.data    = notify_data;
-
-       /* create and send a MSRPC command with api  */
-       /* store the parameters */
-
-       make_spoolss_q_reply_rrpcn(&q, pol, change_low, change_high, 
-                                  &notify_info);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_RRPCN,
-               q, r,
-               qbuf, rbuf,
-               spoolss_io_q_reply_rrpcn,
-               spoolss_io_r_reply_rrpcn,
-               WERR_GENERAL_FAILURE );
-
-       if (r.unknown0 == 0x00080000)
-               DEBUG(8,("cli_spoolss_reply_rrpcn: I think the spooler resonded that the notification was ignored.\n"));
-       else if ( r.unknown0 != 0x0 )
-               DEBUG(8,("cli_spoolss_reply_rrpcn: unknown0 is non-zero [0x%x]\n", r.unknown0));
-       
-       result = r.status;
-       return result;
-}
-
 /*********************************************************************
  *********************************************************************/
  

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index abf17eacfb83be5d7bda60b6449595ac4cf30433..828a2f22f9004571b54ebc449cc2a68551f79529 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -4623,104 +4623,6 @@ static bool copy_spool_notify_info(SPOOL_NOTIFY_INFO *dst, SPOOL_NOTIFY_INFO *sr
 }
 #endif /* JERRY */
 
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-
-bool make_spoolss_q_reply_rrpcn(SPOOL_Q_REPLY_RRPCN *q_u, POLICY_HND *hnd,
-                               uint32 change_low, uint32 change_high,
-                               SPOOL_NOTIFY_INFO *info)
-{      
-       if (q_u == NULL)
-               return False;
-
-       memcpy(&q_u->handle, hnd, sizeof(q_u->handle));
-
-       q_u->change_low=change_low;
-       q_u->change_high=change_high;
-
-       q_u->unknown0=0x0;
-       q_u->unknown1=0x0;
-
-       q_u->info_ptr=0x0FF0ADDE;
-
-       q_u->info.version=2;
-       
-       if (info->count) {
-               DEBUG(10,("make_spoolss_q_reply_rrpcn: [%d] PRINTER_NOTIFY_INFO_DATA\n",
-                       info->count));
-               q_u->info.version = info->version;
-               q_u->info.flags   = info->flags;
-               q_u->info.count   = info->count;
-               /* pointer field - be careful! */
-               q_u->info.data    = info->data;
-       }
-       else  {
-       q_u->info.flags=PRINTER_NOTIFY_INFO_DISCARDED;
-       q_u->info.count=0;
-       }
-
-       return True;
-}
-
-/*******************************************************************
- Parse a SPOOL_Q_REPLY_RRPCN structure.
-********************************************************************/  
-
-bool spoolss_io_q_reply_rrpcn(const char *desc, SPOOL_Q_REPLY_RRPCN *q_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_q_reply_rrpcn");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
-               return False;
-
-       if (!prs_uint32("change_low", ps, depth, &q_u->change_low))
-               return False;
-
-       if (!prs_uint32("change_high", ps, depth, &q_u->change_high))
-               return False;
-
-       if (!prs_uint32("unknown0", ps, depth, &q_u->unknown0))
-               return False;
-
-       if (!prs_uint32("unknown1", ps, depth, &q_u->unknown1))
-               return False;
-
-       if (!prs_uint32("info_ptr", ps, depth, &q_u->info_ptr))
-               return False;
-
-       if(q_u->info_ptr!=0)
-               if(!smb_io_notify_info(desc, &q_u->info, ps, depth))
-                       return False;
-               
-       return True;
-}
-
-/*******************************************************************
- Parse a SPOOL_R_REPLY_RRPCN structure.
-********************************************************************/  
-
-bool spoolss_io_r_reply_rrpcn(const char *desc, SPOOL_R_REPLY_RRPCN *r_u, prs_struct *ps, int depth)
-{              
-       prs_debug(ps, depth, desc, "spoolss_io_r_reply_rrpcn");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-
-       if (!prs_uint32("unknown0", ps, depth, &r_u->unknown0))
-               return False;
-
-       if (!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;            
-}
-
 /*******************************************************************
  * read a structure.
  ********************************************************************/