The branch, master has been updated via b42825f selftest: mark samba3.smb2.session tests as knownfail instead of skip via fa62f94 s4:torture/smb2: avoid hanging in smb2.session.reconnect against samba from 9a11f2e auth/kerberos: Fall back to gsskrb5_get_subkey if we did not get the key type
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b42825fdae2562e31fff6c256a62162020cd084a Author: Stefan Metzmacher <me...@samba.org> Date: Thu Mar 8 14:22:15 2012 +0100 selftest: mark samba3.smb2.session tests as knownfail instead of skip Pair-Programmed-With: Gregor Beck <gb...@sernet.de> metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Fri Mar 9 02:34:38 CET 2012 on sn-devel-104 commit fa62f9474bf390bc5f223c54868c6c525418f84c Author: Stefan Metzmacher <me...@samba.org> Date: Thu Mar 8 14:15:19 2012 +0100 s4:torture/smb2: avoid hanging in smb2.session.reconnect against samba Now we fail the test directly instead of waiting for oplocks to timeout. Pair-Programmed-With: Gregor Beck <gb...@sernet.de> metze ----------------------------------------------------------------------- Summary of changes: selftest/knownfail | 2 ++ selftest/skip | 1 - source4/torture/smb2/session.c | 20 ++++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/knownfail b/selftest/knownfail index 3bfe490..e61e4f4 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -190,3 +190,5 @@ ^samba3.smb2.streams .attributes ^samba3.smb2.getinfo .getinfo ^samba3.smb2.setinfo .setinfo +^samba3.smb2.session .reconnect +^samba3.smb2.session .reauth diff --git a/selftest/skip b/selftest/skip index 9d71f95..8d797f4 100644 --- a/selftest/skip +++ b/selftest/skip @@ -43,7 +43,6 @@ ^samba3.*raw.sfileinfo.base ^samba3.smb2.hold-oplock # Not a test, but a way to block other clients for a test ^samba3.smb2.scan # No tests -^samba3.smb2.session # Hangs ^samba4.raw.composite ^samba4.base.iometer ^samba4.base.casetable diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c index 3a0ef08..f565975 100644 --- a/source4/torture/smb2/session.c +++ b/source4/torture/smb2/session.c @@ -96,6 +96,15 @@ bool test_session_reconnect(struct torture_context *tctx, struct smb2_tree *tree goto done; } + /* try to access the file via the old handle */ + + ZERO_STRUCT(qfinfo); + qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; + qfinfo.generic.in.file.handle = _h1; + status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); + CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED); + h1 = NULL; + smb2_oplock_create_share(&io2, fname, smb2_util_share_access(""), smb2_util_oplock_level("b")); @@ -107,15 +116,10 @@ bool test_session_reconnect(struct torture_context *tctx, struct smb2_tree *tree _h2 = io2.out.file.handle; h2 = &_h2; - /* try to access the file via the old handle */ - - ZERO_STRUCT(qfinfo); - qfinfo.generic.level = RAW_FILEINFO_POSITION_INFORMATION; - qfinfo.generic.in.file.handle = _h1; - status = smb2_getinfo_file(tree, mem_ctx, &qfinfo); - CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED); - done: + if (h1 != NULL) { + smb2_util_close(tree, *h1); + } if (h2 != NULL) { smb2_util_close(tree2, *h2); } -- Samba Shared Repository