s3-spoolss: remove old spoolss_RemoteFindFirstPrinterChangeNotifyEx.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index cf54853a2e29791f2823e1c2167e97098d567068..525cb3c02670c205684750bb0116d6c6e0a73c63 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5524,11 +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_rffpcnex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                           POLICY_HND *pol, uint32 flags, uint32 options,
-                           const char *localmachine, uint32 printerlocal,
-                           SPOOL_NOTIFY_OPTION *option);
-
 /* The following definitions come from rpc_client/init_spoolss.c  */
 
 bool init_systemtime(struct spoolss_Time *r,
@@ -5829,8 +5824,6 @@ bool make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
                                   const char *valuename, uint32 size);
 bool spoolss_io_q_getprinterdata(const char *desc, SPOOL_Q_GETPRINTERDATA *q_u, prs_struct *ps, int depth);
 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 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);
@@ -5999,9 +5992,6 @@ bool make_spoolss_q_enumforms(SPOOL_Q_ENUMFORMS *q_u, POLICY_HND *handle,
 bool make_spoolss_q_getjob(SPOOL_Q_GETJOB *q_u, POLICY_HND *handle, 
                           uint32 jobid, uint32 level, RPC_BUFFER *buffer,
                           uint32 offered);
-bool make_spoolss_q_rffpcnex(SPOOL_Q_RFFPCNEX *q_u, POLICY_HND *handle,
-                            uint32 flags, uint32 options, const char *localmachine,
-                            uint32 printerlocal, SPOOL_NOTIFY_OPTION *option);
 
 /* The following definitions come from rpc_server/srv_eventlog_lib.c  */
 
@@ -6127,7 +6117,6 @@ bool convert_devicemode(const char *printername, const DEVICEMODE *devmode,
 WERROR set_printer_dataex( NT_PRINTER_INFO_LEVEL *printer, const char *key, const char *value,
                                   uint32 type, uint8 *data, int real_len  );
 WERROR _spoolss_getprinterdata(pipes_struct *p, SPOOL_Q_GETPRINTERDATA *q_u, SPOOL_R_GETPRINTERDATA *r_u);
-WERROR _spoolss_rffpcnex(pipes_struct *p, SPOOL_Q_RFFPCNEX *q_u, SPOOL_R_RFFPCNEX *r_u);
 void spoolss_notify_server_name(int snum,
                                       struct spoolss_Notify *data,
                                       print_queue_struct *queue,

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 26ecf2bfa5f15d0d7ad89d923de837b5f5d15e3c..2d1806aeca0827e1c023139b3ccece7d68201cc3 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -406,28 +406,6 @@ typedef struct spool_notify_option
 }
 SPOOL_NOTIFY_OPTION;
 
-
-/* If the struct name looks obscure, yes it is ! */
-/* RemoteFindFirstPrinterChangeNotificationEx query struct */
-typedef struct spoolss_q_rffpcnex
-{
-       POLICY_HND handle;
-       uint32 flags;
-       uint32 options;
-       uint32 localmachine_ptr;
-       UNISTR2 localmachine;
-       uint32 printerlocal;
-       uint32 option_ptr;
-       SPOOL_NOTIFY_OPTION *option;
-}
-SPOOL_Q_RFFPCNEX;
-
-typedef struct spool_r_rffpcnex
-{
-       WERROR status;
-}
-SPOOL_R_RFFPCNEX;
-
 typedef struct printer_info_0
 {
        UNISTR printername;

diff --git a/source3/rpc_client/cli_spoolss_notify.c b/source3/rpc_client/cli_spoolss_notify.c
index df01029a8724bf2b51a69e21d99a041dc75914b8..41abcd4d0af05a09e6c121dd61c09e3324a6261a 100644 (file)
--- a/source3/rpc_client/cli_spoolss_notify.c
+++ b/source3/rpc_client/cli_spoolss_notify.c
@@ -31,35 +31,3 @@
 
 /*********************************************************************
  *********************************************************************/
- 
-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,
-                           SPOOL_NOTIFY_OPTION *option)
-{
-       prs_struct qbuf, rbuf;
-       SPOOL_Q_RFFPCNEX q;
-       SPOOL_R_RFFPCNEX r;
-       WERROR result = W_ERROR(ERRgeneral);
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise input parameters */
-
-       make_spoolss_q_rffpcnex(
-               &q, pol, flags, options, localmachine, printerlocal,
-               option);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_RFFPCNEX,
-               q, r,
-               qbuf, rbuf,
-               spoolss_io_q_rffpcnex,
-               spoolss_io_r_rffpcnex,
-               WERR_GENERAL_FAILURE );
-
-       result = r.status;
-       return result;
-}

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 89676cbaff513dbd2e22a077d82992db0c41245d..435bb1bd80a382b650de5f9793f836b4a0872aac 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -70,136 +70,6 @@ bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime)
        return True;
 }
 
