The branch, master has been updated
via 7b23d61a68f1303e0fcf0940d970ce439dca15a0 (commit)
via 2f8e854417e930d9b3483c248a60a36164d7703b (commit)
via 1cdd9e37b0dab4e3a23fa161b3922b574e049afe (commit)
from d7264320f47453c3b6c32f8298783ad5b2343487 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7b23d61a68f1303e0fcf0940d970ce439dca15a0
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Oct 17 18:49:36 2008 +0200
s4-smbtorture: fix test_DsReplicaGetInfo.
Guenther
commit 2f8e854417e930d9b3483c248a60a36164d7703b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Oct 17 18:47:32 2008 +0200
s4-smbtorture: fix test_DsGetNCChanges torture test.
This must have been broken since a while already.
Guenther
commit 1cdd9e37b0dab4e3a23fa161b3922b574e049afe
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Oct 17 18:46:34 2008 +0200
s4-smbtorture: fix drsuapi_DsGetNT4ChangeLog test.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/drsuapi.c | 29 ++++++++++++++++++-----------
source4/torture/rpc/dssync.c | 4 ++++
2 files changed, 22 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index da04c64..0b4ce02 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -238,6 +238,8 @@ static bool test_DsReplicaGetInfo(struct dcerpc_pipe *p,
struct torture_context
NTSTATUS status;
struct drsuapi_DsReplicaGetInfo r;
union drsuapi_DsReplicaGetInfoRequest req;
+ union drsuapi_DsReplicaInfo info;
+ enum drsuapi_DsReplicaInfoType info_type;
bool ret = true;
int i;
struct {
@@ -314,6 +316,7 @@ static bool test_DsReplicaGetInfo(struct dcerpc_pipe *p,
struct torture_context
}
r.in.bind_handle = &priv->bind_handle;
+ r.in.req = &req;
for (i=0; i < ARRAY_SIZE(array); i++) {
const char *object_dn;
@@ -326,21 +329,23 @@ static bool test_DsReplicaGetInfo(struct dcerpc_pipe *p,
struct torture_context
r.in.level = array[i].level;
switch(r.in.level) {
case DRSUAPI_DS_REPLICA_GET_INFO:
- req.req1.info_type = array[i].infotype;
- req.req1.object_dn = object_dn;
- ZERO_STRUCT(req.req1.guid1);
+ r.in.req->req1.info_type = array[i].infotype;
+ r.in.req->req1.object_dn = object_dn;
+ ZERO_STRUCT(r.in.req->req1.guid1);
break;
case DRSUAPI_DS_REPLICA_GET_INFO2:
- req.req2.info_type = array[i].infotype;
- req.req2.object_dn = object_dn;
- ZERO_STRUCT(req.req1.guid1);
- req.req2.unknown1 = 0;
- req.req2.string1 = NULL;
- req.req2.string2 = NULL;
- req.req2.unknown2 = 0;
+ r.in.req->req2.info_type = array[i].infotype;
+ r.in.req->req2.object_dn = object_dn;
+ ZERO_STRUCT(r.in.req->req2.guid1);
+ r.in.req->req2.unknown1 = 0;
+ r.in.req->req2.string1 = NULL;
+ r.in.req->req2.string2 = NULL;
+ r.in.req->req2.unknown2 = 0;
break;
}
- r.in.req = &req;
+
+ r.out.info = &info;
+ r.out.info_type = &info_type;
status = dcerpc_drsuapi_DsReplicaGetInfo(p, tctx, &r);
if (!NT_STATUS_IS_OK(status)) {
@@ -506,6 +511,7 @@ static bool test_DsGetNCChanges(struct dcerpc_pipe *p,
struct torture_context *t
struct drsuapi_DsReplicaObjectIdentifier nc;
struct GUID null_guid;
struct dom_sid null_sid;
+ int32_t level_out;
struct {
int32_t level;
} array[] = {
@@ -531,6 +537,7 @@ static bool test_DsGetNCChanges(struct dcerpc_pipe *p,
struct torture_context *t
r.in.bind_handle = &priv->bind_handle;
r.in.level = &array[i].level;
+ r.out.level = &level_out;
switch (*r.in.level) {
case 5:
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 185e8ef..2070485 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -810,6 +810,8 @@ static bool test_FetchNT4Data(struct torture_context *tctx,
bool ret = true;
struct drsuapi_DsGetNT4ChangeLog r;
union drsuapi_DsGetNT4ChangeLogRequest req;
+ union drsuapi_DsGetNT4ChangeLogInfo info;
+ int32_t level_out = 0;
struct GUID null_guid;
struct dom_sid null_sid;
DATA_BLOB cookie;
@@ -821,6 +823,8 @@ static bool test_FetchNT4Data(struct torture_context *tctx,
ZERO_STRUCT(r);
r.in.bind_handle = &ctx->new_dc.drsuapi.bind_handle;
r.in.level = 1;
+ r.out.info = &info;
+ r.out.level_out = &level_out;
req.req1.unknown1 = lp_parm_int(tctx->lp_ctx, NULL, "dssync",
"nt4-1", 3);
req.req1.unknown2 = lp_parm_int(tctx->lp_ctx, NULL, "dssync",
"nt4-2", 0x00004000);
--
Samba Shared Repository
