From 52ca1fc349f4b6ab92f96fce9aaae07768d86641 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 16 Feb 2010 02:48:01 +0100 Subject: [PATCH] spoolss: add spoolss_security_descriptor. Guenther (cherry picked from commit 18564787e2f169cac26d361201c1a954b7e263b7) --- librpc/gen_ndr/ndr_spoolss.c | 88 ++++++++++++++++++++++---------------------- librpc/gen_ndr/spoolss.h | 9 +++-- librpc/idl/spoolss.idl | 11 ++++-- librpc/ndr/ndr_spoolss_buf.c | 55 +++++++++++++++++++++++++++ librpc/ndr/ndr_spoolss_buf.h | 3 ++ 5 files changed, 114 insertions(+), 52 deletions(-) diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index 59919cc1e31..712c9078e59 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -1067,10 +1067,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->attributes)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); @@ -1208,19 +1208,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); { struct ndr_push *_ndr_secdesc; NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -1401,7 +1401,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); if (_ptr_secdesc) { @@ -1410,7 +1410,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i } else { r->secdesc = NULL; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } NDR_CHECK(ndr_pull_spoolss_PrinterAttributes(ndr, NDR_SCALARS, &r->attributes)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); @@ -1611,7 +1611,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { uint32_t _relative_save_offset; @@ -1622,13 +1622,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i { struct ndr_pull *_ndr_secdesc; NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); ndr->offset = _relative_save_offset; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -1713,7 +1713,7 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo2(struct ndr_print *ndr, const char * ndr_print_ptr(ndr, "secdesc", r->secdesc); ndr->depth++; if (r->secdesc) { - ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); + ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); } ndr->depth--; ndr_print_spoolss_PrinterAttributes(ndr, "attributes", r->attributes); @@ -1737,27 +1737,27 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, i if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } if (ndr_flags & NDR_BUFFERS) { { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); { struct ndr_push *_ndr_secdesc; NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -1770,7 +1770,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); if (_ptr_secdesc) { @@ -1779,12 +1779,12 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i } else { r->secdesc = NULL; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } if (ndr_flags & NDR_BUFFERS) { { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { uint32_t _relative_save_offset; @@ -1795,13 +1795,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, i { struct ndr_pull *_ndr_secdesc; NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); ndr->offset = _relative_save_offset; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -1814,7 +1814,7 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo3(struct ndr_print *ndr, const char * ndr_print_ptr(ndr, "secdesc", r->secdesc); ndr->depth++; if (r->secdesc) { - ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); + ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); } ndr->depth--; ndr->depth--; @@ -3157,10 +3157,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); @@ -3290,19 +3290,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); { struct ndr_push *_ndr_secdesc; NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -3470,7 +3470,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); if (_ptr_secdesc) { @@ -3479,7 +3479,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n } else { r->secdesc = NULL; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); @@ -3667,7 +3667,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { uint32_t _relative_save_offset; @@ -3678,13 +3678,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n { struct ndr_pull *_ndr_secdesc; NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); ndr->offset = _relative_save_offset; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -3764,7 +3764,7 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo2(struct ndr_print *ndr, const char *name ndr_print_ptr(ndr, "secdesc", r->secdesc); ndr->depth++; if (r->secdesc) { - ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); + ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); } ndr->depth--; ndr_print_spoolss_JobStatus(ndr, "status", r->status); @@ -3898,10 +3898,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_push_relative_ptr1(ndr, r->secdesc)); - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS, r->status)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->priority)); @@ -4032,19 +4032,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->secdesc)); { struct ndr_push *_ndr_secdesc; NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_push_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_push_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->secdesc)); } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -4212,7 +4212,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_secdesc)); if (_ptr_secdesc) { @@ -4221,7 +4221,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n } else { r->secdesc = NULL; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS, &r->status)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->priority)); @@ -4410,7 +4410,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n ndr->flags = _flags_save_string; } { - uint32_t _flags_save_security_descriptor = ndr->flags; + uint32_t _flags_save_spoolss_security_descriptor = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4); if (r->secdesc) { uint32_t _relative_save_offset; @@ -4421,13 +4421,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n { struct ndr_pull *_ndr_secdesc; NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_secdesc, 0, -1)); - NDR_CHECK(ndr_pull_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); + NDR_CHECK(ndr_pull_spoolss_security_descriptor(_ndr_secdesc, NDR_SCALARS|NDR_BUFFERS, r->secdesc)); NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_secdesc, 0, -1)); } NDR_PULL_SET_MEM_CTX(ndr, _mem_save_secdesc_0, 0); ndr->offset = _relative_save_offset; } - ndr->flags = _flags_save_security_descriptor; + ndr->flags = _flags_save_spoolss_security_descriptor; } } return NDR_ERR_SUCCESS; @@ -4507,7 +4507,7 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo4(struct ndr_print *ndr, const char *name ndr_print_ptr(ndr, "secdesc", r->secdesc); ndr->depth++; if (r->secdesc) { - ndr_print_security_descriptor(ndr, "secdesc", r->secdesc); + ndr_print_spoolss_security_descriptor(ndr, "secdesc", r->secdesc); } ndr->depth--; ndr_print_spoolss_JobStatus(ndr, "status", r->status); diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h index f3466979a32..bc0b104ef35 100644 --- a/librpc/gen_ndr/spoolss.h +++ b/librpc/gen_ndr/spoolss.h @@ -7,6 +7,7 @@ #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/winreg.h" +#define spoolss_security_descriptor security_descriptor #ifndef _HEADER_spoolss #define _HEADER_spoolss @@ -334,7 +335,7 @@ struct spoolss_PrinterInfo2 { const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ - struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ + struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ uint32_t attributes; uint32_t priority;/* [range(0,99)] */ uint32_t defaultpriority; @@ -346,7 +347,7 @@ struct spoolss_PrinterInfo2 { }/* [gensize,public] */; struct spoolss_PrinterInfo3 { - struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ + struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ }/* [gensize,public] */; struct spoolss_PrinterInfo4 { @@ -430,7 +431,7 @@ struct spoolss_JobInfo2 { const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ - struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ + struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ uint32_t status; uint32_t priority;/* [range(0,99)] */ uint32_t position; @@ -462,7 +463,7 @@ struct spoolss_JobInfo4 { const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ - struct security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ + struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ uint32_t status; uint32_t priority;/* [range(0,99)] */ uint32_t position; diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index d69e9f36b24..b55def0846c 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -5,6 +5,9 @@ */ import "misc.idl", "security.idl", "winreg.idl"; + +cpp_quote("#define spoolss_security_descriptor security_descriptor") + [ uuid("12345678-1234-abcd-ef00-0123456789ab"), version(1.0), endpoint("ncacn_np:[\\pipe\\spoolss]"), @@ -287,7 +290,7 @@ import "misc.idl", "security.idl", "winreg.idl"; [relative] nstring *printprocessor; [relative] nstring *datatype; [relative] nstring *parameters; - [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; spoolss_PrinterAttributes attributes; [range(0,99)] uint32 priority; uint32 defaultpriority; @@ -299,7 +302,7 @@ import "misc.idl", "security.idl", "winreg.idl"; } spoolss_PrinterInfo2; typedef [public,gensize] struct { - [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; } spoolss_PrinterInfo3; typedef [public,gensize] struct { @@ -430,7 +433,7 @@ import "misc.idl", "security.idl", "winreg.idl"; [relative] nstring *driver_name; [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; [relative] nstring *text_status; - [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; spoolss_JobStatus status; [range(0,99)] uint32 priority; uint32 position; @@ -462,7 +465,7 @@ import "misc.idl", "security.idl", "winreg.idl"; [relative] nstring *driver_name; [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; [relative] nstring *text_status; - [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_security_descriptor *secdesc; spoolss_JobStatus status; [range(0,99)] uint32 priority; uint32 position; diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c index 1a58ac15ebc..b86f434fa40 100644 --- a/librpc/ndr/ndr_spoolss_buf.c +++ b/librpc/ndr/ndr_spoolss_buf.c @@ -24,6 +24,7 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_spoolss.h" +#include "librpc/gen_ndr/ndr_security.h" #if (_SAMBA_BUILD_ >= 4) #include "param/param.h" #endif @@ -1221,3 +1222,57 @@ void ndr_print_spoolss_Field(struct ndr_print *ndr, const char *name, const unio } } +void ndr_print_spoolss_security_descriptor(struct ndr_print *ndr, const char *name, const struct security_descriptor *r) +{ + ndr_print_security_descriptor(ndr, name, r); +} + +enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r) +{ + uint32_t _flags_save_STRUCT = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NO_RELATIVE_REVERSE); + NDR_CHECK(ndr_pull_security_descriptor(ndr, ndr_flags, r)); + ndr->flags = _flags_save_STRUCT; + return NDR_ERR_SUCCESS; +} + +enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r) +{ + { + uint32_t _flags_save_STRUCT = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_LITTLE_ENDIAN|LIBNDR_FLAG_NO_RELATIVE_REVERSE); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_push_align(ndr, 4)); + NDR_CHECK(ndr_push_security_descriptor_revision(ndr, NDR_SCALARS, r->revision)); + NDR_CHECK(ndr_push_security_descriptor_type(ndr, NDR_SCALARS, r->type)); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->owner_sid)); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->group_sid)); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->sacl)); + NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dacl)); + } + if (ndr_flags & NDR_BUFFERS) { + if (r->sacl) { + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sacl)); + NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->sacl)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sacl)); + } + if (r->dacl) { + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dacl)); + NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->dacl)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dacl)); + } + if (r->owner_sid) { + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->owner_sid)); + NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->owner_sid)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->owner_sid)); + } + if (r->group_sid) { + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->group_sid)); + NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->group_sid)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->group_sid)); + } + } + ndr->flags = _flags_save_STRUCT; + } + return NDR_ERR_SUCCESS; +} diff --git a/librpc/ndr/ndr_spoolss_buf.h b/librpc/ndr/ndr_spoolss_buf.h index aa6e277c5f3..e72d16a8394 100644 --- a/librpc/ndr/ndr_spoolss_buf.h +++ b/librpc/ndr/ndr_spoolss_buf.h @@ -50,6 +50,9 @@ size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray *r, struct _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo101(struct ndr_push *ndr, int ndr_flags, const struct spoolss_DriverInfo101 *r); _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo101(struct ndr_pull *ndr, int ndr_flags, struct spoolss_DriverInfo101 *r); void ndr_print_spoolss_Field(struct ndr_print *ndr, const char *name, const union spoolss_Field *r); +void ndr_print_spoolss_security_descriptor(struct ndr_print *ndr, const char *name, const struct security_descriptor *r); +enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r); +enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r); #undef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) -- 2.11.4.GIT