s3-smbtorture: fixup trailing whitespace in ndr testsuite.

[metze/samba/wip.git] / source4 / torture / ndr / ndr.h

diff --git a/source4/torture/ndr/ndr.h b/source4/torture/ndr/ndr.h
index 1bbeec7917cacb50ed2bbfe0ea184c74a7d8ae2c..9438b16b655eff5f6c163ac97e919c50b906cf2b 100644 (file)
--- a/source4/torture/ndr/ndr.h
+++ b/source4/torture/ndr/ndr.h
@@ -1,21 +1,20 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB torture tester
    Copyright (C) Jelmer Vernooij 2007
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __TORTURE_NDR_H__
@@ -23,11 +22,12 @@
 
 #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, 
+                                       struct torture_suite *suite,
                                        const char *name, ndr_pull_flags_fn_t fn,
-                                       DATA_BLOB db, 
+                                       DATA_BLOB db,
                                        size_t struct_size,
                                        int ndr_flags,
                                        bool (*check_fn) (struct torture_context *, void *data));
@@ -42,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__ */