r20419: remove unused ojectSid and NTTIME_1sec cases
[samba.git] / source4 / librpc / idl / drsuapi.idl
index 60bd57cc52dd4c9d3616652870675cb4c892cfb0..d7b4e1705bdfe400fb14b4356bab0eec3eb10f43 100644 (file)
@@ -1,17 +1,20 @@
 #include "idl_types.h"
 
+import "security.idl", "misc.idl", "samr.idl";
+
 [ 
   uuid("e3514235-4b06-11d1-ab04-00c04fc2dcd2"),
   version(4.0),
   endpoint("ncacn_np:[\\pipe\\lsass]","ncacn_np:[\\pipe\\protected_storage]", "ncacn_ip_tcp:", "ncalrpc:"),
   authservice("ldap"),
   helpstring("Active Directory Replication"),
-  pointer_default(unique),
-  pointer_default_top(unique),
-  depends(security)
-] 
+  helper("librpc/ndr/ndr_drsuapi.h"),
+  pointer_default(unique)
+]
 interface drsuapi
 {
+       declare bitmap samr_GroupAttrs;
+
        /*****************/
         /* Function 0x00 */
         typedef [bitmap32bit] bitmap {
@@ -99,30 +102,32 @@ interface drsuapi
         * 
         * maybe the bind_guid could also be the invocation_id see drsuapi_DsReplicaConnection04
         */
-       const string DRSUAPI_DS_BIND_GUID = "e24d201a-4fd6-11d1-a3da-0000f875ae0d";
+       const char *DRSUAPI_DS_BIND_GUID = "e24d201a-4fd6-11d1-a3da-0000f875ae0d";
        /* 
         * this magic guid are needed to fetch the whole tree with drsuapi_DsGetNCChanges()
+        * as administrator and this values are also used in the destination_dsa_guid field
+        * of drsuapi_DsGetNCChangesReq5/8 and the source_dsa_guid is zero.
         */
-       const string DRSUAPI_DS_BIND_GUID_W2K   = "6abec3d1-3054-41c8-a362-5a0c5b7d5d71";
-       const string DRSUAPI_DS_BIND_GUID_W2K3  = "6afab99c-6e26-464a-975f-f58f105218bc";
+       const char *DRSUAPI_DS_BIND_GUID_W2K    = "6abec3d1-3054-41c8-a362-5a0c5b7d5d71";
+       const char *DRSUAPI_DS_BIND_GUID_W2K3   = "6afab99c-6e26-464a-975f-f58f105218bc";
 
        WERROR drsuapi_DsBind(
-               [in]        GUID *bind_guid,
-               [in,out]    drsuapi_DsBindInfoCtr *bind_info,
-               [out,ref]   policy_handle *bind_handle
+               [in,unique]         GUID *bind_guid,
+               [in,out,unique]    drsuapi_DsBindInfoCtr *bind_info,
+               [out]   policy_handle *bind_handle
                );
 
        /*****************/
         /* Function 0x01 */
        WERROR drsuapi_DsUnbind(
-               [in,out,ref] policy_handle *bind_handle
+               [in,out] policy_handle *bind_handle
                );
 
        /*****************/
        /* Function 0x02 */
-       typedef [gensize] struct {
+       typedef [public,gensize] struct {
                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r, ndr->flags)-4)] uint32 __ndr_size;
-               [value(ndr_length_dom_sid(&r->sid))]  uint32 __ndr_size_sid;
+               [value(ndr_size_dom_sid28(&r->sid, ndr->flags))]  uint32 __ndr_size_sid;
                GUID guid;
                dom_sid28 sid;
                [flag(STR_SIZE4|STR_CHARLEN|STR_CONFORMANT)] string dn;
@@ -167,7 +172,7 @@ interface drsuapi
        } drsuapi_DsReplicaSyncRequest;
 
        WERROR drsuapi_DsReplicaSync(
-               [in,ref] policy_handle *bind_handle,
+               [in] policy_handle *bind_handle,
                [in] int32 level,
                [in,switch_is(level)] drsuapi_DsReplicaSyncRequest req
                );
