From fb70368a975e6c78c6ce557fc6011569dbdc6d75 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 24 Mar 2010 18:29:52 +0100 Subject: s4-smbtorture: move up torture_assert_sid_equal at least to the torture/ndr level. Guenther --- source4/torture/ndr/ndr.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source4/torture/ndr/ndr.h') diff --git a/source4/torture/ndr/ndr.h b/source4/torture/ndr/ndr.h index aca6e58397..517bcb6b34 100644 --- a/source4/torture/ndr/ndr.h +++ b/source4/torture/ndr/ndr.h @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "librpc/ndr/libndr.h" +#include "libcli/security/security.h" _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_test( struct torture_suite *suite, @@ -41,4 +42,14 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_test( (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \ sizeof(struct name), flags, (bool (*) (struct torture_context *, void *)) check_fn); +#define torture_assert_sid_equal(torture_ctx,got,expected,cmt)\ + do { struct dom_sid *__got = (got), *__expected = (expected); \ + if (!dom_sid_equal(__got, __expected)) { \ + torture_result(torture_ctx, TORTURE_FAIL, \ + __location__": "#got" was %s, expected %s: %s", \ + dom_sid_string(torture_ctx, __got), dom_sid_string(torture_ctx, __expected), cmt); \ + return false; \ + } \ + } while(0) + #endif /* __TORTURE_NDR_H__ */ -- cgit