s3-printing: fix pcacp prototypes and includes.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index cd2740f8407d9b1be4f3db55661f12bb1db129f7..8770145ef171135335b46355c9504afdc0aad44a 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3960,14 +3960,6 @@ bool parse_lpq_entry(enum printing_types printing_type,char *line,
                     print_status_struct *status,bool first);
 uint32_t print_parse_jobid(const char *fname);
 
-/* The following definitions come from printing/pcap.c  */
-
-void pcap_cache_reload(struct tevent_context *ev,
-                      struct messaging_context *msg_ctx,
-                      void (*post_cache_fill_fn)(struct tevent_context *,
-                                                 struct messaging_context *));
-bool pcap_printername_ok(const char *printername);
-
 /* The following definitions come from printing/printing.c  */
 
 uint16 pjobid_to_rap(const char* sharename, uint32 jobid);

diff --git a/source3/printing/pcap.h b/source3/printing/pcap.h
index 4198be1de5ea86e0b236dbac32aa2ed7863b0031..e24142e8b2abd8543f775348961c12e8d622f2b2 100644 (file)
--- a/source3/printing/pcap.h
+++ b/source3/printing/pcap.h
@@ -28,6 +28,12 @@ bool pcap_cache_replace(const struct pcap_cache *cache);
 void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char *, const char *, void *), void *);
 void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void *);
 
+void pcap_cache_reload(struct tevent_context *ev,
+                      struct messaging_context *msg_ctx,
+                      void (*post_cache_fill_fn)(struct tevent_context *,
+                                                 struct messaging_context *));
+bool pcap_printername_ok(const char *printername);
+
 /* The following definitions come from printing/print_aix.c  */
 
 bool aix_cache_reload(void);

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 0e2655a3f1d5e54375e5b946dbd040a52392a952..ce112bb152eefc0ad09eb1dd4784db7ce93d1ed3 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -26,6 +26,7 @@
 #include "nt_printing.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "printing/notify.h"
+#include "printing/pcap.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6ba41a3b8dfd58bdff4d895c296f1899a2680043..3c2591c32b235cb8607d93951cc91702d0857cd8 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -25,6 +25,7 @@
 #include "../lib/async_req/async_sock.h"
 #include "ctdbd_conn.h"
 #include "../lib/util/select.h"
+#include "printing/pcap.h"
 
 extern bool global_machine_password_needs_changing;
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ab40031fa5fdf12a1736494d4bb6b825431f1acb..965a0e81f7b0d8ca42556c931d7cdd4ed225d932 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -33,6 +33,7 @@
 #include "ctdbd_conn.h"
 #include "printing/printer_list.h"
 #include "rpc_server/rpc_ep_setup.h"
+#include "printing/pcap.h"
 
 #ifdef WITH_DFS
 extern int dcelogin_atmost_once;

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 41e31dc0d14777973f3934fd9775ee39aa9fbb77..e713b7132e9024d23b26f4d96985fa600cb1574c 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -21,6 +21,7 @@
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
+#include "printing/pcap.h"
 
 extern userdom_struct current_user_info;