@@ -194,9 +199,8 @@ interface drsuapi
        } drsuapi_DsReplicaCoursorCtrEx;
 
        typedef [public] bitmap {
-               /* the _WRITEABLE flag seems to indicate a replication with all attributes,
-                * and I'm currently always on error when it's set, but w2k and w2k3 uses it
-                * in the dc join
+               /* the _WRITEABLE flag indicates a replication with all attributes
+                *
                 * --metze
                 */
                DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE                          = 0x00000010,
@@ -205,8 +209,8 @@ interface drsuapi
                DRSUAPI_DS_REPLICA_NEIGHBOUR_USE_ASYNC_INTERSIDE_TRANSPORT      = 0x00000080,
                DRSUAPI_DS_REPLICA_NEIGHBOUR_TWO_WAY_SYNC                       = 0x00000200,
                DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS              = 0x00000800,
-               DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_IN_PROGRESS                   = 0x00010000,
-               DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_NEXT_PACKET                   = 0x00020000,
+               DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_IN_PROGRESS                   = 0x00001000, /* was 0x00010000, */
+               DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_NEXT_PACKET                   = 0x00002000, /* was 0x00020000, */
                DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED                       = 0x00200000,
                DRSUAPI_DS_REPLICA_NEIGHBOUR_PREEMPTED                          = 0x01000000,
                DRSUAPI_DS_REPLICA_NEIGHBOUR_IGNORE_CHANGE_NOTIFICATIONS        = 0x04000000,
@@ -227,72 +231,20 @@ interface drsuapi
 
        typedef struct {
                GUID destination_dsa_guid;
-               GUID source_dsa_guid;
+               GUID source_dsa_invocation_id; /* the 'invocationId' field of the CN=NTDS Settings object */
                [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
                drsuapi_DsReplicaHighWaterMark highwatermark;
                drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
                drsuapi_DsReplicaNeighbourFlags replica_flags;
-               uint32 unknown2;
-               uint32 unknown3;
+               uint32 max_object_count; /* w2k3 uses min(133,max(100,max_object_count)) */
+               uint32 max_ndr_size; /* w2k3 seems to ignore this */
                uint32 unknown4;
                hyper h1;
        } drsuapi_DsGetNCChangesRequest5;
 
-       typedef [flag(NDR_PAHEX)] struct {
-               [range(0,10000)] uint32 length;
-               [size_is(length)] uint8 *byte_array;
-       } drsuapi_DsGetNCChangesRequest_Ctr14;
-
-       typedef struct {
-               uint32 unknown1;
-               drsuapi_DsGetNCChangesRequest_Ctr14 data;
-       } drsuapi_DsGetNCChangesRequest_Ctr13;
-
-       typedef struct {
-               [range(0,0x100000)] uint32 count;
-               [size_is(count)] drsuapi_DsGetNCChangesRequest_Ctr13 *array;
-       } drsuapi_DsGetNCChangesRequest_Ctr12;
-
-       typedef struct {
-               GUID destination_dsa_guid;
-               GUID source_dsa_guid;
-               [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
-               drsuapi_DsReplicaHighWaterMark highwatermark;
-               drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
-               drsuapi_DsReplicaNeighbourFlags replica_flags;
-               uint32 unknown2;
-               uint32 unknown3;
-               uint32 unknown4;
-               hyper h1;
-               uint32 unique_ptr1;
-               uint32 unique_ptr2;
-               drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
-       } drsuapi_DsGetNCChangesRequest8;
-
-       typedef [switch_type(int32)] union {
-               [case(5)] drsuapi_DsGetNCChangesRequest5 req5;
-               [case(8)] drsuapi_DsGetNCChangesRequest8 req8;
-       } drsuapi_DsGetNCChangesRequest;
-
-       typedef [public] struct {
-               GUID source_dsa_invocation_id; /* the 'invocationId' field of the CN=NTDS Settings object */
-               hyper highest_usn;  /* updated after a full replication cycle */
-               NTTIME last_sync_success;
-       } drsuapi_DsReplicaCoursor2;
-
-       typedef struct {
-               uint32 u1;
-               uint32 u2;
-               [range(0,0x100000)] uint32 count;
-               uint32 u3;
-               [size_is(count)] drsuapi_DsReplicaCoursor2 coursors[];
-       } drsuapi_DsReplicaCoursor2CtrEx;
-
        /*
-        * In DRSUAPI the objectClasses and attributes
-        * are identified by uint32 values, but in the schema
-        * they are identified by the governsID (objectClasses)
-        * and attributeID (attributes)
+        * In DRSUAPI all attributes with syntax 2.5.5.2
+        * are identified by uint32 values
         *
         * the following table shows the mapping used between the two representations
         * e.g. - objectClass 'nTDSDSA' has governsID: 1.2.840.113556.1.5.7000.47
@@ -303,36 +255,41 @@ interface drsuapi
         *      - the mapping table gives a UINT32-prefix: 0x00170000
         *      - and the UINT32-ID is 0x0017002F = 0x00170000 | 0x2F
         *
+        * This prefix mapping table is replied in the drsuapi_DsReplicaOIDMapping_Ctr
+        * array. The following are the default mappings of w2k3
+        *
         * OID-prefix                   => UINT32-Id prefix
         *
         * 2.5.4.*                      => 0x00000000 (standard attributes RFC2256 core.schema)
         * 2.5.6.*                      => 0x00010000 (standard object classes RFC2256 core.schema)
         * 1.2.840.113556.1.2.*         => 0x00020000
         * 1.2.840.113556.1.3.*         => 0x00030000
+        * 2.5.5.*                      => 0x00080000 (attributeSyntax OID's)
         * 1.2.840.113556.1.4.*         => 0x00090000
         * 1.2.840.113556.1.5.*         => 0x000A0000
         * 2.16.840.1.113730.3.*        => 0x00140000
         * 0.9.2342.19200300.100.1.*    => 0x00150000
         * 2.16.840.1.113730.3.1.*      => 0x00160000
         * 1.2.840.113556.1.5.7000.*    => 0x00170000
+        * 2.5.21.*                     => 0x00180000 (attrs for SubSchema)
+        * 2.5.18.*                     => 0x00190000 (createTimeStamp,modifyTimeStamp, SubSchema)
         * 2.5.20.*                     => 0x001A0000
+        * 1.3.6.1.4.1.1466.101.119.*   => 0x001B0000 (dynamicObject, entryTTL)
         * 2.16.840.1.113730.3.2.*      => 0x001C0000
         * 1.3.6.1.4.1.250.1.*          => 0x001D0000
+        * 1.2.840.113549.1.9.*         => 0x001E0000 (unstructuredAddress,unstructuredName)
         * 0.9.2342.19200300.100.4.*    => 0x001F0000
         *
-        * 1.2.840.113549.1.9.*         (unstructuredAddress,unstructuredName)
-        * 1.3.6.1.4.1.1466.101.119.2   (dynamicObject)
-        * 1.3.6.1.4.1.1466.101.119.3   (entryTTL)
-        * 2.5.18.*                     (createTimeStamp,modifyTimeStamp, SubSchema)            
-        * 2.5.21.*                     (attrs for SubSchema)
-        *
         * Here's a list of used 'attributeSyntax' OID's
         *
         * 2.5.5.1      => Object(DS-DN) string
         *                 struct drsuapi_DsObjectIdentifier3
         *
         * 2.5.5.2      => OID-string
-        *              => mayContain, mustContain... also have this syntax but have string values
+        *              => all values are represented as uint32 values in drsuapi
+        *              => governsID, attributeID and attributeSyntax returned as OID-Strings in LDAP
+        *              => mayContain, mustContain and all other attributes with 2.5.5.2 syntax
+        *                 are returned as attribute names
         *
         * 2.5.5.4      => String(Teletex) case-insensitive string with teletex charset
         *
@@ -369,35 +326,117 @@ interface drsuapi
         *
         * 2.5.5.17     => dom_sid
         */
+       typedef [nopush,nopull] struct {
+               [range(0,10000),value(ndr_size_drsuapi_DsReplicaOID_oid(r->oid, 0))] uint32 __ndr_size;
+               [size_is(__ndr_size),charset(DOS)] uint8 *oid; /* it's encoded with asn1_write_OID_String() */
+       } drsuapi_DsReplicaOID;
+
+       typedef struct {
+               uint32 id_prefix;
+               drsuapi_DsReplicaOID oid;
+       } drsuapi_DsReplicaOIDMapping;
+
+       typedef struct {
+               [range(0,0x100000)] uint32 num_mappings;
+               [size_is(num_mappings)] drsuapi_DsReplicaOIDMapping *mappings;
+       } drsuapi_DsReplicaOIDMapping_Ctr;
 
        typedef [flag(NDR_PAHEX),v1_enum] enum {
-               DRSUAPI_OBJECTCLASS_top                 = 0x00010000
+               DRSUAPI_OBJECTCLASS_top                 = 0x00010000,
+               DRSUAPI_OBJECTCLASS_classSchema         = 0x0003000d,
+               DRSUAPI_OBJECTCLASS_attributeSchema     = 0x0003000e
        } drsuapi_DsObjectClassId;
 
        typedef [flag(NDR_PAHEX),v1_enum,public] enum {
-               DRSUAPI_ATTRIBUTE_objectClass           = 0x00000000,
-               DRSUAPI_ATTRIBUTE_description           = 0x0000000d,
-               DRSUAPI_ATTRIBUTE_member                = 0x0000001f,
-               DRSUAPI_ATTRIBUTE_hasMasterNCs          = 0x0002000e,
-               DRSUAPI_ATTRIBUTE_invocationId          = 0x00020073,
-               DRSUAPI_ATTRIBUTE_dMDLocation           = 0x00020024,
-               DRSUAPI_ATTRIBUTE_ntSecurityDescriptor  = 0x00020119,
-               DRSUAPI_ATTRIBUTE_objectSid             = 0x00090092,
-               DRSUAPI_ATTRIBUTE_dBCSPwd               = 0x00090037,/* lmPwdHash */
-               DRSUAPI_ATTRIBUTE_unicodePwd            = 0x0009005a,/* ntPwdHash */
-               DRSUAPI_ATTRIBUTE_ntPwdHistory          = 0x0009005e,
-               DRSUAPI_ATTRIBUTE_lmPwdHistory          = 0x000900a0,
-               DRSUAPI_ATTRIBUTE_systemFlags           = 0x00090177,
-               DRSUAPI_ATTRIBUTE_serverReference       = 0x00090203,
-               DRSUAPI_ATTRIBUTE_objectCategory        = 0x0009030e,
-               DRSUAPI_ATTRIBUTE_msDS_Behavior_Version = 0x000905b3,
-               DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs     = 0x0009071c,
-               DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs     = 0x0009072c
+               DRSUAPI_ATTRIBUTE_objectClass                   = 0x00000000,
+               DRSUAPI_ATTRIBUTE_description                   = 0x0000000d,
+               DRSUAPI_ATTRIBUTE_member                        = 0x0000001f,
+               DRSUAPI_ATTRIBUTE_instanceType                  = 0x00020001,
+               DRSUAPI_ATTRIBUTE_whenCreated                   = 0x00020002,
+               DRSUAPI_ATTRIBUTE_hasMasterNCs                  = 0x0002000e,
+               DRSUAPI_ATTRIBUTE_governsID                     = 0x00020016,
+               DRSUAPI_ATTRIBUTE_attributeID                   = 0x0002001e,
+               DRSUAPI_ATTRIBUTE_attributeSyntax               = 0x00020020,
+               DRSUAPI_ATTRIBUTE_isSingleValued                = 0x00020021,
+               DRSUAPI_ATTRIBUTE_rangeLower                    = 0x00020022,
+               DRSUAPI_ATTRIBUTE_rangeUpper                    = 0x00020023,
+               DRSUAPI_ATTRIBUTE_dMDLocation                   = 0x00020024,
+               DRSUAPI_ATTRIBUTE_objectVersion                 = 0x0002004c,
+               DRSUAPI_ATTRIBUTE_invocationId                  = 0x00020073,
+               DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly        = 0x000200a9,
+               DRSUAPI_ATTRIBUTE_adminDisplayName              = 0x000200c2,
+               DRSUAPI_ATTRIBUTE_adminDescription              = 0x000200e2,
+               DRSUAPI_ATTRIBUTE_oMSyntax                      = 0x000200e7,
+               DRSUAPI_ATTRIBUTE_ntSecurityDescriptor          = 0x00020119,
+               DRSUAPI_ATTRIBUTE_searchFlags                   = 0x0002014e,
+               DRSUAPI_ATTRIBUTE_lDAPDisplayName               = 0x000201cc,
+               DRSUAPI_ATTRIBUTE_name                          = 0x00090001,
+               DRSUAPI_ATTRIBUTE_currentValue                  = 0x0009001b,
+               DRSUAPI_ATTRIBUTE_objectSid                     = 0x00090092,
+               DRSUAPI_ATTRIBUTE_schemaIDGUID                  = 0x00090094,
+               DRSUAPI_ATTRIBUTE_dBCSPwd                       = 0x00090037,/* lmPwdHash */
+               DRSUAPI_ATTRIBUTE_unicodePwd                    = 0x0009005a,/* ntPwdHash */
+               DRSUAPI_ATTRIBUTE_ntPwdHistory                  = 0x0009005e,
+               DRSUAPI_ATTRIBUTE_priorValue                    = 0x00090064,
+               DRSUAPI_ATTRIBUTE_supplementalCredentials       = 0x0009007d,
+               DRSUAPI_ATTRIBUTE_trustAuthIncoming             = 0x00090081,
+               DRSUAPI_ATTRIBUTE_trustAuthOutgoing             = 0x00090087,
+               DRSUAPI_ATTRIBUTE_lmPwdHistory                  = 0x000900a0,
+               DRSUAPI_ATTRIBUTE_sAMAccountName                = 0x000900dd,
+               DRSUAPI_ATTRIBUTE_fSMORoleOwner                 = 0x00090171,
+               DRSUAPI_ATTRIBUTE_systemFlags                   = 0x00090177,
+               DRSUAPI_ATTRIBUTE_serverReference               = 0x00090203,
+               DRSUAPI_ATTRIBUTE_serverReferenceBL             = 0x00090204,
+               DRSUAPI_ATTRIBUTE_initialAuthIncoming           = 0x0009021b,
+               DRSUAPI_ATTRIBUTE_initialAuthOutgoing           = 0x0009021c,
+               DRSUAPI_ATTRIBUTE_wellKnownObjects              = 0x0009026a,
+               DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet = 0x0009027f,
+               DRSUAPI_ATTRIBUTE_objectCategory                = 0x0009030e,
+               DRSUAPI_ATTRIBUTE_gPLink                        = 0x0009037b,
+               DRSUAPI_ATTRIBUTE_msDS_Behavior_Version         = 0x000905b3,
+               DRSUAPI_ATTRIBUTE_msDS_KeyVersionNumber         = 0x000906f6,           
+               DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs             = 0x0009071c,
+               DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs             = 0x0009072c
        } drsuapi_DsAttributeId;
 
+       typedef struct {
+               GUID destination_dsa_guid;
+               GUID source_dsa_invocation_id; /* the 'invocationId' field of the CN=NTDS Settings object */
+               [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
+               drsuapi_DsReplicaHighWaterMark highwatermark;
+               drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
+               drsuapi_DsReplicaNeighbourFlags replica_flags;
+               uint32 max_object_count; /* w2k3 uses min(133,max(100,max_object_count)) */
+               uint32 max_ndr_size; /* w2k3 seems to ignore this */
+               uint32 unknown4;
+               hyper h1;
+               uint32 unique_ptr1;
+               uint32 unique_ptr2;
+               drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
+       } drsuapi_DsGetNCChangesRequest8;
+
+       typedef [switch_type(int32)] union {
+               [case(5)] drsuapi_DsGetNCChangesRequest5 req5;
+               [case(8)] drsuapi_DsGetNCChangesRequest8 req8;
+       } drsuapi_DsGetNCChangesRequest;
+
+       typedef [public] struct {
+               GUID source_dsa_invocation_id; /* the 'invocationId' field of the CN=NTDS Settings object */
+               hyper highest_usn;  /* updated after a full replication cycle */
+               NTTIME last_sync_success;
+       } drsuapi_DsReplicaCoursor2;
+
+       typedef struct {
+               uint32 u1;
+               uint32 u2;
+               [range(0,0x100000)] uint32 count;
+               uint32 u3;
+               [size_is(count)] drsuapi_DsReplicaCoursor2 coursors[];
+       } drsuapi_DsReplicaCoursor2CtrEx;
+
        /* Generic DATA_BLOB values */
        typedef struct {
-               [range(0,10485760)] uint32 length;
+               [range(0,10485760),value(ndr_size_DATA_BLOB(0,r->data,0))] uint32 length;
                DATA_BLOB *data;
        } drsuapi_DsAttributeValueDataBlob;
 
@@ -440,9 +479,9 @@ interface drsuapi
        } drsuapi_DsAttributeValueCtrUnicodeString;
 
        /* DN String values */
-       typedef [gensize] struct {
+       typedef [public,gensize] struct {
                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->flags))] uint32 __ndr_size;
-               [value(ndr_length_dom_sid(&r->sid))]  uint32 __ndr_size_sid;
+               [value(ndr_size_dom_sid28(&r->sid,ndr->flags))]  uint32 __ndr_size_sid;
                GUID guid;
                dom_sid28 sid;
                [flag(STR_SIZE4|STR_CHARLEN)] string dn;
@@ -469,83 +508,57 @@ interface drsuapi
                [size_is(num_values)] drsuapi_DsAttributeValueGUID *values;
        } drsuapi_DsAttributeValueCtrGUID;
 
-       /* SID values */
-       typedef struct {
-               [range(0,10485760),value(ndr_size_dom_sid(sid))] uint32 __ndr_size;
-               [subcontext(4)] dom_sid *sid;
-       } drsuapi_DsAttributeValueSID;
-
-       typedef struct {
-               [range(0,10485760)] uint32 num_values;
-               [size_is(num_values)] drsuapi_DsAttributeValueSID *values;
-       } drsuapi_DsAttributeValueCtrSID;
-
-       /* SecurityDescriptor values */
-       typedef struct {
-               [range(0,10485760),value(ndr_size_security_descriptor(sd))] uint32 __ndr_size;
-               [subcontext(4)] security_descriptor *sd;
-       } drsuapi_DsAttributeValueSecurityDescriptor;
-
-       typedef struct {
-               [range(0,10485760)] uint32 num_values;
-               [size_is(num_values)] drsuapi_DsAttributeValueSecurityDescriptor *values;
-       } drsuapi_DsAttributeValueCtrSecurityDescriptor;
-
-       /* NTTIME_1sec values */
-       typedef struct {
-               [range(0,10485760),value(8)] uint32 __ndr_size;
-               [subcontext(4)] NTTIME_1sec *time;
-       } drsuapi_DsAttributeValueNTTIME_1sec;
-
-       typedef struct {
-               [range(0,10485760)] uint32 num_values;
-               [size_is(num_values)] drsuapi_DsAttributeValueNTTIME_1sec *values;
-       } drsuapi_DsAttributeValueCtrNTTIME_1sec;
-
        typedef [nodiscriminant] union {
                [case(DRSUAPI_ATTRIBUTE_objectClass)] drsuapi_DsAttributeValueCtrObjectClassId object_class_id;
+               [case(DRSUAPI_ATTRIBUTE_governsID)]             drsuapi_DsAttributeValueCtrUINT32 oid;
+               [case(DRSUAPI_ATTRIBUTE_attributeID)]           drsuapi_DsAttributeValueCtrUINT32 oid;
+               [case(DRSUAPI_ATTRIBUTE_attributeSyntax)]       drsuapi_DsAttributeValueCtrUINT32 oid;
+
+               /* BOOL */
+               [case(DRSUAPI_ATTRIBUTE_isSingleValued)]        drsuapi_DsAttributeValueCtrUINT32 boolean;
+               [case(DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly)] drsuapi_DsAttributeValueCtrUINT32 boolean;
+               [case(DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet)] drsuapi_DsAttributeValueCtrUINT32 boolean;
 
                /* UINT32 */
-               [case(0x00020001)] drsuapi_DsAttributeValueCtrUINT32 uint32;
-               [case(0x0002004c)] drsuapi_DsAttributeValueCtrUINT32 uint32;
-               [case(0x000200a9)] drsuapi_DsAttributeValueCtrUINT32 uint32;
-               [case(0x00090177)] drsuapi_DsAttributeValueCtrUINT32 uint32;
-               [case(0x000905b3)] drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_instanceType)]          drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_rangeLower)]            drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_rangeUpper)]            drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_objectVersion)]         drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_oMSyntax)]              drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_searchFlags)]           drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_systemFlags)]           drsuapi_DsAttributeValueCtrUINT32 uint32;
+               [case(DRSUAPI_ATTRIBUTE_msDS_Behavior_Version)] drsuapi_DsAttributeValueCtrUINT32 uint32;
 
                /* GUID */
                [case(DRSUAPI_ATTRIBUTE_invocationId)] drsuapi_DsAttributeValueCtrGUID guid;