-/*******************************************************************
-reads or writes an NOTIFY OPTION TYPE structure.
-********************************************************************/  
-
-/* NOTIFY_OPTION_TYPE and NOTIFY_OPTION_TYPE_DATA are really one
-   structure.  The _TYPE structure is really the deferred referrants (i.e
-   the notify fields array) of the _TYPE structure. -tpot */
-
-static bool smb_io_notify_option_type(const char *desc, SPOOL_NOTIFY_OPTION_TYPE *type, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "smb_io_notify_option_type");
-       depth++;
- 
-       if (!prs_align(ps))
-               return False;
-
-       if(!prs_uint16("type", ps, depth, &type->type))
-               return False;
-       if(!prs_uint16("reserved0", ps, depth, &type->reserved0))
-               return False;
-       if(!prs_uint32("reserved1", ps, depth, &type->reserved1))
-               return False;
-       if(!prs_uint32("reserved2", ps, depth, &type->reserved2))
-               return False;
-       if(!prs_uint32("count", ps, depth, &type->count))
-               return False;
-       if(!prs_uint32("fields_ptr", ps, depth, &type->fields_ptr))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY OPTION TYPE DATA.
-********************************************************************/  
-
-static bool smb_io_notify_option_type_data(const char *desc, SPOOL_NOTIFY_OPTION_TYPE *type, prs_struct *ps, int depth)
-{
-       int i;
-
-       prs_debug(ps, depth, desc, "smb_io_notify_option_type_data");
-       depth++;
- 
-       /* if there are no fields just return */
-       if (type->fields_ptr==0)
-               return True;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!prs_uint32("count2", ps, depth, &type->count2))
-               return False;
-       
-       if (type->count2 != type->count)
-               DEBUG(4,("What a mess, count was %x now is %x !\n", type->count, type->count2));
-
-       if (type->count2 > MAX_NOTIFY_TYPE_FOR_NOW) {
-               return False;
-       }
-
-       /* parse the option type data */
-       for(i=0;i<type->count2;i++)
-               if(!prs_uint16("fields",ps,depth,&type->fields[i]))
-                       return False;
-       return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY OPTION structure.
-********************************************************************/  
-
-static bool smb_io_notify_option_type_ctr(const char *desc, SPOOL_NOTIFY_OPTION_TYPE_CTR *ctr , prs_struct *ps, int depth)
-{              
-       int i;
-       
-       prs_debug(ps, depth, desc, "smb_io_notify_option_type_ctr");
-       depth++;
- 
-       if(!prs_uint32("count", ps, depth, &ctr->count))
-               return False;
-
-       /* reading */
-       if (UNMARSHALLING(ps) && ctr->count)
-               if((ctr->type=PRS_ALLOC_MEM(ps,SPOOL_NOTIFY_OPTION_TYPE,ctr->count)) == NULL)
-                       return False;
-               
-       /* the option type struct */
-       for(i=0;i<ctr->count;i++)
-               if(!smb_io_notify_option_type("", &ctr->type[i] , ps, depth))
-                       return False;
-
-       /* the type associated with the option type struct */
-       for(i=0;i<ctr->count;i++)
-               if(!smb_io_notify_option_type_data("", &ctr->type[i] , ps, depth))
-                       return False;
-       
-       return True;
-}
-
-/*******************************************************************
-reads or writes an NOTIFY OPTION structure.
-********************************************************************/  
-
-static bool smb_io_notify_option(const char *desc, SPOOL_NOTIFY_OPTION *option, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "smb_io_notify_option");
-       depth++;
-       
-       if(!prs_uint32("version", ps, depth, &option->version))
-               return False;
-       if(!prs_uint32("flags", ps, depth, &option->flags))
-               return False;
-       if(!prs_uint32("count", ps, depth, &option->count))
-               return False;
-       if(!prs_uint32("option_type_ptr", ps, depth, &option->option_type_ptr))
-               return False;
-       
-       /* marshalling or unmarshalling, that would work */     
-       if (option->option_type_ptr!=0) {
-               if(!smb_io_notify_option_type_ctr("", &option->ctr ,ps, depth))
-                       return False;
-       }
-       else {
-               option->ctr.type=NULL;
-               option->ctr.count=0;
-       }
-       
-       return True;
-}
-
 /*******************************************************************
 ********************************************************************/  
 
@@ -762,68 +632,6 @@ bool spoolss_io_r_getprinterdata(const char *desc, SPOOL_R_GETPRINTERDATA *r_u,
        return True;
 }
 
-/*******************************************************************
- * read a structure.
- * called from spoolss_q_rffpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_q_rffpcnex(const char *desc, SPOOL_Q_RFFPCNEX *q_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_q_rffpcnex");
-       depth++;
-
-       if(!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("printer handle", &q_u->handle, ps, depth))
-               return False;
-       if(!prs_uint32("flags", ps, depth, &q_u->flags))
-               return False;
-       if(!prs_uint32("options", ps, depth, &q_u->options))
-               return False;
-       if(!prs_uint32("localmachine_ptr", ps, depth, &q_u->localmachine_ptr))
-               return False;
-       if(!smb_io_unistr2("localmachine", &q_u->localmachine, q_u->localmachine_ptr, ps, depth))
-               return False;
-
-       if(!prs_align(ps))
-               return False;
-               
-       if(!prs_uint32("printerlocal", ps, depth, &q_u->printerlocal))
-               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_rffpcnex (srv_spoolss.c)
- ********************************************************************/
-
-bool spoolss_io_r_rffpcnex(const char *desc, SPOOL_R_RFFPCNEX *r_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_r_rffpcnex");
-       depth++;
-
-       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)
  ********************************************************************/
@@ -4594,30 +4402,3 @@ bool make_spoolss_q_getjob(SPOOL_Q_GETJOB *q_u, POLICY_HND *handle,
 
        return True;
 }
-
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-
-bool make_spoolss_q_rffpcnex(SPOOL_Q_RFFPCNEX *q_u, POLICY_HND *handle,
-                            uint32 flags, uint32 options, const char *localmachine,
-                            uint32 printerlocal, SPOOL_NOTIFY_OPTION *option)
-{
-        memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
-
-       q_u->flags = flags;
-       q_u->options = options;
-
-       q_u->localmachine_ptr = 1;
-
-       init_unistr2(&q_u->localmachine, localmachine, UNI_STR_TERMINATE);
-
-       q_u->printerlocal = printerlocal;
-
-       if (option)
-               q_u->option_ptr = 1;
-
-       q_u->option = option;
-
-       return True;
-}