Changeset 596 for trunk/server/librpc/idl

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

Location:

trunk/server/librpc/idl

Files:

• dcerpc.idl (modified) (1 diff)
• idl_types.h (modified) (2 diffs)
• spoolss.idl (modified) (3 diffs)

trunk/server/librpc/idl/dcerpc.idl

@@ -106 +106 @@
         const int DCERPC_FAULT_ACCESS_DENIED      = 0x00000005;
         const int DCERPC_FAULT_CANT_PERFORM       = 0x000006d8;
+        const int DCERPC_FAULT_SEC_PKG_ERROR      = 0x00000721;
 
         /* we return this fault when we haven't yet run the test

trunk/server/librpc/idl/idl_types.h

@@ -13 +13 @@
   a null terminated UCS2 string
 */
-#define nstring         [flag(STR_NULLTERM)] string
+#define nstring         [flag(STR_NULLTERM|NDR_ALIGN2)] string
 
 /*
@@ -51 +51 @@
   a null terminated UCS2 string
 */
-#define nstring_array   [flag(STR_NULLTERM)] string_array
+#define nstring_array   [flag(STR_NULLTERM|NDR_ALIGN2)] string_array
 
 #define NDR_NOALIGN       LIBNDR_FLAG_NOALIGN

trunk/server/librpc/idl/spoolss.idl

@@ -18 +18 @@
 {
         typedef [v1_enum] enum winreg_Type winreg_Type;
-        typedef [gensize] struct {
+        typedef [gensize,noprint] struct {
                 uint16 year;
                 uint16 month;
@@ -1257 +1257 @@
                 [relative] nstring *driver_name;
                 [relative] nstring *architecture;
-                [relative] [size_is(file_count)] spoolss_DriverFileInfo *file_info;
+                [relative,size_is(file_count),flag(NDR_ALIGN4)] spoolss_DriverFileInfo *file_info;
                 uint32 file_count;
                 [relative] nstring *monitor_name;
@@ -2551 +2551 @@
                 [value(2*strlen_m_term(value_name))] uint32 value_name_len;
                 winreg_Type type;
-                [relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING)] DATA_BLOB *data;
-                [value(data->length)] uint32 data_length;
+                [relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type))] DATA_BLOB *data;
+                [value(data ? data->length : 0)] uint32 data_length;
         } spoolss_PrinterEnumValues;