[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-727-gcab2de7
Günther Deschner
gd at samba.org
Tue Feb 10 10:28:30 GMT 2009
The branch, master has been updated
via cab2de7bb0bfede9fe88b212c0eba7ebf162c04a (commit)
via 96f05fcd1ca690aa676fc3e38f9b3aa3b4076f04 (commit)
via 3d4221a9cbe178fc96e0e72b6f3b331fc0700752 (commit)
via b4bda6da5ae63223207f08caec8fedfd8a654ee2 (commit)
via 0fc13e7e2cb95f4e8a94b6fc91c72ee59b2963d6 (commit)
via e4b5e67566da767b423c8412601f46d3f95ff34c (commit)
via 2ede56f3c023ad1a8b7d3d8947b93fa5bedb21a1 (commit)
via 0a34c140cc096c222fb697c746d0045990ed3080 (commit)
from 46200a7cd4c1e6919e5ab99f1080dff013ed8867 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cab2de7bb0bfede9fe88b212c0eba7ebf162c04a
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 10 01:58:46 2009 +0100
s3-spoolss: remove old spoolss_OpenPrinter.
Guenther
commit 96f05fcd1ca690aa676fc3e38f9b3aa3b4076f04
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 10 01:48:18 2009 +0100
s3-spoolss: use pidl for _spoolss_OpenPrinter.
Guenther
commit 3d4221a9cbe178fc96e0e72b6f3b331fc0700752
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 10 01:53:32 2009 +0100
s3-spoolss: remove old spoolss_OpenPrinterEx.
Guenther
commit b4bda6da5ae63223207f08caec8fedfd8a654ee2
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 10 01:43:25 2009 +0100
s3-spoolss: use pidl for _spoolss_OpenPrinterEx.
Guenther
commit 0fc13e7e2cb95f4e8a94b6fc91c72ee59b2963d6
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 10 00:21:53 2009 +0100
s3-spoolss: remove old spoolss_SetJob.
Guenther
commit e4b5e67566da767b423c8412601f46d3f95ff34c
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 10 00:21:26 2009 +0100
s3-spoolss: use pidl for _spoolss_SetJob.
Guenther
commit 2ede56f3c023ad1a8b7d3d8947b93fa5bedb21a1
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 9 23:31:35 2009 +0100
s3-spoolss: remove old spoolss_StartDocPrinter.
Guenther
commit 0a34c140cc096c222fb697c746d0045990ed3080
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 9 23:28:34 2009 +0100
s3-spoolss: use pidl for _spoolss_StartDocPrinter.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 34 ---
source3/include/rpc_spoolss.h | 83 -------
source3/rpc_client/cli_spoolss.c | 86 -------
source3/rpc_parse/parse_spoolss.c | 450 -----------------------------------
source3/rpc_server/srv_spoolss.c | 89 +-------
source3/rpc_server/srv_spoolss_nt.c | 321 +++++++-------------------
6 files changed, 85 insertions(+), 978 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index db277ff..c2391c7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5433,9 +5433,6 @@ WERROR rpccli_spoolss_openprinter_ex(struct rpc_pipe_client *cli,
const char *printername,
uint32_t access_desired,
struct policy_handle *handle);
-WERROR rpccli_spoolss_open_printer_ex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- const char *printername, const char *datatype, uint32 access_required,
- const char *station, const char *username, POLICY_HND *pol);
WERROR rpccli_spoolss_enum_printers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
char *name, uint32 flags, uint32 level,
uint32 *num_printers, PRINTER_INFO_CTR *ctr);
@@ -5475,16 +5472,9 @@ WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx
WERROR rpccli_spoolss_enumjobs(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
POLICY_HND *hnd, uint32 level, uint32 firstjob,
uint32 num_jobs, uint32 *returned, JOB_INFO_CTR *ctr);
-WERROR rpccli_spoolss_setjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *hnd, uint32 jobid, uint32 level,
- uint32 command);
WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
POLICY_HND *hnd, uint32 jobid, uint32 level,
JOB_INFO_CTR *ctr);
-WERROR rpccli_spoolss_startdocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *hnd, char *docname,
- char *outputfile, char *datatype,
- uint32 *jobid);
WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
POLICY_HND *hnd, const char *valuename,
REGISTRY_VALUE *value);
@@ -5806,12 +5796,6 @@ bool smb_io_notify_info_data_strings(const char *desc,SPOOL_NOTIFY_INFO_DATA *da
prs_struct *ps, int depth);
bool spool_io_user_level_1( const char *desc, prs_struct *ps, int depth, SPOOL_USER_1 *q_u );
bool spoolss_io_devmode(const char *desc, prs_struct *ps, int depth, DEVICEMODE *devmode);
-bool make_spoolss_q_open_printer_ex(SPOOL_Q_OPEN_PRINTER_EX *q_u,
- const fstring printername,
- const fstring datatype,
- uint32 access_required,
- const fstring clientname,
- const fstring user_name);
bool make_spoolss_q_addprinterex( TALLOC_CTX *mem_ctx, SPOOL_Q_ADDPRINTEREX *q_u,
const char *srv_name, const char* clientname, const char* user_name,
uint32 level, PRINTER_INFO_CTR *ctr);
@@ -5821,10 +5805,6 @@ bool make_spoolss_printer_info_3(TALLOC_CTX *mem_ctx, SPOOL_PRINTER_INFO_LEVEL_3
PRINTER_INFO_3 *info);
bool make_spoolss_printer_info_7(TALLOC_CTX *mem_ctx, SPOOL_PRINTER_INFO_LEVEL_7 **spool_info7,
PRINTER_INFO_7 *info);
-bool spoolss_io_q_open_printer(const char *desc, SPOOL_Q_OPEN_PRINTER *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_open_printer(const char *desc, SPOOL_R_OPEN_PRINTER *r_u, prs_struct *ps, int depth);
-bool spoolss_io_q_open_printer_ex(const char *desc, SPOOL_Q_OPEN_PRINTER_EX *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_open_printer_ex(const char *desc, SPOOL_R_OPEN_PRINTER_EX *r_u, prs_struct *ps, int depth);
bool make_spoolss_q_getprinterdata(SPOOL_Q_GETPRINTERDATA *q_u,
const POLICY_HND *handle,
const char *valuename, uint32 size);
@@ -5834,8 +5814,6 @@ bool make_spoolss_q_getprinterdataex(SPOOL_Q_GETPRINTERDATAEX *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_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_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);
@@ -5933,8 +5911,6 @@ bool make_spoolss_q_enumjobs(SPOOL_Q_ENUMJOBS *q_u, const POLICY_HND *hnd,
RPC_BUFFER *buffer,
uint32 offered);
bool spoolss_io_q_enumjobs(const char *desc, SPOOL_Q_ENUMJOBS *q_u, prs_struct *ps, int depth);
-bool spoolss_io_r_setjob(const char *desc, SPOOL_R_SETJOB *r_u, prs_struct *ps, int depth);
-bool spoolss_io_q_setjob(const char *desc, SPOOL_Q_SETJOB *q_u, prs_struct *ps, int depth);
bool spoolss_io_r_enumprinterdrivers(const char *desc, SPOOL_R_ENUMPRINTERDRIVERS *r_u, prs_struct *ps, int depth);
bool make_spoolss_q_enumprinterdrivers(SPOOL_Q_ENUMPRINTERDRIVERS *q_u,
const char *name,
@@ -6043,15 +6019,9 @@ bool smb_io_printprocessordirectory_1(const char *desc, RPC_BUFFER *buffer, PRIN
bool make_spoolss_q_enumforms(SPOOL_Q_ENUMFORMS *q_u, POLICY_HND *handle,
uint32 level, RPC_BUFFER *buffer,
uint32 offered);
-bool make_spoolss_q_setjob(SPOOL_Q_SETJOB *q_u, POLICY_HND *handle,
- uint32 jobid, uint32 level, uint32 command);
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_startdocprinter(SPOOL_Q_STARTDOCPRINTER *q_u,
- POLICY_HND *handle, uint32 level,
- char *docname, char *outputfile,
- char *datatype);
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);
@@ -6179,8 +6149,6 @@ void reset_all_printerdata(struct messaging_context *msg,
uint32_t msg_type,
struct server_id server_id,
DATA_BLOB *data);
-WERROR _spoolss_open_printer(pipes_struct *p, SPOOL_Q_OPEN_PRINTER *q_u, SPOOL_R_OPEN_PRINTER *r_u);
-WERROR _spoolss_open_printer_ex( pipes_struct *p, SPOOL_Q_OPEN_PRINTER_EX *q_u, SPOOL_R_OPEN_PRINTER_EX *r_u);
bool convert_devicemode(const char *printername, const DEVICEMODE *devmode,
NT_DEVICEMODE **pp_nt_devmode);
WERROR set_printer_dataex( NT_PRINTER_INFO_LEVEL *printer, const char *key, const char *value,
@@ -6258,12 +6226,10 @@ DEVICEMODE *construct_dev_mode(const char *servicename);
WERROR _spoolss_enumprinters( pipes_struct *p, SPOOL_Q_ENUMPRINTERS *q_u, SPOOL_R_ENUMPRINTERS *r_u);
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 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);
WERROR _spoolss_setprinter(pipes_struct *p, SPOOL_Q_SETPRINTER *q_u, SPOOL_R_SETPRINTER *r_u);
WERROR _spoolss_enumjobs( pipes_struct *p, SPOOL_Q_ENUMJOBS *q_u, SPOOL_R_ENUMJOBS *r_u);
-WERROR _spoolss_setjob(pipes_struct *p, SPOOL_Q_SETJOB *q_u, SPOOL_R_SETJOB *r_u);
WERROR _spoolss_enumprinterdrivers( pipes_struct *p, SPOOL_Q_ENUMPRINTERDRIVERS *q_u, SPOOL_R_ENUMPRINTERDRIVERS *r_u);
WERROR _spoolss_enumforms(pipes_struct *p, SPOOL_Q_ENUMFORMS *q_u, SPOOL_R_ENUMFORMS *r_u);
WERROR enumports_hook(TALLOC_CTX *ctx, int *count, char ***lines );
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 63bc5ee..05b4858 100644
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -394,32 +394,6 @@ PRINTER_DEFAULT;
/********************************************/
-typedef struct {
- UNISTR2 *printername;
- PRINTER_DEFAULT printer_default;
-} SPOOL_Q_OPEN_PRINTER;
-
-typedef struct {
- POLICY_HND handle; /* handle used along all transactions (20*uint8) */
- WERROR status;
-} SPOOL_R_OPEN_PRINTER;
-
-/********************************************/
-
-typedef struct {
- UNISTR2 *printername;
- PRINTER_DEFAULT printer_default;
- uint32 user_switch;
- SPOOL_USER_CTR user_ctr;
-} SPOOL_Q_OPEN_PRINTER_EX;
-
-typedef struct {
- POLICY_HND handle; /* handle used along all transactions (20*uint8) */
- WERROR status;
-} SPOOL_R_OPEN_PRINTER_EX;
-
-/********************************************/
-
typedef struct spool_notify_option_type
{
uint16 type;
@@ -473,45 +447,6 @@ typedef struct spool_r_getprinterdata
}
SPOOL_R_GETPRINTERDATA;
-typedef struct spool_doc_info_1
-{
- uint32 p_docname;
- uint32 p_outputfile;
- uint32 p_datatype;
- UNISTR2 docname;
- UNISTR2 outputfile;
- UNISTR2 datatype;
-}
-DOC_INFO_1;
-
-typedef struct spool_doc_info
-{
- uint32 switch_value;
- DOC_INFO_1 doc_info_1;
-}
-DOC_INFO;
-
-typedef struct spool_doc_info_container
-{
- uint32 level;
- DOC_INFO docinfo;
-}
-DOC_INFO_CONTAINER;
-
-typedef struct spool_q_startdocprinter
-{
- POLICY_HND handle;
- DOC_INFO_CONTAINER doc_info_container;
-}
-SPOOL_Q_STARTDOCPRINTER;
-
-typedef struct spool_r_startdocprinter
-{
- uint32 jobid;
- WERROR status;
-}
-SPOOL_R_STARTDOCPRINTER;
-
typedef struct spool_notify_option
{
uint32 version;
@@ -1034,24 +969,6 @@ typedef struct job_info_info
}
JOB_INFO;
-typedef struct spool_q_setjob
-{
- POLICY_HND handle;
- uint32 jobid;
- uint32 level;
- JOB_INFO ctr;
- uint32 command;
-
-}
-SPOOL_Q_SETJOB;
-
-typedef struct spool_r_setjob
-{
- WERROR status;
-
-}
-SPOOL_R_SETJOB;
-
typedef struct spool_q_enumprinterdrivers
{
uint32 name_ptr;
diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index 780043a..b635bc7 100644
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -502,35 +502,6 @@ static bool decode_forms_1(TALLOC_CTX *mem_ctx, RPC_BUFFER *buffer,
/**********************************************************************
**********************************************************************/
-WERROR rpccli_spoolss_open_printer_ex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- const char *printername, const char *datatype, uint32 access_required,
- const char *station, const char *username, POLICY_HND *pol)
-{
- prs_struct qbuf, rbuf;
- SPOOL_Q_OPEN_PRINTER_EX in;
- SPOOL_R_OPEN_PRINTER_EX out;
-
- ZERO_STRUCT(in);
- ZERO_STRUCT(out);
-
- make_spoolss_q_open_printer_ex( &in, printername, datatype,
- access_required, station, username );
-
- CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_OPENPRINTEREX,
- in, out,
- qbuf, rbuf,
- spoolss_io_q_open_printer_ex,
- spoolss_io_r_open_printer_ex,
- WERR_GENERAL_FAILURE );
-
- memcpy( pol, &out.handle, sizeof(POLICY_HND) );
-
- return out.status;
-}
-
-/**********************************************************************
-**********************************************************************/
-
WERROR rpccli_spoolss_enum_printers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
char *name, uint32 flags, uint32 level,
uint32 *num_printers, PRINTER_INFO_CTR *ctr)
@@ -1273,32 +1244,6 @@ WERROR rpccli_spoolss_enumjobs(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
/**********************************************************************
**********************************************************************/
-WERROR rpccli_spoolss_setjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *hnd, uint32 jobid, uint32 level,
- uint32 command)
-{
- prs_struct qbuf, rbuf;
- SPOOL_Q_SETJOB in;
- SPOOL_R_SETJOB out;
-
- ZERO_STRUCT(in);
- ZERO_STRUCT(out);
-
- make_spoolss_q_setjob( &in, hnd, jobid, level, command );
-
- CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_SETJOB,
- in, out,
- qbuf, rbuf,
- spoolss_io_q_setjob,
- spoolss_io_r_setjob,
- WERR_GENERAL_FAILURE );
-
- return out.status;
-}
-
-/**********************************************************************
-**********************************************************************/
-
WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
POLICY_HND *hnd, uint32 jobid, uint32 level,
JOB_INFO_CTR *ctr)
@@ -1366,37 +1311,6 @@ WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
/**********************************************************************
**********************************************************************/
-WERROR rpccli_spoolss_startdocprinter(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *hnd, char *docname,
- char *outputfile, char *datatype,
- uint32 *jobid)
-{
- prs_struct qbuf, rbuf;
- SPOOL_Q_STARTDOCPRINTER in;
- SPOOL_R_STARTDOCPRINTER out;
- uint32 level = 1;
-
- ZERO_STRUCT(in);
- ZERO_STRUCT(out);
-
- make_spoolss_q_startdocprinter( &in, hnd, level, docname,
- outputfile, datatype );
-
- CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_STARTDOCPRINTER,
- in, out,
- qbuf, rbuf,
- spoolss_io_q_startdocprinter,
- spoolss_io_r_startdocprinter,
- WERR_GENERAL_FAILURE );
-
- *jobid = out.jobid;
-
- 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)
diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 5876171..af2378b 100644
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -71,109 +71,6 @@ bool make_systemtime(SYSTEMTIME *systime, struct tm *unixtime)
}
/*******************************************************************
-reads or writes an DOC_INFO structure.
-********************************************************************/
-
-static bool smb_io_doc_info_1(const char *desc, DOC_INFO_1 *info_1, prs_struct *ps, int depth)
-{
- if (info_1 == NULL) return False;
-
- prs_debug(ps, depth, desc, "smb_io_doc_info_1");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("p_docname", ps, depth, &info_1->p_docname))
- return False;
- if(!prs_uint32("p_outputfile", ps, depth, &info_1->p_outputfile))
- return False;
- if(!prs_uint32("p_datatype", ps, depth, &info_1->p_datatype))
- return False;
-
- if(!smb_io_unistr2("", &info_1->docname, info_1->p_docname, ps, depth))
- return False;
- if(!smb_io_unistr2("", &info_1->outputfile, info_1->p_outputfile, ps, depth))
- return False;
- if(!smb_io_unistr2("", &info_1->datatype, info_1->p_datatype, ps, depth))
- return False;
-
- return True;
-}
-
-/*******************************************************************
-reads or writes an DOC_INFO structure.
-********************************************************************/
-
-static bool smb_io_doc_info(const char *desc, DOC_INFO *info, prs_struct *ps, int depth)
-{
- uint32 useless_ptr=0;
-
- if (info == NULL) return False;
-
- prs_debug(ps, depth, desc, "smb_io_doc_info");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("switch_value", ps, depth, &info->switch_value))
- return False;
-
- if(!prs_uint32("doc_info_X ptr", ps, depth, &useless_ptr))
- return False;
-
- switch (info->switch_value)
- {
- case 1:
- if(!smb_io_doc_info_1("",&info->doc_info_1, ps, depth))
- return False;
- break;
- case 2:
- /*
- this is just a placeholder
-
- MSDN July 1998 says doc_info_2 is only on
- Windows 95, and as Win95 doesn't do RPC to print
- this case is nearly impossible
-
- Maybe one day with Windows for dishwasher 2037 ...
-
- */
- /* smb_io_doc_info_2("",&info->doc_info_2, ps, depth); */
- break;
- default:
- DEBUG(0,("Something is obviously wrong somewhere !\n"));
- break;
- }
-
- return True;
-}
-
-/*******************************************************************
-reads or writes an DOC_INFO_CONTAINER structure.
-********************************************************************/
-
-static bool smb_io_doc_info_container(const char *desc, DOC_INFO_CONTAINER *cont, prs_struct *ps, int depth)
-{
- if (cont == NULL) return False;
-
- prs_debug(ps, depth, desc, "smb_io_doc_info_container");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_uint32("level", ps, depth, &cont->level))
- return False;
-
- if(!smb_io_doc_info("",&cont->docinfo, ps, depth))
- return False;
-
- return True;
-}
-
-/*******************************************************************
reads or writes an NOTIFY OPTION TYPE structure.
********************************************************************/
@@ -861,92 +758,6 @@ static bool spoolss_io_devmode_cont(const char *desc, DEVMODE_CTR *dm_c, prs_str
}
/*******************************************************************
-********************************************************************/
-
-static bool spoolss_io_printer_default(const char *desc, PRINTER_DEFAULT *pd, prs_struct *ps, int depth)
-{
- if (pd==NULL)
- return False;
-
- prs_debug(ps, depth, desc, "spoolss_io_printer_default");
- depth++;
-
- if (!prs_uint32("datatype_ptr", ps, depth, &pd->datatype_ptr))
- return False;
-
- if (!smb_io_unistr2("datatype", &pd->datatype, pd->datatype_ptr, ps,depth))
- return False;
-
- if (!prs_align(ps))
- return False;
-
- if (!spoolss_io_devmode_cont("", &pd->devmode_cont, ps, depth))
- return False;
-
- if (!prs_align(ps))
- return False;
-
- if (!prs_uint32("access_required", ps, depth, &pd->access_required))
- return False;
-
- return True;
-}
-
-/*******************************************************************
- * init a structure.
- ********************************************************************/
-
-bool make_spoolss_q_open_printer_ex(SPOOL_Q_OPEN_PRINTER_EX *q_u,
- const fstring printername,
- const fstring datatype,
- uint32 access_required,
- const fstring clientname,
- const fstring user_name)
-{
- DEBUG(5,("make_spoolss_q_open_printer_ex\n"));
-
- q_u->printername = TALLOC_P( talloc_tos(), UNISTR2 );
- if (!q_u->printername) {
- return False;
- }
- init_unistr2(q_u->printername, printername, UNI_STR_TERMINATE);
-
- q_u->printer_default.datatype_ptr = 0;
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list