-
-               /* SID */
-               [case(DRSUAPI_ATTRIBUTE_objectSid)] drsuapi_DsAttributeValueCtrSID sid;
-
-               /* SecurityDescriptor */
-               [case(DRSUAPI_ATTRIBUTE_ntSecurityDescriptor)] drsuapi_DsAttributeValueCtrSecurityDescriptor security_descriptor;
+               [case(DRSUAPI_ATTRIBUTE_schemaIDGUID)] drsuapi_DsAttributeValueCtrGUID guid;
 
                /* UnicodeString */
                [case(DRSUAPI_ATTRIBUTE_description)]           drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
-               [case(0x00090001)]                              drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
-               [case(0x000900dd)]                              drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
-               [case(0x0009037b)]                              drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
+               [case(DRSUAPI_ATTRIBUTE_adminDisplayName)]      drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
+               [case(DRSUAPI_ATTRIBUTE_adminDescription)]      drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
+               [case(DRSUAPI_ATTRIBUTE_lDAPDisplayName)]       drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
+               [case(DRSUAPI_ATTRIBUTE_name)]                  drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
+               [case(DRSUAPI_ATTRIBUTE_sAMAccountName)]        drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
+               [case(DRSUAPI_ATTRIBUTE_gPLink)]                drsuapi_DsAttributeValueCtrUnicodeString unicode_string;
 
                /* DN String */
                [case(DRSUAPI_ATTRIBUTE_member)]                drsuapi_DsAttributeValueCtrDNString dn_string;
                [case(DRSUAPI_ATTRIBUTE_objectCategory)]        drsuapi_DsAttributeValueCtrDNString dn_string;
