Changeset 862 for trunk/server/librpc

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)
• librpc/ndr/ndr_ntprinting.c (modified) (3 diffs)
• librpc/ndr/ndr_ntprinting.h (modified) (1 diff)
• librpc/rpc/dcerpc_util.c (modified) (3 diffs)
• librpc/rpc/rpc_common.h (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;
 

trunk/server/librpc/ndr/ndr_ntprinting.c

@@ -23 +23 @@
 #include "../librpc/gen_ndr/ndr_ntprinting.h"
 
+_PUBLIC_ uint32_t ndr_ntprinting_string_flags(uint32_t string_flags)
+{
+        uint32_t flags = LIBNDR_FLAG_STR_NULLTERM;
+
+        if (string_flags & LIBNDR_FLAG_STR_ASCII) {
+                flags |= LIBNDR_FLAG_STR_ASCII;
+        } else {
+                flags |= LIBNDR_FLAG_STR_UTF8;
+        }
+
+        return flags;
+}
+
 _PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int ndr_flags, struct ntprinting_printer *r)
 {
@@ -44 +57 @@
                                 _mem_save_devmode_0 = NDR_PULL_GET_MEM_CTX(ndr);
                                 NDR_PULL_SET_MEM_CTX(ndr, r->devmode, 0);
+                                r->devmode->string_flags = r->info.string_flags;
                                 NDR_CHECK(ndr_pull_ntprinting_devicemode(ndr, NDR_SCALARS|NDR_BUFFERS, r->devmode));
                                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_devmode_0, 0);
@@ -60 +74 @@
                                 r->printer_data = talloc_realloc(ndr, r->printer_data, struct ntprinting_printer_data, r->count + 1);
                                 NDR_ERR_HAVE_NO_MEMORY(r->printer_data);
+                                r->printer_data[r->count].string_flags = r->info.string_flags;
                                 NDR_CHECK(ndr_pull_ntprinting_printer_data(ndr, NDR_SCALARS, &r->printer_data[r->count]));
                                 r->count++;

trunk/server/librpc/ndr/ndr_ntprinting.h

@@ -23 +23 @@
 #include "../librpc/gen_ndr/ndr_ntprinting.h"
 
+_PUBLIC_ uint32_t ndr_ntprinting_string_flags(uint32_t string_flags);
+
 _PUBLIC_ enum ndr_err_code ndr_pull_ntprinting_printer(struct ndr_pull *ndr, int ndr_flags, struct ntprinting_printer *r);

trunk/server/librpc/rpc/dcerpc_util.c

@@ -46 +46 @@
         } else {
                 return RSVAL(blob->data, DCERPC_FRAG_LEN_OFFSET);
+        }
+}
+
+uint32_t dcerpc_get_call_id(const DATA_BLOB *blob)
+{
+        if (CVAL(blob->data,DCERPC_DREP_OFFSET) & DCERPC_DREP_LE) {
+                return IVAL(blob->data, DCERPC_CALL_ID_OFFSET);
+        } else {
+                return RIVAL(blob->data, DCERPC_CALL_ID_OFFSET);
         }
 }
@@ -224 +233 @@
                 ofs = state->buffer.length;
 
+                if (frag_len < ofs) {
+                        /*
+                         * something is wrong, let the caller deal with it
+                         */
+                        *_vector = NULL;
+                        *_count = 0;
+                        return 0;
+                }
+
                 state->buffer.data = talloc_realloc(state,
                                                     state->buffer.data,
@@ -293 +311 @@
         }
 
+        if (state->pkt->frag_length != state->buffer.length) {
+                tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
+                return;
+        }
+
         tevent_req_done(req);
 }

trunk/server/librpc/rpc/rpc_common.h

@@ -136 +136 @@
 void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v);
 uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob);
+uint32_t dcerpc_get_call_id(const DATA_BLOB *blob);
 void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v);
 uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob);