diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-14 23:38:05 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-14 23:38:05 +1000 |
| commit | bcd647f943e391bdb98233c168d2b35e244e2bf4 (patch) | |
| tree | 5653bdbee1b174ff77b059d9f4a296072e32313f /source4/torture/rpc/dsgetinfo.c | |
| parent | e81e057b6d70d70616132593dc2acbfe77cb459c (diff) | |
| parent | bc6a43aeb41fc5ccf3a34f2ec91e1328ae82d90e (diff) | |
| download | samba-bcd647f943e391bdb98233c168d2b35e244e2bf4.tar.gz samba-bcd647f943e391bdb98233c168d2b35e244e2bf4.tar.bz2 samba-bcd647f943e391bdb98233c168d2b35e244e2bf4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/torture/rpc/dsgetinfo.c')
| -rw-r--r-- | source4/torture/rpc/dsgetinfo.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c index b01dd773a6..acf93e8785 100644 --- a/source4/torture/rpc/dsgetinfo.c +++ b/source4/torture/rpc/dsgetinfo.c @@ -345,20 +345,25 @@ static bool test_getinfo(struct torture_context *tctx, r.out.info_type = &info_type; status = dcerpc_drsuapi_DsReplicaGetInfo_r(b, tctx, &r); - + if (!NT_STATUS_IS_OK(status) && p->last_fault_code == DCERPC_FAULT_INVALID_TAG) { + torture_comment(tctx, + "DsReplicaGetInfo level %d and/or infotype %d not supported by server\n", + array[i].level, array[i].infotype); + continue; + } + torture_assert_ntstatus_ok(tctx, status, talloc_asprintf(tctx, + "DsReplicaGetInfo level %d and/or infotype %d failed\n", + array[i].level, array[i].infotype)); if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_LEVEL)) { /* this is a not yet supported level */ torture_comment(tctx, "DsReplicaGetInfo level %d and/or infotype %d not yet supported by server\n", array[i].level, array[i].infotype); invalid_levels++; - } else if (!NT_STATUS_IS_OK(status) && p->last_fault_code == DCERPC_FAULT_INVALID_TAG) { - torture_comment(tctx, - "DsReplicaGetInfo level %d and/or infotype %d not supported by server\n", - array[i].level, array[i].infotype); - }/* else { - torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsReplicaGetInfo"); - }*/ + continue; + } + + torture_drsuapi_assert_call(tctx, p, status, &r, "dcerpc_drsuapi_DsReplicaGetInfo"); } if (invalid_levels > 0) { |