-               [case(0x0002000e)]                              drsuapi_DsAttributeValueCtrDNString dn_string;
-               [case(0x00020024)]                              drsuapi_DsAttributeValueCtrDNString dn_string;
-               [case(0x00090171)]                              drsuapi_DsAttributeValueCtrDNString dn_string;
-               [case(0x0009071c)]                              drsuapi_DsAttributeValueCtrDNString dn_string;
-               [case(0x0009072c)]                              drsuapi_DsAttributeValueCtrDNString dn_string;
-               [case(0x0009026a)]                              drsuapi_DsAttributeValueCtrDNString dn_string;
-               [case(0x00090203)]                              drsuapi_DsAttributeValueCtrDNString dn_string;
-
-               /* NTTIME_1sec */
-               [case(0x00020002)] drsuapi_DsAttributeValueCtrNTTIME_1sec nttime_1sec;
+               [case(DRSUAPI_ATTRIBUTE_hasMasterNCs)]          drsuapi_DsAttributeValueCtrDNString dn_string;
+               [case(DRSUAPI_ATTRIBUTE_dMDLocation)]           drsuapi_DsAttributeValueCtrDNString dn_string;
+               [case(DRSUAPI_ATTRIBUTE_fSMORoleOwner)]         drsuapi_DsAttributeValueCtrDNString dn_string;
+               [case(DRSUAPI_ATTRIBUTE_wellKnownObjects)]      drsuapi_DsAttributeValueCtrDNString dn_string;
+               [case(DRSUAPI_ATTRIBUTE_serverReference)]       drsuapi_DsAttributeValueCtrDNString dn_string;
+               [case(DRSUAPI_ATTRIBUTE_serverReferenceBL)]     drsuapi_DsAttributeValueCtrDNString dn_string;
+               [case(DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs)]     drsuapi_DsAttributeValueCtrDNString dn_string;
+               [case(DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs)]     drsuapi_DsAttributeValueCtrDNString dn_string;
 
                /* the default is the DATA_BLOB */
                [default] drsuapi_DsAttributeValueCtrDataBlob data_blob;
        } drsuapi_DsReplicaAttributeValueCtr;
 
