diff options
-rw-r--r-- | source3/include/proto.h | 9 | ||||
-rw-r--r-- | source3/include/rpc_spoolss.h | 29 | ||||
-rw-r--r-- | source3/rpc_client/cli_spoolss.c | 58 | ||||
-rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 137 |
4 files changed, 0 insertions, 233 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 7af45128ca..63adbf56cf 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5497,10 +5497,6 @@ WERROR rpccli_spoolss_addprinterdriver (struct rpc_pipe_client *cli, PRINTER_DRIVER_CTR *ctr); WERROR rpccli_spoolss_addprinterex (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32 level, PRINTER_INFO_CTR*ctr); -WERROR rpccli_spoolss_getprintprocessordirectory(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - char *name, char *environment, - fstring procdir); WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, int level, uint32 *num_forms, FORM_1 **forms); @@ -5885,7 +5881,6 @@ uint32 spoolss_size_job_info_1(JOB_INFO_1 *info); uint32 spoolss_size_job_info_2(JOB_INFO_2 *info); uint32 spoolss_size_form_1(FORM_1 *info); uint32 spoolss_size_port_info_1(PORT_INFO_1 *info); -uint32 spoolss_size_printprocessordirectory_info_1(PRINTPROCESSOR_DIRECTORY_1 *info); uint32 spoolss_size_port_info_2(PORT_INFO_2 *info); uint32 spoolss_size_printprocessor_info_1(PRINTPROCESSOR_1 *info); uint32 spoolss_size_printprocdatatype_info_1(PRINTPROCDATATYPE_1 *info); @@ -6018,10 +6013,6 @@ bool spoolss_io_q_enumprinterkey(const char *desc, SPOOL_Q_ENUMPRINTERKEY *q_u, bool spoolss_io_r_enumprinterkey(const char *desc, SPOOL_R_ENUMPRINTERKEY *r_u, prs_struct *ps, int depth); bool spoolss_io_q_enumprinterdataex(const char *desc, SPOOL_Q_ENUMPRINTERDATAEX *q_u, prs_struct *ps, int depth); bool spoolss_io_r_enumprinterdataex(const char *desc, SPOOL_R_ENUMPRINTERDATAEX *r_u, prs_struct *ps, int depth); -bool make_spoolss_q_getprintprocessordirectory(SPOOL_Q_GETPRINTPROCESSORDIRECTORY *q_u, const char *name, char *environment, int level, RPC_BUFFER *buffer, uint32 offered); -bool spoolss_io_q_getprintprocessordirectory(const char *desc, SPOOL_Q_GETPRINTPROCESSORDIRECTORY *q_u, prs_struct *ps, int depth); -bool spoolss_io_r_getprintprocessordirectory(const char *desc, SPOOL_R_GETPRINTPROCESSORDIRECTORY *r_u, prs_struct *ps, int depth); -bool smb_io_printprocessordirectory_1(const char *desc, RPC_BUFFER *buffer, PRINTPROCESSOR_DIRECTORY_1 *info, int depth); bool make_spoolss_q_enumforms(SPOOL_Q_ENUMFORMS *q_u, POLICY_HND *handle, uint32 level, RPC_BUFFER *buffer, uint32 offered); diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h index 24a33779aa..d7d93e3226 100644 --- a/source3/include/rpc_spoolss.h +++ b/source3/include/rpc_spoolss.h @@ -1438,34 +1438,5 @@ typedef struct spool_r_enumprinterdataex } SPOOL_R_ENUMPRINTERDATAEX; -typedef struct printprocessor_directory_1 -{ - UNISTR name; -} -PRINTPROCESSOR_DIRECTORY_1; - -typedef struct spool_q_getprintprocessordirectory -{ - UNISTR2 name; - UNISTR2 environment; - uint32 level; - RPC_BUFFER *buffer; - uint32 offered; -} -SPOOL_Q_GETPRINTPROCESSORDIRECTORY; - -typedef struct spool_r_getprintprocessordirectory -{ - RPC_BUFFER *buffer; - uint32 needed; - WERROR status; -} -SPOOL_R_GETPRINTPROCESSORDIRECTORY; - -/**************************************/ - -#define PRINTER_DRIVER_VERSION 2 -#define PRINTER_DRIVER_ARCHITECTURE "Windows NT x86" - #endif /* _RPC_SPOOLSS_H */ diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index 23ac690486..489b9ca2ff 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -967,64 +967,6 @@ WERROR rpccli_spoolss_addprinterex (struct rpc_pipe_client *cli, TALLOC_CTX *mem /********************************************************************** **********************************************************************/ -WERROR rpccli_spoolss_getprintprocessordirectory(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - char *name, char *environment, - fstring procdir) -{ - prs_struct qbuf, rbuf; - SPOOL_Q_GETPRINTPROCESSORDIRECTORY in; - SPOOL_R_GETPRINTPROCESSORDIRECTORY out; - int level = 1; - RPC_BUFFER buffer; - uint32 offered; - - ZERO_STRUCT(in); - ZERO_STRUCT(out); - - offered = 0; - if (!rpcbuf_init(&buffer, offered, mem_ctx)) - return WERR_NOMEM; - make_spoolss_q_getprintprocessordirectory( &in, name, - environment, level, &buffer, offered ); - - CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_GETPRINTPROCESSORDIRECTORY, - in, out, - qbuf, rbuf, - spoolss_io_q_getprintprocessordirectory, - spoolss_io_r_getprintprocessordirectory, - WERR_GENERAL_FAILURE ); - - if ( W_ERROR_EQUAL( out.status, WERR_INSUFFICIENT_BUFFER ) ) { - offered = out.needed; - - ZERO_STRUCT(in); - ZERO_STRUCT(out); - - if (!rpcbuf_init(&buffer, offered, mem_ctx)) - return WERR_NOMEM; - make_spoolss_q_getprintprocessordirectory( &in, name, - environment, level, &buffer, offered ); - - CLI_DO_RPC_WERR( cli, mem_ctx, &syntax_spoolss, SPOOLSS_GETPRINTPROCESSORDIRECTORY, - in, out, - qbuf, rbuf, - spoolss_io_q_getprintprocessordirectory, - spoolss_io_r_getprintprocessordirectory, - WERR_GENERAL_FAILURE ); - } - - if ( !W_ERROR_IS_OK(out.status) ) - return out.status; - - fstrcpy(procdir, "Not implemented!"); - - return out.status; -} - -/********************************************************************** -**********************************************************************/ - WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, POLICY_HND *handle, int level, uint32 *num_forms, FORM_1 **forms) diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index 19738cfd2a..b798eef455 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -2472,21 +2472,6 @@ uint32 spoolss_size_port_info_1(PORT_INFO_1 *info) return the size required by a struct in the stream ********************************************************************/ -uint32 spoolss_size_printprocessordirectory_info_1(PRINTPROCESSOR_DIRECTORY_1 *info) -{ - int size=0; - - size=str_len_uni(&info->name); /* the string length */ - size=size+1; /* add the leading zero */ - size=size*2; /* convert in char */ - - return size; -} - -/******************************************************************* -return the size required by a struct in the stream -********************************************************************/ - uint32 spoolss_size_port_info_2(PORT_INFO_2 *info) { int size=0; @@ -5240,128 +5225,6 @@ bool spoolss_io_r_enumprinterdataex(const char *desc, SPOOL_R_ENUMPRINTERDATAEX } /******************************************************************* - * write a structure. - ********************************************************************/ - -/* - uint32 GetPrintProcessorDirectory( - [in] unistr2 *name, - [in] unistr2 *environment, - [in] uint32 level, - [in,out] RPC_BUFFER buffer, - [in] uint32 offered, - [out] uint32 needed, - [out] uint32 returned - ); - -*/ - -bool make_spoolss_q_getprintprocessordirectory(SPOOL_Q_GETPRINTPROCESSORDIRECTORY *q_u, const char *name, char *environment, int level, RPC_BUFFER *buffer, uint32 offered) -{ - DEBUG(5,("make_spoolss_q_getprintprocessordirectory\n")); - - init_unistr2(&q_u->name, name, UNI_STR_TERMINATE); - init_unistr2(&q_u->environment, environment, UNI_STR_TERMINATE); - - q_u->level = level; - - q_u->buffer = buffer; - q_u->offered = offered; - - return True; -} - -bool spoolss_io_q_getprintprocessordirectory(const char *desc, SPOOL_Q_GETPRINTPROCESSORDIRECTORY *q_u, prs_struct *ps, int depth) -{ - uint32 ptr = 0; - - prs_debug(ps, depth, desc, "spoolss_io_q_getprintprocessordirectory"); - depth++; - - if(!prs_align(ps)) - return False; - - if (!prs_uint32("ptr", ps, depth, &ptr)) - return False; - - if (ptr) { - if(!smb_io_unistr2("name", &q_u->name, True, ps, depth)) - return False; - } - - if (!prs_align(ps)) - return False; - - if (!prs_uint32("ptr", ps, depth, &ptr)) - return False; - - if (ptr) { - if(!smb_io_unistr2("environment", &q_u->environment, True, - ps, depth)) - return False; - } - - if (!prs_align(ps)) - return False; - - if(!prs_uint32("level", ps, depth, &q_u->level)) - return False; - - if(!prs_rpcbuffer_p("", ps, depth, &q_u->buffer)) - return False; - - if(!prs_align(ps)) - return False; - - if(!prs_uint32("offered", ps, depth, &q_u->offered)) - return False; - - return True; -} - -/******************************************************************* - * write a structure. - ********************************************************************/ - -bool spoolss_io_r_getprintprocessordirectory(const char *desc, SPOOL_R_GETPRINTPROCESSORDIRECTORY *r_u, prs_struct *ps, int depth) -{ - prs_debug(ps, depth, desc, "spoolss_io_r_getprintprocessordirectory"); - depth++; - - if(!prs_align(ps)) - return False; - - if(!prs_rpcbuffer_p("", ps, depth, &r_u->buffer)) - return False; - - if(!prs_align(ps)) - return False; - - if(!prs_uint32("needed", ps, depth, &r_u->needed)) - return False; - - if(!prs_werror("status", ps, depth, &r_u->status)) - return False; - - return True; -} - -bool smb_io_printprocessordirectory_1(const char *desc, RPC_BUFFER *buffer, PRINTPROCESSOR_DIRECTORY_1 *info, int depth) -{ - prs_struct *ps=&buffer->prs; - - prs_debug(ps, depth, desc, "smb_io_printprocessordirectory_1"); - depth++; - - buffer->struct_start=prs_offset(ps); - - if (!smb_io_unistr(desc, &info->name, ps, depth)) - return False; - - return True; -} - -/******************************************************************* * init a structure. ********************************************************************/ |