diff options
| -rw-r--r-- | source4/librpc/idl/drsuapi.idl | 15 | ||||
| -rw-r--r-- | source4/torture/rpc/drsuapi.c | 8 | ||||
| -rw-r--r-- | source4/torture/rpc/dssync.c | 13 |
3 files changed, 18 insertions, 18 deletions
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl index 65bf5fb17d..f6ba02897c 100644 --- a/source4/librpc/idl/drsuapi.idl +++ b/source4/librpc/idl/drsuapi.idl @@ -235,8 +235,8 @@ interface drsuapi 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; @@ -263,8 +263,8 @@ interface drsuapi 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; uint32 unique_ptr1; @@ -622,7 +622,7 @@ interface drsuapi drsuapi_DsReplicaMetaData meta_data; } drsuapi_DsReplicaLinkedAttribute; - typedef struct { + typedef [public,gensize] struct { GUID guid1; GUID guid2; drsuapi_DsReplicaObjectIdentifier *naming_context; @@ -631,8 +631,9 @@ interface drsuapi drsuapi_DsReplicaCoursor2CtrEx *uptodateness_vector; drsuapi_DsGetNCChangesRequest_Ctr12 ctr12; uint32 unknown1; - uint32 unknown2; - uint32 unknown3; + 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; diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index bcfb12de75..29b6b0633b 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -563,8 +563,8 @@ static BOOL test_DsGetNCChanges(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, if (lp_parm_bool(-1, "drsuapi","compression", False)) { r.in.req.req5.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; } - r.in.req.req5.unknown2 = 0; - r.in.req.req5.unknown3 = 0; + r.in.req.req5.max_object_count = 0; + r.in.req.req5.max_ndr_size = 0; r.in.req.req5.unknown4 = 0; r.in.req.req5.h1 = 0; @@ -593,8 +593,8 @@ static BOOL test_DsGetNCChanges(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, | DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED ; - r.in.req.req8.unknown2 = 402; - r.in.req.req8.unknown3 = 402116; + r.in.req.req8.max_object_count = 402; + r.in.req.req8.max_ndr_size = 402116; r.in.req.req8.unknown4 = 0; r.in.req.req8.h1 = 0; r.in.req.req8.unique_ptr1 = 0; diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 6db40daf69..e00033154e 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -160,6 +160,8 @@ static struct DsSyncTest *test_create_context(TALLOC_CTX *mem_ctx) ctx->new_dc.drsuapi.req.in.bind_info = our_bind_info_ctr; ctx->new_dc.drsuapi.req.out.bind_handle = &ctx->new_dc.drsuapi.bind_handle; + ctx->new_dc.invocation_id = ctx->new_dc.drsuapi.bind_guid; + /* ctx->old_dc ...*/ return ctx; @@ -289,9 +291,6 @@ static BOOL test_GetInfo(struct DsSyncTest *ctx) printf("cldap_netlogon() returned Server Site-Name: %s.\n",search.out.netlogon.logon5.server_site); } - - ctx->new_dc.invocation_id = GUID_random(); - return ret; } @@ -440,8 +439,8 @@ static BOOL test_FetchData(struct DsSyncTest *ctx) | DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED ; - r.in.req.req5.unknown2 = 133; - r.in.req.req5.unknown3 = 1336770; + r.in.req.req5.max_object_count = 133; + r.in.req.req5.max_ndr_size = 1336770; r.in.req.req5.unknown4 = 0; r.in.req.req5.h1 = 0; @@ -471,8 +470,8 @@ static BOOL test_FetchData(struct DsSyncTest *ctx) | DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED ; - r.in.req.req8.unknown2 = 402; - r.in.req.req8.unknown3 = 402116; + r.in.req.req8.max_object_count = 402; + r.in.req.req8.max_ndr_size = 402116; r.in.req.req8.unknown4 = 0; r.in.req.req8.h1 = 0; |