Changeset 920 for trunk/server/librpc

Timestamp:

Jun 9, 2016, 2:23:12 PM (10 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: apply latest security patches to trunk

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ABI (copied) (copied from vendor/current/librpc/ABI )
• librpc/idl/dcerpc.idl (modified) (5 diffs)
• librpc/idl/idl_types.h (modified) (1 diff)
• librpc/ndr/libndr.h (modified) (8 diffs)
• librpc/ndr/ndr.c (modified) (8 diffs)
• librpc/ndr/ndr_basic.c (modified) (34 diffs)
• librpc/ndr/ndr_dcerpc.c (copied) (copied from vendor/current/librpc/ndr/ndr_dcerpc.c )
• librpc/ndr/ndr_dcerpc.h (copied) (copied from vendor/current/librpc/ndr/ndr_dcerpc.h )
• librpc/ndr/ndr_misc.c (modified) (1 diff)
• librpc/ndr/ndr_ntlmssp.c (modified) (1 diff)
• librpc/ndr/ndr_ntlmssp.h (modified) (1 diff)
• librpc/rpc/dcerpc_util.c (modified) (5 diffs)
• librpc/rpc/rpc_common.h (modified) (2 diffs)
• librpc/wscript_build (modified) (1 diff)

trunk/server/librpc/idl/dcerpc.idl

@@ -10 +10 @@
 */
 import "misc.idl";
+
+
 
 interface dcerpc
@@ -454 +456 @@
 
         /* pfc_flags values */
-        const uint8 DCERPC_PFC_FLAG_FIRST               = 0x01; /* First fragment */
-        const uint8 DCERPC_PFC_FLAG_LAST                = 0x02; /* Last fragment */
-        const uint8 DCERPC_PFC_FLAG_PENDING_CANCEL      = 0x04; /* Cancel was pending at sender */
-        const uint8 DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN = DCERPC_PFC_FLAG_PENDING_CANCEL; /* depends on the pdu type */
-        const uint8 DCERPC_PFC_FLAG_CONC_MPX            = 0x10; /* supports concurrent multiplexing of a single connection. */
-        const uint8 DCERPC_PFC_FLAG_DID_NOT_EXECUTE     = 0x20; /* on a fault it means the server hasn't done anything */
-        const uint8 DCERPC_PFC_FLAG_MAYBE               = 0x40; /* `maybe' call semantics requested */
-        const uint8 DCERPC_PFC_FLAG_OBJECT_UUID         = 0x80; /* on valid guid is in the optional object field */
+        typedef [bitmap8bit] bitmap {
+                DCERPC_PFC_FLAG_FIRST           = 0x01, /* First fragment */
+                DCERPC_PFC_FLAG_LAST            = 0x02, /* Last fragment */
+                DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING = 0x04, /* depends on the pdu type */
+                DCERPC_PFC_FLAG_CONC_MPX        = 0x10, /* supports concurrent multiplexing of a single connection. */
+                DCERPC_PFC_FLAG_DID_NOT_EXECUTE = 0x20, /* on a fault it means the server hasn't done anything */
+                DCERPC_PFC_FLAG_MAYBE           = 0x40, /* `maybe' call semantics requested */
+                DCERPC_PFC_FLAG_OBJECT_UUID     = 0x80 /* on valid guid is in the optional object field */
+        } dcerpc_pfc_flags;
+
+        /* Cancel was pending at sender */
+        const int DCERPC_PFC_FLAG_PENDING_CANCEL =
+                DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING;
+        const ist DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN =
+                DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING;
 
         /* these offsets are needed by the signing code */
@@ -467 +476 @@
         const uint8 DCERPC_DREP_OFFSET     =  4;
         const uint8 DCERPC_FRAG_LEN_OFFSET =  8;
+
         const uint8 DCERPC_AUTH_LEN_OFFSET = 10;
         const uint8 DCERPC_CALL_ID_OFFSET  = 12;
+
+
 
         /* little-endian flag */
@@ -477 +489 @@
                 uint8 rpc_vers_minor;   /* Minor version */
                 dcerpc_pkt_type ptype;  /* Packet type */
-                uint8 pfc_flags;        /* Fragmentation flags */
+                 /* Fragmentation flags */
                 uint8 drep[4];          /* NDR data representation */
                 uint16 frag_length;     /* Total length of fragment */
@@ -507 +519 @@
                 [switch_is(ptype)] dcerpc_payload u;
         } ncadg_packet;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/server/librpc/idl/idl_types.h

@@ -48 +48 @@
 #define NDR_RELATIVE_REVERSE LIBNDR_FLAG_RELATIVE_REVERSE
 #define NDR_NO_RELATIVE_REVERSE LIBNDR_FLAG_NO_RELATIVE_REVERSE
+
+

trunk/server/librpc/ndr/libndr.h

@@ -125 +125 @@
 #define LIBNDR_STRING_FLAGS             (0x7FFC)
 
+
+
+
+
+
+
+