-       typedef struct {
+       typedef [public] struct {
                drsuapi_DsAttributeId attid;
                [switch_is(attid)] drsuapi_DsReplicaAttributeValueCtr value_ctr;
        } drsuapi_DsReplicaAttribute;
@@ -581,15 +594,15 @@ interface drsuapi
                drsuapi_DsReplicaMetaDataCtr *meta_data_ctr;
        } drsuapi_DsReplicaObjectListItemEx;
 
-       typedef [gensize] struct {
-               GUID guid1;
-               GUID guid2;
+       typedef [public,gensize] struct {
+               GUID source_dsa_guid; /* the 'objectGUID' field of the CN=NTDS Settings object */
+               GUID source_dsa_invocation_id; /* the 'invocationId' field of the CN=NTDS Settings object */
                drsuapi_DsReplicaObjectIdentifier *naming_context;
                drsuapi_DsReplicaHighWaterMark old_highwatermark;
                drsuapi_DsReplicaHighWaterMark new_highwatermark;
                drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
-               drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
-               uint32 unknown1;
+               drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
+               uint32 total_object_count;
                uint32 object_count;
                /* this +55 is sometimes +56, so I don't know where this comes from... --metze */
                [value(ndr_size_drsuapi_DsGetNCChangesCtr1(r,ndr->flags)+55)] uint32 __ndr_size;
@@ -609,17 +622,18 @@ interface drsuapi
                drsuapi_DsReplicaMetaData meta_data;
        } drsuapi_DsReplicaLinkedAttribute;
 
-       typedef struct {
-               GUID guid1;
-               GUID guid2;
+       typedef [public,gensize] struct {
+               GUID source_dsa_guid; /* the 'objectGUID' field of the CN=NTDS Settings object */
+               GUID source_dsa_invocation_id; /* the 'invocationId' field of the CN=NTDS Settings object */
                drsuapi_DsReplicaObjectIdentifier *naming_context;
                drsuapi_DsReplicaHighWaterMark old_highwatermark;
                drsuapi_DsReplicaHighWaterMark new_highwatermark;
                drsuapi_DsReplicaCoursor2CtrEx *uptodateness_vector;
-               drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
-               uint32 unknown1;
-               uint32 unknown2;
-               uint32 unknown3;
+               drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
+               uint32 total_object_count;
+               uint32 object_count;
+               /* this +55 is sometimes +56, so I don't know where this comes from... --metze */
+               [value(ndr_size_drsuapi_DsGetNCChangesCtr6(r,ndr->flags)+55)] uint32 __ndr_size;
                drsuapi_DsReplicaObjectListItemEx *first_object;
                uint32 unknown4;
                uint32 unknown5;
@@ -697,7 +711,7 @@ interface drsuapi
        } drsuapi_DsGetNCChangesCtr;
 
        WERROR drsuapi_DsGetNCChanges(
-               [in,ref] policy_handle *bind_handle,
+               [in] policy_handle *bind_handle,
                [in,out] int32 level,
                [in,switch_is(level)] drsuapi_DsGetNCChangesRequest req,
                [out,switch_is(level)] drsuapi_DsGetNCChangesCtr ctr
@@ -715,7 +729,7 @@ interface drsuapi
 
        typedef struct {
                [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
-               [ref] ascstr *dest_dsa_dns_name;
+               [ref,charset(DOS),string] uint8 *dest_dsa_dns_name;
                GUID dest_dsa_guid;
                drsuapi_DsReplicaUpdateRefsOptions options;
        } drsuapi_DsReplicaUpdateRefsRequest1;
@@ -725,7 +739,7 @@ interface drsuapi
        } drsuapi_DsReplicaUpdateRefsRequest;
 
        WERROR drsuapi_DsReplicaUpdateRefs(
-               [in,ref] policy_handle *bind_handle,
+               [in] policy_handle *bind_handle,
                [in] int32 level,
                [in,switch_is(level)] drsuapi_DsReplicaUpdateRefsRequest req
                );
@@ -765,7 +779,51 @@ interface drsuapi
 
        /*****************/
         /* Function 0x09 */
-       WERROR DRSUAPI_GET_MEMBERSHIPS();
+
+       /* how are type 4 and 7 different from 2 and 3 ? */
+       typedef [v1_enum] enum {
+               DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_AND_DOMAIN_GROUPS = 1,
+               DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS  = 2,
+               DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS        = 3,
+               DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS2 = 4,
+               DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_GROUPS     = 5,
+               DRSUAPI_DS_MEMBERSHIP_TYPE_GROUPMEMBERS         = 6,
+               DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS2       = 7
+       } drsuapi_DsMembershipType;
+
+       typedef struct {
+               NTSTATUS status;
+               [range(0,10000)] uint32 num_memberships;
+               [range(0,10000)] uint32 num_sids;
+               [size_is(num_memberships)] drsuapi_DsReplicaObjectIdentifier **info_array;
+               [size_is(num_memberships)] samr_GroupAttrs *group_attrs;
+               [size_is(num_sids)] dom_sid28 **sids;
+       } drsuapi_DsGetMembershipsCtr1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_DsGetMembershipsCtr1 ctr1;
+       } drsuapi_DsGetMembershipsCtr;
+
+       const int DRSUAPI_DS_MEMBERSHIP_FLAG_GROUP_ATTR = 0x1;
+
+       typedef struct {
+               [range(1,10000)] uint32 count;
+               [size_is(count)] drsuapi_DsReplicaObjectIdentifier **info_array;
+               uint32 flags;
+               drsuapi_DsMembershipType type;
+               drsuapi_DsReplicaObjectIdentifier *domain;
+       } drsuapi_DsGetMembershipsRequest1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_DsGetMembershipsRequest1 req1;
+       } drsuapi_DsGetMembershipsRequest;
+
+       WERROR drsuapi_DsGetMemberships(
+               [in] policy_handle *bind_handle,
+               [in,out] int32 level,
+               [in] [switch_is(level)] drsuapi_DsGetMembershipsRequest req,
+               [out] [switch_is(level)] drsuapi_DsGetMembershipsCtr ctr
+               );
 
        /*****************/
         /* Function 0x0a */
@@ -811,12 +869,12 @@ interface drsuapi
        } drsuapi_DsNameFormat;
 
        typedef struct {
-               unistr *str;
+               [string,charset(UTF16)] uint16 *str;
        } drsuapi_DsNameString;
 
        typedef struct {
-               uint32 unknown1; /* 0x000004e4 */
-               uint32 unknown2; /* 0x00000407 */
+               uint32 codepage; /* 0x000004e4 - 1252 is german codepage*/
+               uint32 language; /* 0x00000407 - german language ID*/
                drsuapi_DsNameFlags format_flags;
                drsuapi_DsNameFormat format_offered;
                drsuapi_DsNameFormat format_desired;
@@ -830,8 +888,8 @@ interface drsuapi
 
        typedef struct {
                drsuapi_DsNameStatus status;
-               unistr *dns_domain_name;
-               unistr *result_name;
+               [charset(UTF16),string] uint16 *dns_domain_name;
+               [charset(UTF16),string] uint16 *result_name;
        } drsuapi_DsNameInfo1;
 
        typedef struct {
@@ -844,7 +902,7 @@ interface drsuapi
        } drsuapi_DsNameCtr;
 
        WERROR drsuapi_DsCrackNames(
-               [in,ref] policy_handle *bind_handle,
+               [in] policy_handle *bind_handle,
                [in, out] int32 level,
                [in,switch_is(level)] drsuapi_DsNameRequest req,
                [out,switch_is(level)] drsuapi_DsNameCtr ctr
@@ -861,7 +919,7 @@ interface drsuapi
        typedef struct {
                drsuapi_DsSpnOperation operation;
                uint32 unknown1;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *object_dn;
                [range(0,10000)] uint32 count;
                [size_is(count)] drsuapi_DsNameString *spn_names;
        } drsuapi_DsWriteAccountSpnRequest1;
@@ -879,15 +937,38 @@ interface drsuapi
        } drsuapi_DsWriteAccountSpnResult;
 
        WERROR drsuapi_DsWriteAccountSpn(
-               [in,ref] policy_handle *bind_handle,
-               [in, out] int32 level,
+               [in] policy_handle *bind_handle,
+               [in,out] int32 level,
                [in,switch_is(level)] drsuapi_DsWriteAccountSpnRequest req,
                [out,switch_is(level)] drsuapi_DsWriteAccountSpnResult res
                );
 
        /*****************/
         /* Function 0x0e */
-       WERROR DRSUAPI_REMOVE_DS_SERVER();
+       typedef struct {
+               [charset(UTF16),string] uint16 *server_dn;
+               [charset(UTF16),string] uint16 *domain_dn;
+               uint32 unknown; /* 0x000000001 */
+       } drsuapi_DsRemoveDSServerRequest1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_DsRemoveDSServerRequest1 req1;
+       } drsuapi_DsRemoveDSServerRequest;
+
+       typedef struct {
+               WERROR status;
+       } drsuapi_DsRemoveDSServerResult1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_DsRemoveDSServerResult1 res1;
+       } drsuapi_DsRemoveDSServerResult;
+
+       WERROR drsuapi_DsRemoveDSServer(
+               [in] policy_handle *bind_handle,
+               [in,out] int32 level,
+               [in,switch_is(level)] drsuapi_DsRemoveDSServerRequest req,
+               [out,switch_is(level)] drsuapi_DsRemoveDSServerResult res
+               );
 
        /*****************/
         /* Function 0x0f */
@@ -896,7 +977,7 @@ interface drsuapi
        /*****************/
         /* Function 0x10 */
        typedef struct {
-               unistr *domain_name; /* netbios or dns */
+               [charset(UTF16),string] uint16 *domain_name; /* netbios or dns */
                int32 level; /* specifies the switch level for the request */
        } drsuapi_DsGetDCInfoRequest1;
 
@@ -905,11 +986,11 @@ interface drsuapi
        } drsuapi_DsGetDCInfoRequest;
 
        typedef struct {
-               unistr *netbios_name;
-               unistr *dns_name;
-               unistr *site_name;
-               unistr *computer_dn;
-               unistr *server_dn;
+               [charset(UTF16),string] uint16 *netbios_name;
+               [charset(UTF16),string] uint16 *dns_name;
+               [charset(UTF16),string] uint16 *site_name;
+               [charset(UTF16),string] uint16 *computer_dn;
+               [charset(UTF16),string] uint16 *server_dn;
                uint32 is_pdc;
                uint32 is_enabled;
        } drsuapi_DsGetDCInfo1;
@@ -920,13 +1001,13 @@ interface drsuapi
        } drsuapi_DsGetDCInfoCtr1;
 
        typedef struct {
-               unistr *netbios_name;
-               unistr *dns_name;
-               unistr *site_name;
-               unistr *site_dn;
-               unistr *computer_dn;
-               unistr *server_dn;
-               unistr *ntds_dn;
+               [charset(UTF16),string] uint16 *netbios_name;
+               [charset(UTF16),string] uint16 *dns_name;
+               [charset(UTF16),string] uint16 *site_name;
+               [charset(UTF16),string] uint16 *site_dn;
+               [charset(UTF16),string] uint16 *computer_dn;
+               [charset(UTF16),string] uint16 *server_dn;
+               [charset(UTF16),string] uint16 *ntds_dn;
                uint32 is_pdc;
                uint32 is_enabled;
                uint32 is_gc;
@@ -941,38 +1022,52 @@ interface drsuapi
                [size_is(count)] drsuapi_DsGetDCInfo2 *array;
        } drsuapi_DsGetDCInfoCtr2;
 
