summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-04-29 23:47:25 +0200
committerGünther Deschner <gd@samba.org>2011-05-02 15:03:43 +0200
commitc233c21425a183dd1124329fdbca13ab92cc6d6a (patch)
treef1448285c2c9673b99b1162d0edce16a861c8285 /source3
parent047d8c073b57bc12648a251deaceedb65f4f59cf (diff)
downloadsamba-c233c21425a183dd1124329fdbca13ab92cc6d6a.tar.gz
samba-c233c21425a183dd1124329fdbca13ab92cc6d6a.tar.bz2
samba-c233c21425a183dd1124329fdbca13ab92cc6d6a.zip
s3-proto: move remaining spoolss protos to own header file.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h10
-rw-r--r--source3/printing/nt_printing.c1
-rw-r--r--source3/printing/spoolssd.c1
-rw-r--r--source3/rpc_server/rpc_ep_setup.c1
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_nt.h40
-rw-r--r--source3/smbd/process.c1
7 files changed, 45 insertions, 10 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index cec11ad7eb..a2751c7558 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2630,16 +2630,6 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt);
bool setup_fault_pdu(struct pipes_struct *p, NTSTATUS status);
bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax);
-/* The following definitions come from rpc_server/srv_spoolss_nt.c */
-void srv_spoolss_cleanup(void);
-
-void do_drv_upgrade_printer(struct messaging_context *msg,
- void *private_data,
- uint32_t msg_type,
- struct server_id server_id,
- DATA_BLOB *data);
-void update_monitored_printq_cache(struct messaging_context *msg_ctx);
-
/* The following definitions come from rpc_server/srv_svcctl_nt.c */
bool init_service_op_table( void );
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index a7539f6478..d74003a708 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -37,6 +37,7 @@
#include "auth.h"
#include "messages.h"
#include "ntdomain.h"
+#include "rpc_server/spoolss/srv_spoolss_nt.h"
/* Map generic permissions to printer object specific permissions */
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index 11d2d25c3b..4e63dc53c1 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -29,6 +29,7 @@
#include "rpc_server/rpc_server.h"
#include "rpc_server/rpc_ep_setup.h"
#include "rpc_server/srv_pipe_register.h"
+#include "rpc_server/spoolss/srv_spoolss_nt.h"
#define SPOOLSS_PIPE_NAME "spoolss"
#define DAEMON_NAME "spoolssd"
diff --git a/source3/rpc_server/rpc_ep_setup.c b/source3/rpc_server/rpc_ep_setup.c
index fd1297cc0c..6a48f8890d 100644
--- a/source3/rpc_server/rpc_ep_setup.c
+++ b/source3/rpc_server/rpc_ep_setup.c
@@ -41,6 +41,7 @@
#include "printing/nt_printing_migrate.h"
#include "rpc_server/eventlog/srv_eventlog_reg.h"
#include "rpc_server/svcctl/srv_svcctl_reg.h"
+#include "rpc_server/spoolss/srv_spoolss_nt.h"
#include "librpc/rpc/dcerpc_ep.h"
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 312f50965b..15630ff93d 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -49,6 +49,7 @@
#include "auth.h"
#include "messages.h"
#include "ntdomain.h"
+#include "rpc_server/spoolss/srv_spoolss_nt.h"
/* macros stolen from s4 spoolss server */
#define SPOOLSS_BUFFER_UNION(fn,info,level) \
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.h b/source3/rpc_server/spoolss/srv_spoolss_nt.h
new file mode 100644
index 0000000000..d6d141a5e8
--- /dev/null
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.h
@@ -0,0 +1,40 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * RPC Pipe client / server routines
+ * Copyright (C) Andrew Tridgell 1992-2000,
+ * Copyright (C) Luke Kenneth Casson Leighton 1996-2000,
+ * Copyright (C) Jean François Micouleau 1998-2000,
+ * Copyright (C) Jeremy Allison 2001-2002,
+ * Copyright (C) Gerald Carter 2000-2004,
+ * Copyright (C) Tim Potter 2001-2002.
+ * Copyright (C) Guenther Deschner 2009-2010.
+ * Copyright (C) Andreas Schneider 2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _RPC_SERVER_SPOOLSS_SRV_SPOOLSS_NT_H_
+#define _RPC_SERVER_SPOOLSS_SRV_SPOOLSS_NT_H_
+
+/* The following definitions come from rpc_server/srv_spoolss_nt.c */
+void srv_spoolss_cleanup(void);
+
+void do_drv_upgrade_printer(struct messaging_context *msg,
+ void *private_data,
+ uint32_t msg_type,
+ struct server_id server_id,
+ DATA_BLOB *data);
+void update_monitored_printq_cache(struct messaging_context *msg_ctx);
+
+#endif /* _RPC_SERVER_SPOOLSS_SRV_SPOOLSS_NT_H_ */
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 10632696c7..c17ff7b5ac 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -33,6 +33,7 @@
#include "auth.h"
#include "messages.h"
#include "smbprofile.h"
+#include "rpc_server/spoolss/srv_spoolss_nt.h"
extern bool global_machine_password_needs_changing;