mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
s3-spoolss: remove old _spoolss_EndDocPrinter.
Guenther
This commit is contained in:
parent
714ac784e1
commit
100aad0ddf
@ -5493,8 +5493,6 @@ WERROR rpccli_spoolss_startdocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *m
|
||||
POLICY_HND *hnd, char *docname,
|
||||
char *outputfile, char *datatype,
|
||||
uint32 *jobid);
|
||||
WERROR rpccli_spoolss_enddocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
||||
POLICY_HND *hnd);
|
||||
WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
||||
POLICY_HND *hnd, const char *valuename,
|
||||
REGISTRY_VALUE *value);
|
||||
@ -5881,8 +5879,6 @@ bool spoolss_io_q_deleteprinterdriverex(const char *desc, SPOOL_Q_DELETEPRINTERD
|
||||
bool spoolss_io_r_deleteprinterdriverex(const char *desc, SPOOL_R_DELETEPRINTERDRIVEREX *r_u, prs_struct *ps, int depth);
|
||||
bool spoolss_io_q_startdocprinter(const char *desc, SPOOL_Q_STARTDOCPRINTER *q_u, prs_struct *ps, int depth);
|
||||
bool spoolss_io_r_startdocprinter(const char *desc, SPOOL_R_STARTDOCPRINTER *r_u, prs_struct *ps, int depth);
|
||||
bool spoolss_io_q_enddocprinter(const char *desc, SPOOL_Q_ENDDOCPRINTER *q_u, prs_struct *ps, int depth);
|
||||
bool spoolss_io_r_enddocprinter(const char *desc, SPOOL_R_ENDDOCPRINTER *r_u, prs_struct *ps, int depth);
|
||||
bool spoolss_io_q_writeprinter(const char *desc, SPOOL_Q_WRITEPRINTER *q_u, prs_struct *ps, int depth);
|
||||
bool spoolss_io_r_writeprinter(const char *desc, SPOOL_R_WRITEPRINTER *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);
|
||||
@ -6137,8 +6133,6 @@ bool make_spoolss_q_startdocprinter(SPOOL_Q_STARTDOCPRINTER *q_u,
|
||||
POLICY_HND *handle, uint32 level,
|
||||
char *docname, char *outputfile,
|
||||
char *datatype);
|
||||
bool make_spoolss_q_enddocprinter(SPOOL_Q_ENDDOCPRINTER *q_u,
|
||||
POLICY_HND *handle);
|
||||
bool make_spoolss_q_writeprinter(SPOOL_Q_WRITEPRINTER *q_u,
|
||||
POLICY_HND *handle, uint32 data_size,
|
||||
char *data);
|
||||
@ -6356,7 +6350,6 @@ WERROR _spoolss_enumprinters( pipes_struct *p, SPOOL_Q_ENUMPRINTERS *q_u, SPOOL_
|
||||
WERROR _spoolss_getprinter(pipes_struct *p, SPOOL_Q_GETPRINTER *q_u, SPOOL_R_GETPRINTER *r_u);
|
||||
WERROR _spoolss_getprinterdriver2(pipes_struct *p, SPOOL_Q_GETPRINTERDRIVER2 *q_u, SPOOL_R_GETPRINTERDRIVER2 *r_u);
|
||||
WERROR _spoolss_startdocprinter(pipes_struct *p, SPOOL_Q_STARTDOCPRINTER *q_u, SPOOL_R_STARTDOCPRINTER *r_u);
|
||||
WERROR _spoolss_enddocprinter(pipes_struct *p, SPOOL_Q_ENDDOCPRINTER *q_u, SPOOL_R_ENDDOCPRINTER *r_u);
|
||||
WERROR _spoolss_writeprinter(pipes_struct *p, SPOOL_Q_WRITEPRINTER *q_u, SPOOL_R_WRITEPRINTER *r_u);
|
||||
WERROR add_port_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, const char *portname, const char *uri );
|
||||
bool add_printer_hook(TALLOC_CTX *ctx, NT_USER_TOKEN *token, NT_PRINTER_INFO_LEVEL *printer);
|
||||
|
@ -617,18 +617,6 @@ typedef struct spool_r_startdocprinter
|
||||
}
|
||||
SPOOL_R_STARTDOCPRINTER;
|
||||
|
||||
typedef struct spool_q_enddocprinter
|
||||
{
|
||||
POLICY_HND handle;
|
||||
}
|
||||
SPOOL_Q_ENDDOCPRINTER;
|
||||
|
||||
typedef struct spool_r_enddocprinter
|
||||
{
|
||||
WERROR status;
|
||||
}
|
||||
SPOOL_R_ENDDOCPRINTER;
|
||||
|
||||
typedef struct spool_q_writeprinter
|
||||
{
|
||||
POLICY_HND handle;
|
||||
|
@ -1540,31 +1540,6 @@ WERROR rpccli_spoolss_startdocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *m
|
||||
/**********************************************************************
|
||||
**********************************************************************/
|
||||
|
||||
WERROR rpccli_spoolss_enddocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
||||
POLICY_HND *hnd)
|
||||
{
|
||||
prs_struct qbuf, rbuf;
|
||||
SPOOL_Q_ENDDOCPRINTER in;
|
||||
SPOOL_R_ENDDOCPRINTER out;
|
||||
|
||||
ZERO_STRUCT(in);
|
||||
ZERO_STRUCT(out);
|
||||
|
||||
make_spoolss_q_enddocprinter( &in, hnd );
|
||||
|
||||
CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_ENDDOCPRINTER,
|
||||
in, out,
|
||||
qbuf, rbuf,
|
||||
spoolss_io_q_enddocprinter,
|
||||
spoolss_io_r_enddocprinter,
|
||||
WERR_GENERAL_FAILURE );
|
||||
|
||||
return out.status;
|
||||
}
|
||||
|
||||
/**********************************************************************
|
||||
**********************************************************************/
|
||||
|
||||
WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
|
||||
POLICY_HND *hnd, const char *valuename,
|
||||
REGISTRY_VALUE *value)
|
||||
|
@ -1625,42 +1625,6 @@ bool spoolss_io_r_startdocprinter(const char *desc, SPOOL_R_STARTDOCPRINTER *r_u
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
* read a structure.
|
||||
* called from spoolss_q_enddocprinter (srv_spoolss.c)
|
||||
********************************************************************/
|
||||
|
||||
bool spoolss_io_q_enddocprinter(const char *desc, SPOOL_Q_ENDDOCPRINTER *q_u, prs_struct *ps, int depth)
|
||||
{
|
||||
if (q_u == NULL) return False;
|
||||
|
||||
prs_debug(ps, depth, desc, "spoolss_io_q_enddocprinter");
|
||||
depth++;
|
||||
|
||||
if(!prs_align(ps))
|
||||
return False;
|
||||
|
||||
if(!smb_io_pol_hnd("printer handle",&q_u->handle,ps,depth))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
* write a structure.
|
||||
* called from spoolss_r_enddocprinter (srv_spoolss.c)
|
||||
********************************************************************/
|
||||
|
||||
bool spoolss_io_r_enddocprinter(const char *desc, SPOOL_R_ENDDOCPRINTER *r_u, prs_struct *ps, int depth)
|
||||
{
|
||||
prs_debug(ps, depth, desc, "spoolss_io_r_enddocprinter");
|
||||
depth++;
|
||||
if(!prs_werror("status", ps, depth, &r_u->status))
|
||||
return False;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
* read a structure.
|
||||
* called from spoolss_q_writeprinter (srv_spoolss.c)
|
||||
@ -7236,18 +7200,6 @@ bool make_spoolss_q_startdocprinter(SPOOL_Q_STARTDOCPRINTER *q_u,
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
* init a structure.
|
||||
********************************************************************/
|
||||
|
||||
bool make_spoolss_q_enddocprinter(SPOOL_Q_ENDDOCPRINTER *q_u,
|
||||
POLICY_HND *handle)
|
||||
{
|
||||
memcpy(&q_u->handle, handle, sizeof(POLICY_HND));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
* init a structure.
|
||||
********************************************************************/
|
||||
|
Loading…
Reference in New Issue
Block a user