diff options
| -rw-r--r-- | source3/include/printing.h | 33 | ||||
| -rw-r--r-- | source3/include/proto.h | 32 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 1 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 1 |
4 files changed, 36 insertions, 31 deletions
diff --git a/source3/include/printing.h b/source3/include/printing.h index 34fbd582236..8dff4ddb13f 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -112,4 +112,37 @@ void print_spool_end(files_struct *fsp, enum file_close_type close_type); void print_spool_terminate(struct connection_struct *conn, struct print_file_data *print_file); +/* The following definitions come from printing/printing.c */ + +int unpack_pjob( uint8 *buf, int buflen, struct printjob *pjob ); +uint32 sysjob_to_jobid(int unix_jobid); +void pjob_delete(const char* sharename, uint32 jobid); +bool print_notify_register_pid(int snum); +bool print_notify_deregister_pid(int snum); +bool print_job_exists(const char* sharename, uint32 jobid); +int print_job_fd(const char* sharename, uint32 jobid); +char *print_job_fname(const char* sharename, uint32 jobid); +struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid); +bool print_job_set_name(const char *sharename, uint32 jobid, const char *name); +bool print_job_get_name(TALLOC_CTX *mem_ctx, const char *sharename, uint32_t jobid, char **name); +WERROR print_job_delete(struct auth_serversupplied_info *server_info, + int snum, uint32 jobid); +bool print_job_pause(struct auth_serversupplied_info *server_info, int snum, + uint32 jobid, WERROR *errcode); +bool print_job_resume(struct auth_serversupplied_info *server_info, int snum, + uint32 jobid, WERROR *errcode); +ssize_t print_job_write(int snum, uint32 jobid, const char *buf, SMB_OFF_T pos, size_t size); +int print_queue_length(int snum, print_status_struct *pstatus); +WERROR print_job_start(struct auth_serversupplied_info *server_info, + int snum, const char *docname, const char *filename, + struct spoolss_DeviceMode *devmode, uint32_t *_jobid); +void print_job_endpage(int snum, uint32 jobid); +NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type); +int print_queue_status(int snum, + print_queue_struct **ppqueue, + print_status_struct *status); +WERROR print_queue_pause(struct auth_serversupplied_info *server_info, int snum); +WERROR print_queue_resume(struct auth_serversupplied_info *server_info, int snum); +WERROR print_queue_purge(struct auth_serversupplied_info *server_info, int snum); + #endif /* PRINTING_H_ */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 6420b154746..29c3223e543 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4730,38 +4730,8 @@ uint16 pjobid_to_rap(const char* sharename, uint32 jobid); bool rap_to_pjobid(uint16 rap_jobid, fstring sharename, uint32 *pjobid); void rap_jobid_delete(const char* sharename, uint32 jobid); bool print_backend_init(struct messaging_context *msg_ctx); -void printing_end(void); -int unpack_pjob( uint8 *buf, int buflen, struct printjob *pjob ); -uint32 sysjob_to_jobid(int unix_jobid); -void pjob_delete(const char* sharename, uint32 jobid); void start_background_queue(void); -bool print_notify_register_pid(int snum); -bool print_notify_deregister_pid(int snum); -bool print_job_exists(const char* sharename, uint32 jobid); -int print_job_fd(const char* sharename, uint32 jobid); -char *print_job_fname(const char* sharename, uint32 jobid); -struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid); -bool print_job_set_name(const char *sharename, uint32 jobid, const char *name); -bool print_job_get_name(TALLOC_CTX *mem_ctx, const char *sharename, uint32_t jobid, char **name); -WERROR print_job_delete(struct auth_serversupplied_info *server_info, - int snum, uint32 jobid); -bool print_job_pause(struct auth_serversupplied_info *server_info, int snum, - uint32 jobid, WERROR *errcode); -bool print_job_resume(struct auth_serversupplied_info *server_info, int snum, - uint32 jobid, WERROR *errcode); -ssize_t print_job_write(int snum, uint32 jobid, const char *buf, SMB_OFF_T pos, size_t size); -int print_queue_length(int snum, print_status_struct *pstatus); -WERROR print_job_start(struct auth_serversupplied_info *server_info, - int snum, const char *docname, const char *filename, - struct spoolss_DeviceMode *devmode, uint32_t *_jobid); -void print_job_endpage(int snum, uint32 jobid); -NTSTATUS print_job_end(int snum, uint32 jobid, enum file_close_type close_type); -int print_queue_status(int snum, - print_queue_struct **ppqueue, - print_status_struct *status); -WERROR print_queue_pause(struct auth_serversupplied_info *server_info, int snum); -WERROR print_queue_resume(struct auth_serversupplied_info *server_info, int snum); -WERROR print_queue_purge(struct auth_serversupplied_info *server_info, int snum); +void printing_end(void); /* The following definitions come from printing/printing_db.c */ diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 5a33a34ca5a..729bfe5546a 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -37,6 +37,7 @@ #include "librpc/gen_ndr/ndr_security.h" #include "registry.h" #include "registry/reg_objects.h" +#include "include/printing.h" /* macros stolen from s4 spoolss server */ #define SPOOLSS_BUFFER_UNION(fn,info,level) \ diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index dc7082964fc..3b9f6a76c5c 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -27,6 +27,7 @@ #include "includes.h" #include "printing.h" #include "smbd/globals.h" +#include "../librpc/gen_ndr/cli_spoolss.h" /**************************************************************************** Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext |