Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit 068c973dbeed5b0f5ccab4f780ae7db3535f5910)

4 files changed, 16 insertions, 7 deletions

diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index 9366de986a..917a24ad59 100644
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -69,7 +69,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 
 	torture_assert_int_equal(tctx, sig.length, expected_sig.length, "Wrong sig length");
 
-	torture_assert(tctx, 0 == memcmp(sig.data, expected_sig.data, sig.length),
+	torture_assert_mem_equal(tctx, sig.data, expected_sig.data, sig.length,
 				   "data mismatch");
 
 	torture_assert_ntstatus_equal(tctx, 
@@ -123,7 +123,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 
 	torture_assert_int_equal(tctx, sig.length, expected_sig.length, "Wrong sig length");
 
-	torture_assert(tctx,  0 == memcmp(sig.data+8, expected_sig.data+8, sig.length-8),
+	torture_assert_mem_equal(tctx, sig.data+8, expected_sig.data+8, sig.length-8,
 				   "data mismatch");
 
 	torture_assert_ntstatus_equal(tctx, 
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index ac71d14116..3a3a7c2fd5 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -590,7 +590,7 @@ static bool rw_torture2(struct torture_context *tctx,
 			break;
 		}
 
-		torture_assert(tctx, memcmp(buf_rd, buf, buf_size) == 0, 
+		torture_assert_mem_equal(tctx, buf_rd, buf, buf_size, 
 			"read/write compare failed\n");
 	}
 
diff --git a/source4/torture/ndr/netlogon.c b/source4/torture/ndr/netlogon.c
index 2f01a9d009..f498335bda 100644
--- a/source4/torture/ndr/netlogon.c
+++ b/source4/torture/ndr/netlogon.c
@@ -46,7 +46,7 @@ static bool netrserverauthenticate3_in_check(struct torture_context *tctx,
 	torture_assert_int_equal(tctx, r->in.secure_channel_type, 2, "secure channel type");
 	torture_assert_str_equal(tctx, r->in.computer_name, "NATIVE-2K", "computer name");
 	torture_assert_int_equal(tctx, *r->in.negotiate_flags, 0x6007ffff, "negotiate flags");
-	torture_assert(tctx, memcmp(cred_expected, r->in.credentials->data, 8) == 0, "credentials");
+	torture_assert_mem_equal(tctx, cred_expected, r->in.credentials->data, 8, "credentials");
 	return true;
 }
 
@@ -59,7 +59,7 @@ static bool netrserverauthenticate3_out_check(struct torture_context *tctx,
 											struct netr_ServerAuthenticate3 *r)
 {
 	uint8_t cred_expected[8] = { 0x22, 0x0c, 0x86, 0x8a, 0xe9, 0x92, 0x93, 0xc9 };
-	torture_assert(tctx, memcmp(cred_expected, r->out.credentials->data, 8) == 0, "credentials");
+	torture_assert_mem_equal(tctx, cred_expected, r->out.credentials->data, 8, "credentials");
 	torture_assert_int_equal(tctx, *r->out.negotiate_flags, 0x6007ffff, "negotiate flags");
 	torture_assert_int_equal(tctx, *r->out.rid, 0x454, "rid");
 	torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
@@ -85,7 +85,7 @@ static bool netrserverreqchallenge_in_check(struct torture_context *tctx,
 	uint8_t cred_expected[8] = { 0xa3, 0x2c, 0xa2, 0x95, 0x40, 0xcc, 0xb7, 0xbb };
 	torture_assert_str_equal(tctx, r->in.server_name, "\\\\NATIVE-DC.NATIVE.BASE", "server name");
 	torture_assert_str_equal(tctx, r->in.computer_name, "NATIVE-2K", "account name");
-	torture_assert(tctx, memcmp(cred_expected, r->in.credentials->data, 8) == 0, "credentials");
+	torture_assert_mem_equal(tctx, cred_expected, r->in.credentials->data, 8, "credentials");
 
 	return true;
 }
@@ -98,7 +98,7 @@ static bool netrserverreqchallenge_out_check(struct torture_context *tctx,
 											struct netr_ServerReqChallenge *r)
 {
 	uint8_t cred_expected[8] = { 0x22, 0xfc, 0xc1, 0x17, 0xc0, 0xae, 0x27, 0x8e };
-	torture_assert(tctx, memcmp(cred_expected, r->out.credentials->data, 8) == 0, "credentials");
+	torture_assert_mem_equal(tctx, cred_expected, r->out.credentials->data, 8, "credentials");
 	torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
 
 	return true;
diff --git a/source4/torture/ui.h b/source4/torture/ui.h
index 6645d9b012..ec4a658d74 100644
--- a/source4/torture/ui.h
+++ b/source4/torture/ui.h
@@ -253,6 +253,15 @@ void torture_result(struct torture_context *test,
 	} \
 	} while(0)
 
+#define torture_assert_mem_equal(torture_ctx,got,expected,len,cmt)\
+	do { const void *__got = (got), *__expected = (expected); \
+	if (memcmp(__got, __expected, len) != 0) { \
+		torture_result(torture_ctx, TORTURE_FAIL, \
+					   __location__": "#got" of len %d did not match"#expected": %s", len, cmt); \
+		return false; \
+	} \
+	} while(0)
+
 #define torture_assert_file_contains_text(torture_ctx,filename,expected,cmt)\
 	do { \
 	char *__got; \