diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-02-18 15:36:08 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-02-22 15:50:38 +0100 |
| commit | d05a2faf43dceacf519eeda0e618b66a1a05fb5e (patch) | |
| tree | aa4e871bd3597825ffa66dd660c0d98e5c1dc731 | |
| parent | 9bdbef03a9235c27b8233c90bc91b64de4a9a828 (diff) | |
| download | samba-d05a2faf43dceacf519eeda0e618b66a1a05fb5e.tar.gz | |
spoolss: make all security descriptors and devicemodes 4 byte aligned and add missing subcontexts.
Guenther
(cherry picked from commit 8f52957369bf8ce7591d5d9a1436ccb7e384c612)
(cherry picked from commit a4cb14987143c2c1f28e82e5b6476e079ea051d3)
| -rw-r--r-- | librpc/idl/spoolss.idl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index d4ca3c69e00..6983b3608ae 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -282,12 +282,12 @@ import "misc.idl", "security.idl", "winreg.idl"; [relative] nstring *drivername; [relative] nstring *comment; [relative] nstring *location; - [relative,subcontext(0)] spoolss_DeviceMode *devmode; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; [relative] nstring *sepfile; [relative] nstring *printprocessor; [relative] nstring *datatype; [relative] nstring *parameters; - [relative,subcontext(0)] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; spoolss_PrinterAttributes attributes; [range(0,99)] uint32 priority; uint32 defaultpriority; @@ -299,7 +299,7 @@ import "misc.idl", "security.idl", "winreg.idl"; } spoolss_PrinterInfo2; typedef [public,gensize] struct { - [relative,subcontext(0)] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; } spoolss_PrinterInfo3; typedef [public,gensize] struct { @@ -334,7 +334,7 @@ import "misc.idl", "security.idl", "winreg.idl"; } spoolss_PrinterInfo7; typedef struct { - [relative,subcontext(0)] spoolss_DeviceMode *devmode; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; } spoolss_DeviceModeInfo; typedef [nodiscriminant,relative_base,public,gensize,flag(NDR_RELATIVE_REVERSE)] union { @@ -428,9 +428,9 @@ import "misc.idl", "security.idl", "winreg.idl"; [relative] nstring *print_processor; [relative] nstring *parameters; [relative] nstring *driver_name; - [relative] spoolss_DeviceMode *devmode; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; [relative] nstring *text_status; - [relative] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; spoolss_JobStatus status; [range(0,99)] uint32 priority; uint32 position; @@ -460,9 +460,9 @@ import "misc.idl", "security.idl", "winreg.idl"; [relative] nstring *print_processor; [relative] nstring *parameters; [relative] nstring *driver_name; - [relative] spoolss_DeviceMode *devmode; + [relative,subcontext(0),flag(NDR_ALIGN4)] spoolss_DeviceMode *devmode; [relative] nstring *text_status; - [relative] security_descriptor *secdesc; + [relative,subcontext(0),flag(NDR_ALIGN4)] security_descriptor *secdesc; spoolss_JobStatus status; [range(0,99)] uint32 priority; uint32 position; |