Changeset 862 for trunk/server/librpc/idl

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/idl/dcerpc.idl (modified) (1 diff)
• librpc/idl/ntprinting.idl (modified) (4 diffs)
• librpc/idl/security.idl (modified) (1 diff)
• librpc/idl/spoolss.idl (modified) (1 diff)

trunk/server/librpc/idl/dcerpc.idl

@@ -468 +468 @@
         const uint8 DCERPC_FRAG_LEN_OFFSET =  8;
         const uint8 DCERPC_AUTH_LEN_OFFSET = 10;
+        const uint8 DCERPC_CALL_ID_OFFSET  = 12;
 
         /* little-endian flag */

trunk/server/librpc/idl/ntprinting.idl

@@ -31 +31 @@
                 );
 
-        /* Samba 3 tdb storage format: drivers
+        /*
+         * First the string flags and then the Samba 3 tdb storage
+         * format: drivers
          * "dffffffff" followed by a remaining buffer of "f" array */
 
         typedef [flag(NDR_NOALIGN),public] struct {
+                [skip] uint32 string_flags;
+
                 uint32 version;
-                utf8string name;
-                utf8string environment;
-                utf8string driverpath;
-                utf8string datafile;
-                utf8string configfile;
-                utf8string helpfile;
-                utf8string monitorname;
-                utf8string defaultdatatype;
-                [flag(STR_UTF8|STR_NOTERM|NDR_REMAINING)] string_array dependent_files;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string name;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string environment;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string driverpath;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string datafile;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string configfile;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string helpfile;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string monitorname;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string defaultdatatype;
+                [flag((ndr_ntprinting_string_flags(r->string_flags)&~STR_NULLTERM)|STR_NOTERM|NDR_REMAINING)] string_array dependent_files;
         } ntprinting_driver;
 
@@ -58 +62 @@
 
         typedef [flag(NDR_NOALIGN),public] struct {
+                [skip] uint32 string_flags;
+
                 /* uint32 devicemode_ptr; */
-                utf8string devicename;
-                utf8string formname;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string devicename;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string formname;
                 uint16 specversion;
                 uint16 driverversion;
@@ -96 +102 @@
         } ntprinting_devicemode;
 
-        /* Samba 3 tdb storage format: printer_data
+        /*
+         * First the string flags and then the Samba 3 tdb storage
+         * format: printer_data
          * "p" ptr to printer_data
          * "fdB" */
 
         typedef [flag(NDR_NOALIGN),public] struct {
+                [skip] uint32 string_flags;
+
                 uint32 ptr;
-                utf8string name;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string name;
                 uint32 type;
                 DATA_BLOB data;
         } ntprinting_printer_data;
 
-        /* Samba 3 tdb storage format: printer_info
-         * "dddddddddddfffffPfffff" */
+        /*
+         * First the string flags and then the Samba 3 tdb storage
+         * format: printer_info
+         * "dddddddddddfffffPfffff"
+         */
 
         typedef [flag(NDR_NOALIGN),public] struct {
+                [skip] uint32 string_flags;
+
                 uint32 attributes;
                 uint32 priority;
@@ -122 +137 @@
                 uint32 c_setprinter;
                 uint32 setuptime;
-                utf8string servername;
-                utf8string printername;
-                utf8string sharename;
-                utf8string portname;
-                utf8string drivername;
-                utf8string comment;
-                utf8string location;
-                utf8string sepfile;
-                utf8string printprocessor;
-                utf8string datatype;
-                utf8string parameters;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string servername;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string printername;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string sharename;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string portname;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string drivername;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string comment;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string location;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string sepfile;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string printprocessor;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string datatype;
+                [flag(ndr_ntprinting_string_flags(r->string_flags))] string parameters;
         } ntprinting_printer_info;
 

trunk/server/librpc/idl/security.idl

@@ -594 +594 @@
                 SECINFO_SACL                 = 0x00000008,
                 SECINFO_LABEL                = 0x00000010,
+                SECINFO_ATTRIBUTE            = 0x00000020,
+                SECINFO_SCOPE                = 0x00000040,
+                SECINFO_BACKUP               = 0x00010000,
                 SECINFO_UNPROTECTED_SACL     = 0x10000000,
                 SECINFO_UNPROTECTED_DACL     = 0x20000000,

trunk/server/librpc/idl/spoolss.idl

@@ -1304 +1304 @@
                 SPOOLSS_DRIVER_VERSION_NT35     = 1,
                 SPOOLSS_DRIVER_VERSION_NT4      = 2,
-                SPOOLSS_DRIVER_VERSION_200X     = 3
+                SPOOLSS_DRIVER_VERSION_200X     = 3,
+                SPOOLSS_DRIVER_VERSION_2012     = 4
         } spoolss_DriverOSVersion;