s4-torture: move torture_assert_sid_equal() out of ndr headers.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/torture/torture.h b/lib/torture/torture.h
index b90af8438582b34731bd6feff6c0513f29086bf0..2d1ecccb936be88e4880e2a5e35e29d74c40f17c 100644 (file)
--- a/lib/torture/torture.h
+++ b/lib/torture/torture.h
@@ -500,6 +500,16 @@ void torture_result(struct torture_context *test,
        }\
        } while(0)
 
+#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)
+
 #define torture_assert_not_null(torture_ctx,got,cmt)\
        do { void *__got = (got); \
        if (__got == NULL) { \

diff --git a/source4/torture/ndr/ndr.h b/source4/torture/ndr/ndr.h
index 068d5f64633e2bca9e02cfa8d81db6a9975c1a4e..8b34cd9c74264da9b0400eb1db16199e7281fb7a 100644 (file)
--- a/source4/torture/ndr/ndr.h
+++ b/source4/torture/ndr/ndr.h
@@ -73,14 +73,4 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_inout_test(
                         sizeof(struct name), \
                         (bool (*) (struct torture_context *, void *)) check_fn_out);
 
-#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__ */