diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-25 10:04:20 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-25 10:04:20 +0100 |
commit | cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31 (patch) | |
tree | d0b116699dee35372ed335834989e1c885e8f94a /source4/torture/ndr/netlogon.c | |
parent | d1432d617e6ed04c33ca214d7f3b0099bdf53065 (diff) | |
parent | 240d959005f5fd80a38b3734b39dd5d6e425a566 (diff) | |
download | samba-cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31.tar.gz samba-cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31.tar.bz2 samba-cc9c4aaa8d02c4c31c9e9a4bb53e5941683fcc31.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/Makefile
source/auth/config.mk
source/auth/gensec/config.mk
source/build/m4/public.m4
source/build/make/python.mk
source/build/make/rules.mk
source/build/smb_build/header.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/dsdb/samdb/ldb_modules/config.mk
source/kdc/config.mk
source/lib/events/config.mk
source/lib/events/events.c
source/lib/ldb/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/util/config.mk
source/libcli/smb2/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/nbt_server/config.mk
source/ntptr/ntptr_base.c
source/ntvfs/posix/config.mk
source/ntvfs/sysdep/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/rpc_server/service_rpc.c
source/scripting/ejs/config.mk
source/scripting/python/config.mk
source/smb_server/config.mk
source/smbd/server.c
source/torture/config.mk
source/torture/smb2/config.mk
source/wrepl_server/config.mk
(This used to be commit 13bbd420681519894a4036729c43273912c9b402)
Diffstat (limited to 'source4/torture/ndr/netlogon.c')
-rw-r--r-- | source4/torture/ndr/netlogon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/ndr/netlogon.c b/source4/torture/ndr/netlogon.c index 2f01a9d009..a5221f71e9 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"); @@ -80,12 +80,12 @@ static const uint8_t netrserverreqchallenge_in_data[] = { }; static bool netrserverreqchallenge_in_check(struct torture_context *tctx, - struct netr_ServerReqChallenge *r) + struct netr_ServerReqChallenge *r) { 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; } @@ -95,10 +95,10 @@ static const uint8_t netrserverreqchallenge_out_data[] = { }; static bool netrserverreqchallenge_out_check(struct torture_context *tctx, - struct netr_ServerReqChallenge *r) + 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; |