summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-03-30 15:07:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:21 -0500
commit2d0349614c516ce63022c50ccb71bb76d04abb1c (patch)
treeae88adca7e9270b487f5fc0dd91485b18b4d525b /source4
parentd2f2d5c798a7d4af05a32d673ed8cd5a89959c68 (diff)
downloadsamba-2d0349614c516ce63022c50ccb71bb76d04abb1c.tar.gz
samba-2d0349614c516ce63022c50ccb71bb76d04abb1c.tar.bz2
samba-2d0349614c516ce63022c50ccb71bb76d04abb1c.zip
r6135: - make use of the new dom_sid28 type
(this fixes parsing of w2k blob, which some times have random gargabe data in the sid buffer) - make the names of the DsReplicaCoursor*Ctr* 's more consistent and fix DsGetNCchangesCtr6 parsing metze (This used to be commit 75e427dca9f6b129ead100f7265794189f257c67)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/idl/drsuapi.idl22
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index 2f01250ed6..94ec5bf1bc 100644
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -116,9 +116,9 @@ interface drsuapi
/* Function 0x02 */
typedef [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_length_dom_sid(&r->sid))]*/ uint32 __ndr_size_sid;
GUID guid;
- [subcontext_size(28),subcontext(0)] dom_sid sid;
+ dom_sid28 sid;
[flag(STR_SIZE4|STR_CHARLEN|STR_CONFORMANT)] string dn;
} drsuapi_DsReplicaObjectIdentifier;
@@ -185,7 +185,7 @@ interface drsuapi
[range(0,0x100000)] uint32 count;
uint32 u3;
[size_is(count)] drsuapi_DsReplicaCoursor coursors[];
- } drsuapi_DsReplicaCoursor05Ctr;
+ } drsuapi_DsReplicaCoursorCtrEx;
typedef [public] bitmap {
/* the _WRITEABLE flag seems to indicate a replication with all attributes,
@@ -224,7 +224,7 @@ interface drsuapi
GUID source_dsa_guid;
[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
drsuapi_DsReplicaNeighbourFlags replica_flags;
uint32 unknown2;
uint32 unknown3;
@@ -252,7 +252,7 @@ interface drsuapi
GUID source_dsa_guid;
[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
drsuapi_DsReplicaNeighbourFlags replica_flags;
uint32 unknown2;
uint32 unknown3;
@@ -280,7 +280,7 @@ interface drsuapi
[range(0,0x100000)] uint32 count;
uint32 u3;
[size_is(count)] drsuapi_DsReplicaCoursor2 coursors[];
- } drsuapi_DsReplicaCoursor2Ctr2;
+ } drsuapi_DsReplicaCoursor2CtrEx;
typedef [v1_enum] enum {
DRSUAPI_OBJECTCLASS_top = 0x00010000,
@@ -345,7 +345,7 @@ interface drsuapi
[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->flags)-4)] uint32 __ndr_size;
[value(ndr_length_dom_sid(&r->sid))] uint32 __ndr_size_sid;
GUID guid;
- [subcontext_size(28),subcontext(0)] dom_sid sid;
+ dom_sid28 sid;
[flag(STR_SIZE4|STR_CHARLEN)] string dn;
} drsuapi_DsReplicaObjectIdentifier3;
@@ -487,7 +487,7 @@ interface drsuapi
drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark old_highwatermark;
drsuapi_DsReplicaHighWaterMark new_highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursorCtrEx *uptodateness_vector;
drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
uint32 unknown1;
uint32 object_count;
@@ -519,7 +519,7 @@ interface drsuapi
drsuapi_DsReplicaObjectIdentifier *naming_context;
drsuapi_DsReplicaHighWaterMark old_highwatermark;
drsuapi_DsReplicaHighWaterMark new_highwatermark;
- drsuapi_DsReplicaCoursor05Ctr *uptodateness_vector;
+ drsuapi_DsReplicaCoursor2CtrEx *uptodateness_vector;
drsuapi_DsGetNCChangesRequest_Ctr12 ctr12;
uint32 unknown1;
uint32 unknown2;
@@ -852,7 +852,7 @@ interface drsuapi
typedef struct {
GUID guid;
- [subcontext_size(28),subcontext(0)] dom_sid sid;
+ dom_sid28 sid;
} drsuapi_DsReplicaObjectIdentifier2;
typedef struct {
@@ -1143,7 +1143,7 @@ interface drsuapi
[case(DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2)] drsuapi_DsReplicaAttrValMetaData2Ctr *attrvalmetadata2;
[case(DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02)] drsuapi_DsReplicaNeighbourCtr *neighbours02;
[case(DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04)] drsuapi_DsReplicaConnection04Ctr *connections04;
- [case(DRSUAPI_DS_REPLICA_INFO_CURSURS05)] drsuapi_DsReplicaCoursor05Ctr *coursors05;
+ [case(DRSUAPI_DS_REPLICA_INFO_CURSURS05)] drsuapi_DsReplicaCoursorCtrEx *coursors05;
[case(DRSUAPI_DS_REPLICA_INFO_06)] drsuapi_DsReplica06Ctr *i06;
} drsuapi_DsReplicaInfo;