summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-01-11 12:40:01 +0100
committerGünther Deschner <gd@samba.org>2010-01-12 12:12:05 +0100
commit13dad3893085dfe2fc01f88b3bb46a0645ab22fb (patch)
treeff673a1fa10176dfdfb8cedc4a0d804175942d9e
parenta744dbcf2b29040d7d630201cef9f64edafd7eec (diff)
downloadsamba-13dad3893085dfe2fc01f88b3bb46a0645ab22fb.tar.gz
samba-13dad3893085dfe2fc01f88b3bb46a0645ab22fb.tar.bz2
samba-13dad3893085dfe2fc01f88b3bb46a0645ab22fb.zip
s4-smbtorture: fix GetAliasMembership test in RPC-SAMR.
Guenther
-rw-r--r--source4/torture/rpc/samr.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 20d48038e7..8b466e8ef0 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2639,11 +2639,13 @@ static bool test_GetAliasMembership(struct dcerpc_pipe *p,
/* only true for w2k8 it seems
* win7, xp, w2k3 will return a 0 length array pointer */
- torture_assert(tctx, (rids.ids && !rids.count),
- "samr_GetAliasMembership protocol misbehaviour");
+ if (rids.ids && (rids.count == 0)) {
+ torture_fail(tctx, "samr_GetAliasMembership returned 0 count and a rids array");
+ }
#endif
- torture_assert(tctx, (!rids.ids && rids.count),
- "samr_GetAliasMembership protocol misbehaviour");
+ if (!rids.ids && rids.count) {
+ torture_fail(tctx, "samr_GetAliasMembership returned non-0 count but no rids");
+ }
return true;
}