[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  75494f7 selftest: samba4 doesn't support reauth
       via  c68cba3 s4:torture/raw/session: make sure we got a reauth of the existing session
       via  0ded6f9 selftest: mark ^samba4.raw.session.reauth as flapping
      from  5909188 talloc: Update doxygen config.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 75494f75fa27ded7b9d3c8c7342c8aa682c2949b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 7 11:50:59 2012 +0200

    selftest: samba4 doesn't support reauth
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue May  8 02:43:49 CEST 2012 on sn-devel-104

commit c68cba36aabd816fcf70fc800eb36e54a3164d55
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 7 11:32:32 2012 +0200

    s4:torture/raw/session: make sure we got a reauth of the existing session
    
    metze

commit 0ded6f9cb71719605e06abea0883d2e59a1e8d39
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon May 7 12:07:30 2012 +0200

    selftest: mark ^samba4.raw.session.reauth as flapping
    
    Because the test is wrong...
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 selftest/knownfail            |    1 +
 source4/torture/raw/session.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index 1fa11e9..35da8b3 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -47,6 +47,7 @@
 ^samba4..*base.delete.*.deltest17
 ^samba4..*base.delete.*.deltest20a
 ^samba4..*base.delete.*.deltest20b
+^samba4.raw.session.reauth
 ^samba4.raw.rename.*.osxrename
 ^samba4.raw.rename.*.directory rename
 ^samba4.rpc.winreg.*security
diff --git a/source4/torture/raw/session.c b/source4/torture/raw/session.c
index 66092d2..3402693 100644
--- a/source4/torture/raw/session.c
+++ b/source4/torture/raw/session.c
@@ -38,6 +38,7 @@ static bool test_session_reauth(struct torture_context *tctx,
 	char fname[256];
 	char buf[dlen+1];
 	bool ok = true;
+	uint16_t vuid1 = cli->session->vuid;
 
 	data = generate_random_str(tctx, dlen);
 	torture_assert(tctx, (data != NULL), "memory allocation failed");
@@ -65,6 +66,7 @@ static bool test_session_reauth(struct torture_context *tctx,
 	io.in.gensec_settings = lpcfg_gensec_settings(tctx, tctx->lp_ctx);
 	status = smb_composite_sesssetup(cli->session, &io);
 	torture_assert_ntstatus_ok_goto(tctx, status, ok, done, "setup2");
+	torture_assert_int_equal_goto(tctx, io.out.vuid, vuid1, ok, done, "setup2");
 
 	num = smbcli_read(cli->tree, fnum, &buf, 0, dlen);
 	torture_assert_int_equal_goto(tctx, num, dlen, ok, done, "read file");


-- 
Samba Shared Repository