diff options
| author | Andreas Schneider <asn@samba.org> | 2010-06-30 10:40:24 +0200 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-27 10:27:15 -0400 |
| commit | 924cc43d1b8f8358f7c7aaef16b06437e39cd05b (patch) | |
| tree | dac559801fb640ab34c87778e565de40f0a1cbc5 | |
| parent | c3186f22c5d501cc6afed7556579906d27763251 (diff) | |
| download | samba-924cc43d1b8f8358f7c7aaef16b06437e39cd05b.tar.gz samba-924cc43d1b8f8358f7c7aaef16b06437e39cd05b.tar.bz2 samba-924cc43d1b8f8358f7c7aaef16b06437e39cd05b.zip | |
s3-spoolss: Move the standard mappings to spoolss.
Signed-off-by: Jim McDonough <jmcd@samba.org>
| -rw-r--r-- | source3/printing/nt_printing.c | 14 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 18 |
2 files changed, 16 insertions, 16 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index a70d9ea45a..8a06ef11c6 100644 --- 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 d44df2a217..ea3f3207fc 100644 --- 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 */ |