+       /*
+        * this represents an active connection to the
+        * Directory System Agent (DSA)
+        * this can be via LDAP or DRSUAPI
+        */
        typedef struct {
-               uint32 unknown1;
+               [flag(NDR_BIG_ENDIAN)] ipv4address client_ip_address;
                uint32 unknown2;
-               uint32 unknown3;
+               uint32 connection_time; /* in seconds */
                uint32 unknown4;
                uint32 unknown5;
                uint32 unknown6;
-               unistr *server_nt4_account;
-       } drsuapi_DsGetDCInfo01;
+               /*
+                * client_account can be the following:
+                * "W2K3\Administrator"
+                * "Administrator@W2K3"
+                * "cn=Administrator,cn=Users,DC=w2k3,DC=vmnet1,DC=vm,DC=base"
+                * ""
+                * or NULL
+                */
+               [charset(UTF16),string] uint16 *client_account;
+       } drsuapi_DsGetDCConnection01;
 
        typedef struct {
                [range(0,10000)] uint32 count;
-               [size_is(count)] drsuapi_DsGetDCInfo01 *array;
-       } drsuapi_DsGetDCInfoCtr01;
+               [size_is(count)] drsuapi_DsGetDCConnection01 *array;
+       } drsuapi_DsGetDCConnectionCtr01;
 
        typedef [v1_enum] enum {
                DRSUAPI_DC_INFO_CTR_1  = 1,
                DRSUAPI_DC_INFO_CTR_2  = 2,
-               DRSUAPI_DC_INFO_CTR_01 = -1
+               DRSUAPI_DC_CONNECTION_CTR_01 = -1
        } drsuapi_DsGetDCInfoCtrLevels;
 
         typedef [switch_type(int32)] union {
                [case(DRSUAPI_DC_INFO_CTR_1)]  drsuapi_DsGetDCInfoCtr1  ctr1;
                [case(DRSUAPI_DC_INFO_CTR_2)]  drsuapi_DsGetDCInfoCtr2  ctr2;
-               [case(DRSUAPI_DC_INFO_CTR_01)] drsuapi_DsGetDCInfoCtr01 ctr01;
+               [case(DRSUAPI_DC_CONNECTION_CTR_01)] drsuapi_DsGetDCConnectionCtr01 ctr01;
        } drsuapi_DsGetDCInfoCtr;
 
        WERROR drsuapi_DsGetDomainControllerInfo(
-               [in,ref] policy_handle *bind_handle,
-               [in, out] int32 level,
+               [in] policy_handle *bind_handle,
+               [in] int32 level,
                [in,switch_is(level)] drsuapi_DsGetDCInfoRequest req,
-               [out,switch_is(level)] drsuapi_DsGetDCInfoCtr ctr
+               [out] int32 level_out,
+               [out,switch_is(level_out)] drsuapi_DsGetDCInfoCtr ctr
                );
 
        /*****************/
@@ -1032,10 +1127,10 @@ interface drsuapi
                [case(1)] drsuapi_DsAddEntryErrorInfo1 error1;
 /*             [case(2)] drsuapi_DsAddEntryErrorInfo2 error2;
                [case(3)] drsuapi_DsAddEntryErrorInfo3 error3;
-*/             [case(4)] drsuapi_DsAddEntryErrorInfoX error4;
-               [case(5)] drsuapi_DsAddEntryErrorInfoX error5;
-               [case(6)] drsuapi_DsAddEntryErrorInfoX error6;
-               [case(7)] drsuapi_DsAddEntryErrorInfoX error7;
+*/             [case(4)] drsuapi_DsAddEntryErrorInfoX errorX;
+               [case(5)] drsuapi_DsAddEntryErrorInfoX errorX;
+               [case(6)] drsuapi_DsAddEntryErrorInfoX errorX;
+               [case(7)] drsuapi_DsAddEntryErrorInfoX errorX;
        } drsuapi_DsAddEntryErrorInfo;
 
        typedef struct {
@@ -1075,7 +1170,7 @@ interface drsuapi
        } drsuapi_DsAddEntryCtr;
 
        WERROR drsuapi_DsAddEntry(
-               [in,ref] policy_handle *bind_handle,
+               [in] policy_handle *bind_handle,
                [in,out] int32 level,
                [in,switch_is(level)] drsuapi_DsAddEntryRequest req,
                [out,switch_is(level)] drsuapi_DsAddEntryCtr ctr
@@ -1112,17 +1207,17 @@ interface drsuapi
 
        typedef struct {
                drsuapi_DsReplicaInfoType info_type;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *object_dn;
                GUID guid1;
        } drsuapi_DsReplicaGetInfoRequest1;
 
        typedef struct {
                drsuapi_DsReplicaInfoType info_type;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *object_dn;
                GUID guid1;
                uint32 unknown1;
-               unistr *string1;
-               unistr *string2;
+               [charset(UTF16),string] uint16 *string1;
+               [charset(UTF16),string] uint16 *string2;
                uint32 unknown2;
        } drsuapi_DsReplicaGetInfoRequest2;
 
@@ -1132,10 +1227,10 @@ interface drsuapi
        } drsuapi_DsReplicaGetInfoRequest;
 
        typedef struct {
-               unistr *naming_context_dn;
-               unistr *source_dsa_obj_dn;
-               unistr *source_dsa_address;
-               unistr *transport_obj_dn;
+               [charset(UTF16),string] uint16 *naming_context_dn;
+               [charset(UTF16),string] uint16 *source_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *source_dsa_address;
+               [charset(UTF16),string] uint16 *transport_obj_dn;
                drsuapi_DsReplicaNeighbourFlags replica_flags;
                uint32 reserved;
                GUID naming_context_obj_guid;
@@ -1163,7 +1258,7 @@ interface drsuapi
        } drsuapi_DsReplicaCoursorCtr;
 
        typedef struct {
-               unistr *attribute_name;
+               [charset(UTF16),string] uint16 *attribute_name;
                uint32 version;
                NTTIME originating_last_changed;
                GUID originating_dsa_invocation_id;
@@ -1178,7 +1273,7 @@ interface drsuapi
        } drsuapi_DsReplicaObjMetaDataCtr;
 
        typedef struct {
-               unistr *dsa_obj_dn;
+               [charset(UTF16),string] uint16 *dsa_obj_dn;
                GUID dsa_obj_guid;
                NTTIME first_failure;
                uint32 num_failures;
@@ -1214,9 +1309,9 @@ interface drsuapi
                uint32 priority;
                drsuapi_DsReplicaOpType operation_type;
                [switch_is(operation_type)] drsuapi_DsRplicaOpOptions options;
-               unistr *nc_dn;
-               unistr *remote_dsa_obj_dn;
-               unistr *remote_dsa_address;
+               [charset(UTF16),string] uint16 *nc_dn;
+               [charset(UTF16),string] uint16 *remote_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *remote_dsa_address;
                GUID nc_obj_guid;
                GUID remote_dsa_obj_guid;
        } drsuapi_DsReplicaOp;
