s3-spoolss: remove old spoolss_RouterRefreshPrinterChangeNotify.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 93b4ca8c7d114a4d567d53e78ad2f7019d6bb6eb..5c28b5947ee56175350a537dc923d243de0912d6 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5837,8 +5837,6 @@ bool spoolss_io_q_getprinterdata(const char *desc, SPOOL_Q_GETPRINTERDATA *q_u,
 bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u, prs_struct *ps, int depth);
 bool spoolss_io_q_rffpcnex(const char *desc, SPOOL_Q_RFFPCNEX *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_rffpcnex(const char *desc, SPOOL_R_RFFPCNEX *r_u, prs_struct *ps, int depth);
-bool spoolss_io_q_rfnpcnex(const char *desc, SPOOL_Q_RFNPCNEX *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_rfnpcnex(const char *desc, SPOOL_R_RFNPCNEX *r_u, prs_struct *ps, int depth);
 bool smb_io_printer_info_0(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_0 *info, int depth);
 bool smb_io_printer_info_1(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_1 *info, int depth);
 bool smb_io_printer_info_2(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_2 *info, int depth);
@@ -6206,7 +6204,6 @@ void spoolss_notify_cjobs(int snum,
                                 print_queue_struct *queue,
                                 NT_PRINTER_INFO_LEVEL *printer,
                                 TALLOC_CTX *mem_ctx);
-WERROR _spoolss_rfnpcnex( pipes_struct *p, SPOOL_Q_RFNPCNEX *q_u, SPOOL_R_RFNPCNEX *r_u);
 void construct_info_data(struct spoolss_Notify *info_data,
                         enum spoolss_NotifyType type,
                         enum spoolss_Field field,

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 670eca4ca4c37da82afd4ca2a23e6b2a9839c305..3c39adc5512f934b0bf2b1e3452c4ffc06cafe79 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -458,24 +458,6 @@ typedef struct spool_r_rffpcnex
 }
 SPOOL_R_RFFPCNEX;
 
-/* Remote Find Next Printer Change Notify Ex */
-typedef struct spool_q_rfnpcnex
-{
-       POLICY_HND handle;
-       uint32 change;
-       uint32 option_ptr;
-       SPOOL_NOTIFY_OPTION *option;
-}
-SPOOL_Q_RFNPCNEX;
-
-typedef struct spool_r_rfnpcnex
-{
-       uint32 info_ptr;
-       SPOOL_NOTIFY_INFO info;
-       WERROR status;
-}
-SPOOL_R_RFNPCNEX;
-
 typedef struct printer_info_0
 {
        UNISTR printername;

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 577ba73a42c516fbee922c76880acf874dfc974d..abf17eacfb83be5d7bda60b6449595ac4cf30433 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -1075,68 +1075,6 @@ bool spoolss_io_r_rffpcnex(const char *desc, SPOOL_R_RFFPCNEX *r_u, prs_struct *
        return True;
 }
 
-/*******************************************************************
- * read a structure.
- * called from spoolss_q_rfnpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_q_rfnpcnex(const char *desc, SPOOL_Q_RFNPCNEX *q_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_q_rfnpcnex");
-       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", ps, depth, &q_u->change))
-               return False;
-       
-       if(!prs_uint32("option_ptr", ps, depth, &q_u->option_ptr))
-               return False;
-       
-       if (q_u->option_ptr!=0) {
-       
-               if (UNMARSHALLING(ps))
-                       if((q_u->option=PRS_ALLOC_MEM(ps,SPOOL_NOTIFY_OPTION,1)) == NULL)
-                               return False;
-       
-               if(!smb_io_notify_option("notify option", q_u->option, ps, depth))
-                       return False;
-       }
-
-       return True;
-}
-
-/*******************************************************************
- * write a structure.
- * called from spoolss_r_rfnpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_r_rfnpcnex(const char *desc, SPOOL_R_RFNPCNEX *r_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_r_rfnpcnex");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-               
-       if (!prs_uint32("info_ptr", ps, depth, &r_u->info_ptr))
-               return False;
-
-       if(!smb_io_notify_info("notify info", &r_u->info ,ps,depth))
-               return False;
-       
-       if(!prs_align(ps))
-               return False;
-       if(!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
 /*******************************************************************
  * return the length of a uint16 (obvious, but the code is clean)
  ********************************************************************/