diff options
author | Günther Deschner <gd@samba.org> | 2016-11-11 16:29:20 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2016-11-18 08:57:26 +0100 |
commit | d5eb0038f91b738b4cacf7ed0bb2e8a21f6e8ad4 (patch) | |
tree | 05d16d9e4c3bc77061618355a30d9afad86633a8 /librpc | |
parent | b9f3bc8a15569c014ffdb6f5a3d81b015ccc489b (diff) | |
download | samba-d5eb0038f91b738b4cacf7ed0bb2e8a21f6e8ad4.tar.gz |
spoolss: Use correct values for secdesc and devmode pointers
ULONG_PTR needs to be decoded as a uint3264 and not as a 'uint32 *'.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11197
Guenther
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 73f664710a8c9b312a54d0cf41d2f4440c8b42eb)
Diffstat (limited to 'librpc')
-rw-r--r-- | librpc/idl/spoolss.idl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index 5bbc2670a06..d17fcf4e4d8 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -1011,9 +1011,9 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") [string,charset(UTF16)] uint16 *print_processor; [string,charset(UTF16)] uint16 *parameters; [string,charset(UTF16)] uint16 *driver_name; - uint32 *_devmode_ptr; /* pointer to truncated devicemode */ + uint3264 _devmode_ptr; /* ULONG_PTR */ [string,charset(UTF16)] uint16 *text_status; - uint32 *_secdesc_ptr; + uint3264 _secdesc_ptr; /* ULONG_PTR */ spoolss_JobStatus status; [range(0,99)] uint32 priority; uint32 position; @@ -1037,9 +1037,9 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") [string,charset(UTF16)] uint16 *print_processor; [string,charset(UTF16)] uint16 *parameters; [string,charset(UTF16)] uint16 *driver_name; - uint32 *_devmode_ptr; /* pointer to truncated devicemode */ + uint3264 _devmode_ptr; /* ULONG_PTR */ [string,charset(UTF16)] uint16 *text_status; - uint32 *_secdesc_ptr; + uint3264 _secdesc_ptr; /* ULONG_PTR */ spoolss_JobStatus status; [range(0,99)] uint32 priority; uint32 position; @@ -1201,12 +1201,12 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") [string,charset(UTF16)] uint16 *drivername; [string,charset(UTF16)] uint16 *comment; [string,charset(UTF16)] uint16 *location; - uint32 *devmode_ptr; + uint3264 devmode_ptr; /* ULONG_PTR */ [string,charset(UTF16)] uint16 *sepfile; [string,charset(UTF16)] uint16 *printprocessor; [string,charset(UTF16)] uint16 *datatype; [string,charset(UTF16)] uint16 *parameters; - uint32 *secdesc_ptr; + uint3264 secdesc_ptr; /* ULONG_PTR */ spoolss_PrinterAttributes attributes; [range(0,99)] uint32 priority; uint32 defaultpriority; @@ -1218,7 +1218,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") } spoolss_SetPrinterInfo2; typedef struct { - uint32 *sec_desc_ptr; + uint3264 sec_desc_ptr; /* ULONG_PTR */ } spoolss_SetPrinterInfo3; typedef struct { @@ -1245,11 +1245,11 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") } spoolss_SetPrinterInfo7; typedef struct { - uint32 *devmode_ptr; + uint3264 devmode_ptr; /* ULONG_PTR */ } spoolss_SetPrinterInfo8; typedef struct { - uint32 *devmode_ptr; + uint3264 devmode_ptr; /* ULONG_PTR */ } spoolss_SetPrinterInfo9; typedef [ms_union,switch_type(uint32)] union { @@ -2307,7 +2307,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") /* Function: 0x27 */ WERROR spoolss_DeletePort( [in,unique] [string,charset(UTF16)] uint16 *server_name, - [in] uint32 ptr, + [in] uint3264 ptr, /* ULONG_PTR */ [in,ref] [string,charset(UTF16)] uint16 *port_name ); |