From 5a0cf0c77e033da68d9dedb048995aa2ade76460 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 21 Feb 2011 14:37:21 +0100
Subject: s3-printing: fix pcacp prototypes and includes.

Guenther
---
 source3/include/proto.h     | 8 --------
 source3/printing/pcap.h     | 6 ++++++
 source3/printing/printing.c | 1 +
 source3/smbd/process.c      | 1 +
 source3/smbd/server.c       | 1 +
 source3/smbd/service.c      | 1 +
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index cd2740f840..8770145ef1 100644
--- 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 4198be1de5..e24142e8b2 100644
--- 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 0e2655a3f1..ce112bb152 100644
--- 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 6ba41a3b8d..3c2591c32b 100644
--- 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 ab40031fa5..965a0e81f7 100644
--- 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 41e31dc0d1..e713b7132e 100644
--- 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;
 
-- 
cgit