From fd8e8d5e58a2df09be591852c475e18a11c51ae1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 9 Feb 2009 15:16:25 +0100 Subject: s3-spoolss: remove old spoolss_ReplyOpenPrinter. Guenther --- source3/include/proto.h | 7 ---- source3/include/rpc_spoolss.h | 17 -------- source3/rpc_client/cli_spoolss_notify.c | 36 ---------------- source3/rpc_parse/parse_spoolss.c | 73 --------------------------------- 4 files changed, 133 deletions(-) (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index fd6ccce3e0..8f05c9473d 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5510,9 +5510,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_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_rrpcn(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *pol, uint32 notify_data_len, SPOOL_NOTIFY_INFO_DATA *notify_data, @@ -6001,10 +5998,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_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_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 05b485866a..56d4c4476d 100644 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -1466,23 +1466,6 @@ typedef struct spool_r_getjob } SPOOL_R_GETJOB; -typedef struct spool_q_replyopenprinter -{ - UNISTR2 string; - uint32 printer; - uint32 type; - uint32 unknown0; - uint32 unknown1; -} -SPOOL_Q_REPLYOPENPRINTER; - -typedef struct spool_r_replyopenprinter -{ - POLICY_HND handle; - WERROR status; -} -SPOOL_R_REPLYOPENPRINTER; - 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 11152752e9..8ae7835c4e 100644 --- a/source3/rpc_client/cli_spoolss_notify.c +++ b/source3/rpc_client/cli_spoolss_notify.c @@ -29,42 +29,6 @@ * back channel. */ -/* Send a ReplyOpenPrinter request. This rpc is made by the printer - server to the printer client in response to a rffpcnex request. - The rrfpcnex request names a printer and a handle (the printerlocal - value) and this rpc establishes a back-channel over which printer - notifications are performed. */ - -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) -{ - prs_struct qbuf, rbuf; - SPOOL_Q_REPLYOPENPRINTER q; - SPOOL_R_REPLYOPENPRINTER r; - WERROR result = W_ERROR(ERRgeneral); - - /* Initialise input parameters */ - - make_spoolss_q_replyopenprinter(&q, printer, printerlocal, type); - - /* Marshall data and send request */ - - CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_REPLYOPENPRINTER, - q, r, - qbuf, rbuf, - spoolss_io_q_replyopenprinter, - spoolss_io_r_replyopenprinter, - WERR_GENERAL_FAILURE ); - - /* Return result */ - - memcpy(handle, &r.handle, sizeof(r.handle)); - 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 af2378b7c9..f11672a575 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -5022,79 +5022,6 @@ void free_job_info_2(JOB_INFO_2 *job) free_devmode(job->devmode); } -/******************************************************************* - * init a structure. - ********************************************************************/ - -bool make_spoolss_q_replyopenprinter(SPOOL_Q_REPLYOPENPRINTER *q_u, - const fstring string, uint32 printer, uint32 type) -{ - if (q_u == NULL) - return False; - - init_unistr2(&q_u->string, string, UNI_STR_TERMINATE); - - q_u->printer=printer; - q_u->type=type; - - q_u->unknown0=0x0; - q_u->unknown1=0x0; - - return True; -} - -/******************************************************************* - Parse a SPOOL_Q_REPLYOPENPRINTER structure. -********************************************************************/ - -bool spoolss_io_q_replyopenprinter(const char *desc, SPOOL_Q_REPLYOPENPRINTER *q_u, prs_struct *ps, int depth) -{ - prs_debug(ps, depth, desc, "spoolss_io_q_replyopenprinter"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!smb_io_unistr2("", &q_u->string, True, ps, depth)) - return False; - - if(!prs_align(ps)) - return False; - - if(!prs_uint32("printer", ps, depth, &q_u->printer)) - return False; - if(!prs_uint32("type", ps, depth, &q_u->type)) - return False; - - if(!prs_uint32("unknown0", ps, depth, &q_u->unknown0)) - return False; - if(!prs_uint32("unknown1", ps, depth, &q_u->unknown1)) - return False; - - return True; -} - -/******************************************************************* - Parse a SPOOL_R_REPLYOPENPRINTER structure. -********************************************************************/ - -bool spoolss_io_r_replyopenprinter(const char *desc, SPOOL_R_REPLYOPENPRINTER *r_u, prs_struct *ps, int depth) -{ - prs_debug(ps, depth, desc, "spoolss_io_r_replyopenprinter"); - depth++; - - if (!prs_align(ps)) - return False; - - if(!smb_io_pol_hnd("printer handle",&r_u->handle,ps,depth)) - return False; - - if (!prs_werror("status", ps, depth, &r_u->status)) - return False; - - return True; -} - #if 0 /* JERRY - not currently used but could be :-) */ /******************************************************************* -- cgit