diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 23:45:44 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-03 11:00:25 +0200 |
| commit | 2794d2ee7f8e088060e4b86532176673cf7c2580 (patch) | |
| tree | d9fb9c1cbfc741bf8a221be9991eb0548e93d10c | |
| parent | 5cf3b0bba4b45096390fb4bcfb3ad07704d56880 (diff) | |
| download | samba-2794d2ee7f8e088060e4b86532176673cf7c2580.tar.gz samba-2794d2ee7f8e088060e4b86532176673cf7c2580.tar.bz2 samba-2794d2ee7f8e088060e4b86532176673cf7c2580.zip | |
s3-security: use shared Security Access Masks Rights.
Guenther
| -rw-r--r-- | source3/include/rpc_secdes.h | 7 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 16791e072c..ec1bbc61ea 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -41,13 +41,6 @@ struct standard_mapping { uint32 std_all; }; - -/* Security Access Masks Rights */ - -#define SPECIFIC_RIGHTS_MASK 0x0000FFFF -#define STANDARD_RIGHTS_MASK 0x00FF0000 -#define GENERIC_RIGHTS_MASK 0xF0000000 - /* Generic access rights */ #define GENERIC_RIGHT_ALL_ACCESS 0x10000000 diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 81c72c20ae..104efdc274 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -1537,7 +1537,7 @@ WERROR _spoolss_OpenPrinterEx(pipes_struct *p, /* Deny any object specific bits that don't apply to print servers (i.e printer and job specific bits) */ - r->in.access_mask &= SPECIFIC_RIGHTS_MASK; + r->in.access_mask &= SEC_MASK_SPECIFIC; if (r->in.access_mask & ~(SERVER_ACCESS_ADMINISTER | SERVER_ACCESS_ENUMERATE)) { @@ -1638,7 +1638,7 @@ WERROR _spoolss_OpenPrinterEx(pipes_struct *p, return WERR_ACCESS_DENIED; } - if ((r->in.access_mask & SPECIFIC_RIGHTS_MASK)& ~(PRINTER_ACCESS_ADMINISTER|PRINTER_ACCESS_USE)) { + if ((r->in.access_mask & SEC_MASK_SPECIFIC)& ~(PRINTER_ACCESS_ADMINISTER|PRINTER_ACCESS_USE)) { DEBUG(3, ("access DENIED for printer open - unknown bits\n")); close_printer_handle(p, r->out.handle); ZERO_STRUCTP(r->out.handle); |