From 5a6f3a06665ea343e2a212924cfce9edb358876f Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 18:58:45 +0200 Subject: s3-rpc_client: move protos to init_spoolss.h Guenther --- source3/include/proto.h | 13 ------------- source3/rpc_client/init_spoolss.c | 1 + source3/rpc_client/init_spoolss.h | 14 ++++++++++++++ source3/rpc_server/srv_spoolss_nt.c | 1 + source3/rpcclient/cmd_spoolss.c | 1 + source3/smbd/lanman.c | 1 + 6 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 source3/rpc_client/init_spoolss.h (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index b6060cb9d7..f3954344fc 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5011,19 +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/init_spoolss.c */ - -bool init_systemtime(struct spoolss_Time *r, - struct tm *unixtime); -time_t spoolss_Time_to_time_t(const struct spoolss_Time *r); -WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx, - const DATA_BLOB *blob, - union spoolss_PrinterData *data, - enum winreg_Type type); -WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, - enum winreg_Type type, - union spoolss_PrinterData *data); - /* The following definitions come from rpc_client/init_lsa.c */ void init_lsa_String(struct lsa_String *name, const char *s); diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c index 864e80d0f9..737dbdc664 100644 --- a/source3/rpc_client/init_spoolss.c +++ b/source3/rpc_client/init_spoolss.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "rpc_client/init_spoolss.h" /******************************************************************* ********************************************************************/ diff --git a/source3/rpc_client/init_spoolss.h b/source3/rpc_client/init_spoolss.h new file mode 100644 index 0000000000..50ccf477ab --- /dev/null +++ b/source3/rpc_client/init_spoolss.h @@ -0,0 +1,14 @@ + +/* The following definitions come from rpc_client/init_spoolss.c */ + +bool init_systemtime(struct spoolss_Time *r, + struct tm *unixtime); +time_t spoolss_Time_to_time_t(const struct spoolss_Time *r); +WERROR pull_spoolss_PrinterData(TALLOC_CTX *mem_ctx, + const DATA_BLOB *blob, + union spoolss_PrinterData *data, + enum winreg_Type type); +WERROR push_spoolss_PrinterData(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, + enum winreg_Type type, + union spoolss_PrinterData *data); + diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index a993515015..37d1044ef6 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -29,6 +29,7 @@ #include "includes.h" #include "../librpc/gen_ndr/srv_spoolss.h" #include "../librpc/gen_ndr/cli_spoolss.h" +#include "rpc_client/init_spoolss.h" #include "librpc/gen_ndr/messaging.h" #include "registry.h" diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c index e56f4496f7..b5f34c4b2e 100644 --- a/source3/rpcclient/cmd_spoolss.c +++ b/source3/rpcclient/cmd_spoolss.c @@ -26,6 +26,7 @@ #include "rpcclient.h" #include "../librpc/gen_ndr/cli_spoolss.h" #include "rpc_client/cli_spoolss.h" +#include "rpc_client/init_spoolss.h" #include "registry.h" #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \ diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 498c8aceda..91eb135ead 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -30,6 +30,7 @@ #include "../librpc/gen_ndr/cli_samr.h" #include "../librpc/gen_ndr/cli_spoolss.h" #include "rpc_client/cli_spoolss.h" +#include "rpc_client/init_spoolss.h" #include "../librpc/gen_ndr/cli_srvsvc.h" #include "../librpc/gen_ndr/srv_samr.h" #include "../librpc/gen_ndr/srv_spoolss.h" -- cgit