From 4761498c9e40d8b00060d2949bfcff32c6cf7f99 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 11 May 2010 11:14:55 +0200 Subject: s3-printing: Moved remaining prototypes to nt_printing.h. Signed-off-by: Jim McDonough --- source3/include/nt_printing.h | 24 ++++++++++++++++++++++++ source3/include/proto.h | 18 ------------------ 2 files changed, 24 insertions(+), 18 deletions(-) (limited to 'source3/include') diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index b83be9de28..0ed0fce1b9 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -223,10 +223,18 @@ struct print_architecture_table_node { int version; }; +bool nt_printing_init(struct messaging_context *msg_ctx); + WERROR spoolss_create_default_devmode(TALLOC_CTX *mem_ctx, const char *devicename, struct spoolss_DeviceMode **devmode); +int pack_devicemode(struct spoolss_DeviceMode *devmode, uint8 *buf, int buflen); + +int unpack_devicemode(TALLOC_CTX *mem_ctx, + const uint8 *buf, int buflen, + struct spoolss_DeviceMode **devmode); + WERROR spoolss_create_default_secdesc(TALLOC_CTX *mem_ctx, struct spoolss_security_descriptor **secdesc); @@ -250,6 +258,11 @@ bool is_printer_published(TALLOC_CTX *mem_ctx, char *servername, char *printer, struct GUID *guid, struct spoolss_PrinterInfo2 **info2); +WERROR check_published_printers(void); + +bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r, + struct spoolss_DriverInfo8 *_info8); + bool printer_driver_in_use(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, const struct spoolss_DriverInfo8 *r); @@ -267,4 +280,15 @@ WERROR clean_up_driver_struct(TALLOC_CTX *mem_ctx, struct pipes_struct *rpc_pipe, struct spoolss_AddDriverInfoCtr *r); +void map_printer_permissions(struct security_descriptor *sd); + +void map_job_permissions(struct security_descriptor *sd); + +bool print_time_access_check(struct auth_serversupplied_info *server_info, + const char *servicename); + +void nt_printer_remove(TALLOC_CTX *mem_ctx, + struct auth_serversupplied_info *server_info, + const char *printer); + #endif /* NT_PRINTING_H_ */ diff --git a/source3/include/proto.h b/source3/include/proto.h index c66f45f0a8..32ccc48e14 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4719,24 +4719,6 @@ void notify_printer_port(int snum, const char *port_name); void notify_printer_location(int snum, const char *location); void notify_printer_byname( const char *printername, uint32 change, const char *value ); -/* The following definitions come from printing/nt_printing.c */ - -bool nt_printing_init(struct messaging_context *msg_ctx); -int pack_devicemode(struct spoolss_DeviceMode *devmode, uint8 *buf, int buflen); -int unpack_devicemode(TALLOC_CTX *mem_ctx, - const uint8 *buf, int buflen, - struct spoolss_DeviceMode **devmode); -WERROR check_published_printers(void); -bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r, - struct spoolss_DriverInfo8 *_info8); -void map_printer_permissions(struct security_descriptor *sd); -void map_job_permissions(struct security_descriptor *sd); -bool print_time_access_check(struct auth_serversupplied_info *server_info, - const char *servicename); -void nt_printer_remove(TALLOC_CTX *mem_ctx, - struct auth_serversupplied_info *server_info, - const char *printer); - /* The following definitions come from printing/pcap.c */ void pcap_cache_reload(void); -- cgit