s4-smbtorture: remove duplicate torture_assert_sid_equal macro.
authorGünther Deschner <gd@samba.org>
Tue, 29 Jun 2010 21:35:45 +0000 (23:35 +0200)
committerGünther Deschner <gd@samba.org>
Tue, 29 Jun 2010 21:35:45 +0000 (23:35 +0200)
Guenther

source4/torture/rpc/spoolss.c

index 930556e63df05a0ac854a1865464a05818e0ad89..7e1572861d4245b19762fbdea9facb45a32ea175 100644 (file)
@@ -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)