s3-spoolss: remove old rpccli_spoolss_routerreplyprinter.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 530361fcbfe57b37cf6591f66f7eaabd17d5fae6..537eb98ffc52acf76b6c582f25da3fc52e351176 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5507,8 +5507,6 @@ WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, TALLOC_CTX *me
 WERROR rpccli_spoolss_reply_open_printer(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
                                      const char *printer, uint32 printerlocal, uint32 type, 
                                      POLICY_HND *handle);
-WERROR rpccli_spoolss_routerreplyprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                     POLICY_HND *pol, uint32 condition, uint32 change_id);
 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,
@@ -6019,10 +6017,6 @@ bool make_spoolss_q_replyopenprinter(SPOOL_Q_REPLYOPENPRINTER *q_u,
                               const fstring string, uint32 printer, uint32 type);
 bool spoolss_io_q_replyopenprinter(const char *desc, SPOOL_Q_REPLYOPENPRINTER *q_u, prs_struct *ps, int depth);
 bool spoolss_io_r_replyopenprinter(const char *desc, SPOOL_R_REPLYOPENPRINTER *r_u, prs_struct *ps, int depth);
-bool make_spoolss_q_routerreplyprinter(SPOOL_Q_ROUTERREPLYPRINTER *q_u, POLICY_HND *hnd, 
-                                       uint32 condition, uint32 change_id);
-bool spoolss_io_q_routerreplyprinter (const char *desc, SPOOL_Q_ROUTERREPLYPRINTER *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_routerreplyprinter (const char *desc, SPOOL_R_ROUTERREPLYPRINTER *r_u, prs_struct *ps, int depth);
 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);

diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 9fa60db1e18f3e29d6b5fdc9ffdb6976c84a30da..15814d43481609eb26c658a69d7f98421940fedd 100644 (file)
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -1602,22 +1602,6 @@ typedef struct spool_r_replyopenprinter
 }
 SPOOL_R_REPLYOPENPRINTER;
 
-typedef struct spool_q_routerreplyprinter
-{
-       POLICY_HND handle;
-       uint32 condition;
-       uint32 unknown1;        /* 0x00000001 */
-       uint32 change_id;
-       uint8  unknown2[5];     /* 0x0000000001 */
-}
-SPOOL_Q_ROUTERREPLYPRINTER;
-
-typedef struct spool_r_routerreplyprinter
-{
-       WERROR status;
-}
-SPOOL_R_ROUTERREPLYPRINTER;
-
 typedef struct spool_q_rrpcn
 {
        POLICY_HND handle;

diff --git a/source3/rpc_client/cli_spoolss_notify.c b/source3/rpc_client/cli_spoolss_notify.c
index 8e528eedd4a26aa60b9c44bf8f0d8e9176fec7c6..11152752e91e483b89583c97785d1441a64bfd42 100644 (file)
--- a/source3/rpc_client/cli_spoolss_notify.c
+++ b/source3/rpc_client/cli_spoolss_notify.c
@@ -65,40 +65,6 @@ WERROR rpccli_spoolss_reply_open_printer(struct rpc_pipe_client *cli, TALLOC_CTX
        return result;
 }
 
-/*********************************************************************
- This SPOOLSS_ROUTERREPLYPRINTER function is used to send a change 
- notification event when the registration **did not** use 
- SPOOL_NOTIFY_OPTION_TYPE structure to specify the events to monitor.
- Also see cli_spolss_reply_rrpcn()
- *********************************************************************/
- 
-WERROR rpccli_spoolss_routerreplyprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                     POLICY_HND *pol, uint32 condition, uint32 change_id)
-{
-       prs_struct qbuf, rbuf;
-       SPOOL_Q_ROUTERREPLYPRINTER q;
-        SPOOL_R_ROUTERREPLYPRINTER r;
-       WERROR result = W_ERROR(ERRgeneral);
-
-       /* Initialise input parameters */
-
-       make_spoolss_q_routerreplyprinter(&q, pol, condition, change_id);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ROUTERREPLYPRINTER,
-               q, r,
-               qbuf, rbuf,
-               spoolss_io_q_routerreplyprinter,
-               spoolss_io_r_routerreplyprinter,
-               WERR_GENERAL_FAILURE );
-
-       /* Return output parameters */
-
-       result = r.status;
-       return result;  
-}
-
 /*********************************************************************
  This SPOOLSS_REPLY_RRPCN function is used to send a change 
  notification event when the registration **did** use 

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 5558e2fb71e78097a779ec9d83bf15bb5ec554e6..d0afb990817eeb130b57990ab123610c4ba094c2 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -5576,73 +5576,6 @@ bool spoolss_io_r_replyopenprinter(const char *desc, SPOOL_R_REPLYOPENPRINTER *r
        return True;            
 }
 
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-bool make_spoolss_q_routerreplyprinter(SPOOL_Q_ROUTERREPLYPRINTER *q_u, POLICY_HND *hnd, 
-                                       uint32 condition, uint32 change_id)
-{
-
-       memcpy(&q_u->handle, hnd, sizeof(q_u->handle));
-
-       q_u->condition = condition;
-       q_u->change_id = change_id;
-
-       /* magic values */
-       q_u->unknown1 = 0x1;
-       memset(q_u->unknown2, 0x0, 5);
-       q_u->unknown2[0] = 0x1;
-
-       return True;
-}
-
-/*******************************************************************
- Parse a SPOOL_Q_ROUTERREPLYPRINTER structure.
-********************************************************************/
-bool spoolss_io_q_routerreplyprinter (const char *desc, SPOOL_Q_ROUTERREPLYPRINTER *q_u, prs_struct *ps, int depth)
-{
-
-       prs_debug(ps, depth, desc, "spoolss_io_q_routerreplyprinter");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-
-       if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
-               return False;
-
-       if (!prs_uint32("condition", ps, depth, &q_u->condition))
-               return False;
-
-       if (!prs_uint32("unknown1", ps, depth, &q_u->unknown1))
-               return False;
-
-       if (!prs_uint32("change_id", ps, depth, &q_u->change_id))
-               return False;
-
-       if (!prs_uint8s(False, "dev_private",  ps, depth, q_u->unknown2, 5))
-               return False;
-
-       return True;
-}
-
-/*******************************************************************
- Parse a SPOOL_R_ROUTERREPLYPRINTER structure.
-********************************************************************/
-bool spoolss_io_r_routerreplyprinter (const char *desc, SPOOL_R_ROUTERREPLYPRINTER *r_u, prs_struct *ps, int depth)
-{
-       prs_debug(ps, depth, desc, "spoolss_io_r_routerreplyprinter");
-       depth++;
-
-       if (!prs_align(ps))
-               return False;
-
-       if (!prs_werror("status", ps, depth, &r_u->status))
-               return False;
-
-       return True;
-}
-
 #if 0  /* JERRY - not currently used but could be :-) */
 
 /*******************************************************************