s3-spoolss: Move the standard mappings to spoolss.

Signed-off-by: Jim McDonough <jmcd@samba.org>

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index a70d9ea45a185806623190eb234564a0e659c3f1..8a06ef11c6860806405289b853742cb0cf91c373 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -40,13 +40,6 @@ const struct generic_mapping printer_generic_mapping = {
        PRINTER_ALL_ACCESS
 };
 
-const struct standard_mapping printer_std_mapping = {
-       PRINTER_READ,
-       PRINTER_WRITE,
-       PRINTER_EXECUTE,
-       PRINTER_ALL_ACCESS
-};
-
 /* Map generic permissions to print server object specific permissions */
 
 const struct generic_mapping printserver_generic_mapping = {
@@ -56,13 +49,6 @@ const struct generic_mapping printserver_generic_mapping = {
        SERVER_ALL_ACCESS
 };
 
-const struct generic_mapping printserver_std_mapping = {
-       SERVER_READ,
-       SERVER_WRITE,
-       SERVER_EXECUTE,
-       SERVER_ALL_ACCESS
-};
-
 /* Map generic permissions to job object specific permissions */
 
 const struct generic_mapping job_generic_mapping = {

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index d44df2a2172ebe27b102776300fd7b8b3356cdf0..ea3f3207fc98e1208be0c57e7257a85a2301180c 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -74,9 +74,23 @@ static struct rpc_pipe_client *notify_cli_pipe; /* print notify back-channel pip
 static uint32_t smb_connections = 0;
 
 
-/* in printing/nt_printing.c */
+/* Map generic permissions to printer object specific permissions */
 
-extern struct standard_mapping printer_std_mapping, printserver_std_mapping;
+const struct standard_mapping printer_std_mapping = {
+       PRINTER_READ,
+       PRINTER_WRITE,
+       PRINTER_EXECUTE,
+       PRINTER_ALL_ACCESS
+};
+
+/* Map generic permissions to print server object specific permissions */
+
+const struct generic_mapping printserver_std_mapping = {
+       SERVER_READ,
+       SERVER_WRITE,
+       SERVER_EXECUTE,
+       SERVER_ALL_ACCESS
+};
 
 /* API table for Xcv Monitor functions */