From cc06133b0a0f3a4a150d587a7d43c678cfba16a0 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 18:26:48 +0200 Subject: s3-rpc_client: move protos to cli_spoolss.h Guenther --- source3/include/proto.h | 125 --------------------------------------- source3/libads/ldap_printer.c | 1 + source3/rpc_client/cli_spoolss.c | 1 + source3/rpc_client/cli_spoolss.h | 124 ++++++++++++++++++++++++++++++++++++++ source3/rpcclient/cmd_spoolss.c | 1 + source3/smbd/lanman.c | 1 + source3/utils/net_rpc_printer.c | 1 + 7 files changed, 129 insertions(+), 125 deletions(-) create mode 100644 source3/rpc_client/cli_spoolss.h diff --git a/source3/include/proto.h b/source3/include/proto.h index 46bcf8fa16..b6060cb9d7 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5011,131 +5011,6 @@ struct cli_state *rpc_pipe_smbd_smb_conn(struct rpc_pipe_client *p); NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd, struct rpc_cli_transport **presult); -/* The following definitions come from rpc_client/cli_spoolss.c */ - -WERROR rpccli_spoolss_openprinter_ex(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *printername, - uint32_t access_desired, - struct policy_handle *handle); -WERROR rpccli_spoolss_getprinterdriver(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - const char *architecture, - uint32_t level, - uint32_t offered, - union spoolss_DriverInfo *info); -WERROR rpccli_spoolss_getprinterdriver2(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - const char *architecture, - uint32_t level, - uint32_t offered, - uint32_t client_major_version, - uint32_t client_minor_version, - union spoolss_DriverInfo *info, - uint32_t *server_major_version, - uint32_t *server_minor_version); -WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct spoolss_SetPrinterInfoCtr *info_ctr); -WERROR rpccli_spoolss_getprinter(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - uint32_t level, - uint32_t offered, - union spoolss_PrinterInfo *info); -WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - uint32_t job_id, - uint32_t level, - uint32_t offered, - union spoolss_JobInfo *info); -WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_FormInfo **info); -WERROR rpccli_spoolss_enumprintprocessors(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *servername, - const char *environment, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_PrintProcessorInfo **info); -WERROR rpccli_spoolss_enumprintprocessordatatypes(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *servername, - const char *print_processor_name, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_PrintProcDataTypesInfo **info); -WERROR rpccli_spoolss_enumports(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *servername, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_PortInfo **info); -WERROR rpccli_spoolss_enummonitors(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *servername, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_MonitorInfo **info); -WERROR rpccli_spoolss_enumjobs(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - uint32_t firstjob, - uint32_t numjobs, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_JobInfo **info); -WERROR rpccli_spoolss_enumprinterdrivers(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *server, - const char *environment, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_DriverInfo **info); -WERROR rpccli_spoolss_enumprinters(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - uint32_t flags, - const char *server, - uint32_t level, - uint32_t offered, - uint32_t *count, - union spoolss_PrinterInfo **info); -WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - const char *value_name, - uint32_t offered, - enum winreg_Type *type, - uint32_t *needed_p, - uint8_t **data_p); -WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - const char *key_name, - const char ***key_buffer, - uint32_t offered); -WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *handle, - const char *key_name, - uint32_t offered, - uint32_t *count, - struct spoolss_PrinterEnumValues **info); - /* The following definitions come from rpc_client/init_spoolss.c */ bool init_systemtime(struct spoolss_Time *r, diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c index 6f49a57bb0..cff11bda2a 100644 --- a/source3/libads/ldap_printer.c +++ b/source3/libads/ldap_printer.c @@ -19,6 +19,7 @@ #include "includes.h" #include "../librpc/gen_ndr/cli_spoolss.h" +#include "rpc_client/cli_spoolss.h" #include "registry.h" #ifdef HAVE_ADS diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index 2ca313d168..ce21a768e5 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -24,6 +24,7 @@ #include "includes.h" #include "../librpc/gen_ndr/cli_spoolss.h" +#include "rpc_client/cli_spoolss.h" /********************************************************************** convencience wrapper around rpccli_spoolss_OpenPrinterEx diff --git a/source3/rpc_client/cli_spoolss.h b/source3/rpc_client/cli_spoolss.h new file mode 100644 index 0000000000..285a34fab4 --- /dev/null +++ b/source3/rpc_client/cli_spoolss.h @@ -0,0 +1,124 @@ +/* The following definitions come from rpc_client/cli_spoolss.c */ + +WERROR rpccli_spoolss_openprinter_ex(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *printername, + uint32_t access_desired, + struct policy_handle *handle); +WERROR rpccli_spoolss_getprinterdriver(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + const char *architecture, + uint32_t level, + uint32_t offered, + union spoolss_DriverInfo *info); +WERROR rpccli_spoolss_getprinterdriver2(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + const char *architecture, + uint32_t level, + uint32_t offered, + uint32_t client_major_version, + uint32_t client_minor_version, + union spoolss_DriverInfo *info, + uint32_t *server_major_version, + uint32_t *server_minor_version); +WERROR rpccli_spoolss_addprinterex(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct spoolss_SetPrinterInfoCtr *info_ctr); +WERROR rpccli_spoolss_getprinter(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + uint32_t level, + uint32_t offered, + union spoolss_PrinterInfo *info); +WERROR rpccli_spoolss_getjob(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + uint32_t job_id, + uint32_t level, + uint32_t offered, + union spoolss_JobInfo *info); +WERROR rpccli_spoolss_enumforms(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_FormInfo **info); +WERROR rpccli_spoolss_enumprintprocessors(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *servername, + const char *environment, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_PrintProcessorInfo **info); +WERROR rpccli_spoolss_enumprintprocessordatatypes(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *servername, + const char *print_processor_name, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_PrintProcDataTypesInfo **info); +WERROR rpccli_spoolss_enumports(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *servername, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_PortInfo **info); +WERROR rpccli_spoolss_enummonitors(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *servername, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_MonitorInfo **info); +WERROR rpccli_spoolss_enumjobs(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + uint32_t firstjob, + uint32_t numjobs, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_JobInfo **info); +WERROR rpccli_spoolss_enumprinterdrivers(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *server, + const char *environment, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_DriverInfo **info); +WERROR rpccli_spoolss_enumprinters(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t flags, + const char *server, + uint32_t level, + uint32_t offered, + uint32_t *count, + union spoolss_PrinterInfo **info); +WERROR rpccli_spoolss_getprinterdata(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + const char *value_name, + uint32_t offered, + enum winreg_Type *type, + uint32_t *needed_p, + uint8_t **data_p); +WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + const char *key_name, + const char ***key_buffer, + uint32_t offered); +WERROR rpccli_spoolss_enumprinterdataex(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *handle, + const char *key_name, + uint32_t offered, + uint32_t *count, + struct spoolss_PrinterEnumValues **info); diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index 018c7c8234..e56f4496f7 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -25,6 +25,7 @@ #include "includes.h" #include "rpcclient.h" #include "../librpc/gen_ndr/cli_spoolss.h" +#include "rpc_client/cli_spoolss.h" #include "registry.h" #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \ diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index fce23e8da2..498c8aceda 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -29,6 +29,7 @@ #include "smbd/globals.h" #include "../librpc/gen_ndr/cli_samr.h" #include "../librpc/gen_ndr/cli_spoolss.h" +#include "rpc_client/cli_spoolss.h" #include "../librpc/gen_ndr/cli_srvsvc.h" #include "../librpc/gen_ndr/srv_samr.h" #include "../librpc/gen_ndr/srv_spoolss.h" diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index e81e4c9610..ec6509497a 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -19,6 +19,7 @@ #include "includes.h" #include "utils/net.h" #include "../librpc/gen_ndr/cli_spoolss.h" +#include "rpc_client/cli_spoolss.h" #include "registry.h" /* support itanium as well */ -- cgit