From 73fbc9c1791c2391ccb59a2a02df009cbd2fdc7e Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 29 Jun 2010 23:35:45 +0200 Subject: s4-smbtorture: remove duplicate torture_assert_sid_equal macro. Guenther --- source4/torture/rpc/spoolss.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 930556e63d..7e1572861d 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -37,6 +37,7 @@ #include "libcli/resolve/resolve.h" #include "lib/cmdline/popt_common.h" #include "system/filesys.h" +#include "torture/ndr/ndr.h" #define TORTURE_WELLKNOWN_PRINTER "torture_wkn_printer" #define TORTURE_PRINTER "torture_printer" @@ -1767,16 +1768,6 @@ static bool test_PrinterInfo(struct torture_context *tctx, return ret; } -#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) - static bool test_security_descriptor_equal(struct torture_context *tctx, const struct security_descriptor *sd1, const struct security_descriptor *sd2) -- cgit