Changeset 988 for vendor/current/librpc/idl/drsuapi.idl

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/librpc/idl/drsuapi.idl (modified) (13 diffs)

vendor/current/librpc/idl/drsuapi.idl

@@ -59 +59 @@
         } drsuapi_DrsOptions;
 
+        /* see DRS_MSG_REPMOD_V1 */
+        typedef [public,bitmap32bit] bitmap {
+                DRSUAPI_DRS_UPDATE_FLAGS              = 0x00000001,
+                DRSUAPI_DRS_UPDATE_ADDRESS            = 0x00000002,
+                DRSUAPI_DRS_UPDATE_SCHEDULE           = 0x00000004
+        } drsuapi_DrsUpdate;
+
         /*****************/
         /* Function 0x00 */
@@ -109 +116 @@
 
         /* this is used by w2k */
-        typedef struct {
+        typedef [public] struct {
                 drsuapi_SupportedExtensions supported_extensions;
                 GUID site_guid;
@@ -116 +123 @@
 
         /* this is used by w2k3 */
-        typedef struct {
+        typedef [public] struct {
                 drsuapi_SupportedExtensions supported_extensions;
                 GUID site_guid;
@@ -123 +130 @@
         } drsuapi_DsBindInfo28;
 
+        typedef [public] struct {
+                drsuapi_SupportedExtensions supported_extensions;
+                GUID site_guid;
+                uint32 pid;
+                uint32 repl_epoch;
+                drsuapi_SupportedExtensionsExt supported_extensions_ext;
+        } drsuapi_DsBindInfo32;
+
         /* this is used by w2k8 */
-        typedef struct {
+        typedef [public] struct {
                 drsuapi_SupportedExtensions supported_extensions;
                 GUID site_guid;
@@ -133 +148 @@
         } drsuapi_DsBindInfo48;
 
-        typedef struct {
+        /* this is used by w2k12 R2 [MS-DRSR] Section 5.39 */
+        typedef [public] struct {
+                drsuapi_SupportedExtensions supported_extensions;
+                GUID site_guid;
+                uint32 pid;
+                uint32 repl_epoch;
+                drsuapi_SupportedExtensionsExt supported_extensions_ext;
+                GUID config_dn_guid;
+                drsuapi_SupportedExtensionsExt supported_capabilities_ext;
+        } drsuapi_DsBindInfo52;
+
+        typedef [public] struct {
                 [flag(NDR_REMAINING)] DATA_BLOB info;
         } drsuapi_DsBindInfoFallBack;
+
+        typedef [nopull, nopush, noprint] [nodiscriminant] union {
+                [case(24)][subcontext(0), subcontext_size(24)] drsuapi_DsBindInfo24 info24;
+                [case(28)][subcontext(0), subcontext_size(28)] drsuapi_DsBindInfo28 info28;
+                [case(32)][subcontext(0), subcontext_size(32)] drsuapi_DsBindInfo32 info32;
+                [case(48)][subcontext(0), subcontext_size(48)] drsuapi_DsBindInfo48 info48;
+                [case(52)][subcontext(0), subcontext_size(52)] drsuapi_DsBindInfo52 info52;
+                /*
+                 * The size for the defaut case is a bit arbitrary it in fact the value
+                 * of the switch but we can't reference it.
+                 * As we hand(un-)marshall this structure it has 0 impact and makes
+                 * pidl happy for wireshark too
+                 */
+                [default][subcontext(0), subcontext_size(48)] drsuapi_DsBindInfoFallBack Fallback;
+        } drsuapi_DsBindInfo;
+
+        /* the drsuapi_DsBindInfoCtr was this before
+         * typedef [flag(NDR_PAHEX)] struct {
+         *      [range(1,10000)] uint32 length;
+         *      [size_is(length)] uint8 data[];
+         * } drsuapi_DsBindInfo;
+         *
+         * but we don't want the caller to manually decode this blob,
+         * so we're doing it here
+         */
+
+        /*
+         * MS-DRSR.pdf gives the following definition
+        typedef struct {
+                [range(1,10000)] DWORD cb;
+                [size_is(cb)] BYTE rgb[];
+        } DRS_EXTENSIONS;
+
+        But we use a subcontext which has a slighly different signification on how
+        data are laid out.
+        With the MS-DRSR definition we will have
+                size_is_cb cv rgb_array
+        with size_is_cb being a uint3264 and cv being a uint32
+
+        We used to have
+        typedef struct {
+                [range(1,10000)] uint32 length;
+                [switch_is(length)] drsuapi_DsBindInfo info;
+        } drsuapi_DsBindInfoCtr;
 
         typedef [nodiscriminant] union {
@@ -144 +214 @@
         } drsuapi_DsBindInfo;
 
-        /* the drsuapi_DsBindInfoCtr was this before
-         * typedef [flag(NDR_PAHEX)] struct {
-         *      [range(1,10000)] uint32 length;
-         *      [size_is(length)] uint8 data[];
-         * } drsuapi_DsBindInfo;
-         *
-         * but we don't want the caller to manually decode this blob,
-         * so we're doing it here
-         */
-
-        typedef struct {
-                [range(1,10000)] uint32 length;
+        With this definition data is laid out this way:
+        length subcontext_size drsuapi_DsBindInfoxx
+        with length being a uint32 and subcontext_size being a uint3264
+
+        It has clearly an impact on the way things are aligned when using NDR64
+        */
+        typedef [flag(NDR_NOALIGN)] struct {
+                [range(1,10000)] uint3264 length;
+                [value(length)] uint32 __ndr_length;
                 [switch_is(length)] drsuapi_DsBindInfo info;
         } drsuapi_DsBindInfoCtr;
@@ -198 +265 @@
                 [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
                 GUID source_dsa_guid;
-                astring *source_dsa_dns; /* Source DSA dns_name in <guid>._msdcs.<domain_dns> form */
+                [charset(DOS),string] char *source_dsa_dns; /* Source DSA dns_name in <guid>._msdcs.<domain_dns> form */
                 drsuapi_DrsOptions options;
         } drsuapi_DsReplicaSyncRequest1;
@@ -393 +460 @@
                 DRSUAPI_ATTID_displayName                       = 0x0002000d,
                 DRSUAPI_ATTID_hasMasterNCs                      = 0x0002000e,
+                DRSUAPI_ATTID_nCName                            = 0x00020010,
                 DRSUAPI_ATTID_subClassOf                        = 0x00020015,
                 DRSUAPI_ATTID_governsID                         = 0x00020016,
@@ -539 +607 @@
         /* Generic DATA_BLOB values */
         typedef struct {
-                [range(0,10485760),value(ndr_size_DATA_BLOB(0,blob,0))] uint32 __ndr_size;
+                [range(0,26214400),value(ndr_size_DATA_BLOB(0,blob,0))] uint32 __ndr_size;
                 DATA_BLOB *blob;
         } drsuapi_DsAttributeValue;
@@ -799 +867 @@
         typedef struct {
                 [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
-                [charset(UTF16),string] uint16 *source_dsa_address;
+                [charset(UTF8), string] uint8 *source_dsa_address;
                 drsuapi_DrsOptions options;
         } drsuapi_DsReplicaDelRequest1;
@@ -1100 +1168 @@
         /*****************/
         /* Function 0x10 */
+        typedef [v1_enum] enum {
+                DRSUAPI_DC_INFO_CTR_1  = 1,
+                DRSUAPI_DC_INFO_CTR_2  = 2,
+                DRSUAPI_DC_INFO_CTR_3  = 3,
+                DRSUAPI_DC_CONNECTION_CTR_01 = 0xFFFFFFFF
+        } drsuapi_DsGetDCInfoCtrLevels;
+
         typedef struct {
                 [charset(UTF16),string] uint16 *domain_name; /* netbios or dns */
-                int32 level; /* specifies the switch level for the request */
+                drsuapi_DsGetDCInfoCtrLevels level; /* specifies the switch level for the request */
         } drsuapi_DsGetDCInfoRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsGetDCInfoRequest1 req1;
         } drsuapi_DsGetDCInfoRequest;
@@ -1197 +1272 @@
         } drsuapi_DsGetDCConnectionCtr01;
 
-        typedef [v1_enum] enum {
-                DRSUAPI_DC_INFO_CTR_1  = 1,
-                DRSUAPI_DC_INFO_CTR_2  = 2,
-                DRSUAPI_DC_INFO_CTR_3  = 3,
-                DRSUAPI_DC_CONNECTION_CTR_01 = -1
-        } drsuapi_DsGetDCInfoCtrLevels;
-
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(drsuapi_DsGetDCInfoCtrLevels)] union {
                 [case(DRSUAPI_DC_INFO_CTR_1)]  drsuapi_DsGetDCInfoCtr1  ctr1;
                 [case(DRSUAPI_DC_INFO_CTR_2)]  drsuapi_DsGetDCInfoCtr2  ctr2;
@@ -1213 +1281 @@
         WERROR drsuapi_DsGetDomainControllerInfo(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref,switch_is(level)] drsuapi_DsGetDCInfoRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] drsuapi_DsGetDCInfoCtrLevels *level_out,
                 [out,ref,switch_is(*level_out)] drsuapi_DsGetDCInfoCtr *ctr
                 );