@@ -1228,8 +1323,8 @@ interface drsuapi
        } drsuapi_DsReplicaOpCtr;
 
        typedef struct {
-               unistr *attribute_name;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *attribute_name;
+               [charset(UTF16),string] uint16 *object_dn;
                uint32 value_length;
                [size_is(value_length)] uint8 *value;
                NTTIME deleted;
@@ -1257,7 +1352,7 @@ interface drsuapi
                GUID source_dsa_invocation_id;
                hyper highest_usn;
                NTTIME last_sync_success;
-               unistr *source_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *source_dsa_obj_dn;
        } drsuapi_DsReplicaCoursor3;
 
        typedef struct {
@@ -1267,13 +1362,13 @@ interface drsuapi
        } drsuapi_DsReplicaCoursor3Ctr;
 
        typedef struct {
-               unistr *attribute_name;
+               [charset(UTF16),string] uint16 *attribute_name;
                uint32 version;
                NTTIME originating_last_changed;
                GUID originating_dsa_invocation_id;
                hyper originating_usn;
                hyper local_usn;
-               unistr *originating_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *originating_dsa_obj_dn;
        } drsuapi_DsReplicaObjMetaData2;
 
        typedef struct {
@@ -1283,8 +1378,8 @@ interface drsuapi
        } drsuapi_DsReplicaObjMetaData2Ctr;
 
        typedef struct {
-               unistr *attribute_name;
-               unistr *object_dn;
+               [charset(UTF16),string] uint16 *attribute_name;
+               [charset(UTF16),string] uint16 *object_dn;
                uint32 value_length;
                [size_is(value_length)] uint8 *value;
                NTTIME deleted;
@@ -1294,7 +1389,7 @@ interface drsuapi
                GUID originating_dsa_invocation_id;
                hyper originating_usn;
                hyper local_usn;
-               unistr *originating_dsa_obj_dn;
+               [charset(UTF16),string] uint16 *originating_dsa_obj_dn;
        } drsuapi_DsReplicaAttrValMetaData2;
 
        typedef struct {
@@ -1309,8 +1404,8 @@ interface drsuapi
                uint32 u3;
                GUID bind_guid;
                NTTIME_1sec bind_time;
-               uint32 u4; /* flags? */
-               uint32 u5;
+               [flag(NDR_BIG_ENDIAN)] ipv4address client_ip_address;
+               uint32 u5; /* this is the same value the client used as u1 in the DsBindInfoX struct */
        } drsuapi_DsReplicaConnection04;
 
        typedef struct {
@@ -1320,7 +1415,7 @@ interface drsuapi
        } drsuapi_DsReplicaConnection04Ctr;
 
        typedef struct {
-               unistr *str1;
+               [charset(UTF16),string] uint16 *str1;
                uint32 u1;
                uint32 u2;
                uint32 u3;
@@ -1355,7 +1450,7 @@ interface drsuapi
        } drsuapi_DsReplicaInfo;
 
        WERROR drsuapi_DsReplicaGetInfo(
-               [in,ref] policy_handle *bind_handle,
+               [in] policy_handle *bind_handle,
                [in] drsuapi_DsReplicaGetInfoLevel level,
                [in,switch_is(level)] drsuapi_DsReplicaGetInfoRequest req,
                [out] drsuapi_DsReplicaInfoType info_type,
@@ -1368,7 +1463,32 @@ interface drsuapi
 
        /*****************/
         /* Function 0x15 */
-       WERROR DRSUAPI_GET_MEMBERSHIPS2();
+
+       typedef struct {
+               [range(0,10000)] uint32 num_entries;
+               [size_is(num_entries)] drsuapi_DsGetMembershipsCtr1 **ctrl_array;
+       } drsuapi_DsGetMemberships2Ctr1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_DsGetMembershipsCtr1 ctr1;
+       } drsuapi_DsGetMemberships2Ctr;
+
+       typedef struct {
+               [range(1,10000)] uint32 num_req;
+               [size_is(num_req)] drsuapi_DsGetMembershipsRequest1 **req_array;
+       } drsuapi_DsGetMemberships2Request1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_DsGetMemberships2Request1 req1;
+       } drsuapi_DsGetMemberships2Request;
+
+       WERROR drsuapi_DsGetMemberships2(
+               [in] policy_handle *bind_handle,
+               [in,out] int32 level,
+               [in] [switch_is(level)] drsuapi_DsGetMemberships2Request req,
+               [out] [switch_is(level)] drsuapi_DsGetMemberships2Ctr ctr
+               );
+
 
        /*****************/
         /* Function 0x16 */