The branch, master has been updated via b7765fe torture: Only test leases if supported via 27e9115 torture: Use ZERO_STRUCTPN instead of explicit deref from 5185460 Check for WRITE_ACCESS on the file before overriding an EACCESS.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b7765fe63fa04e09ac67285d0e17e37b06bcff8b Author: Volker Lendecke <v...@samba.org> Date: Wed Apr 17 13:41:54 2013 +0200 torture: Only test leases if supported Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Richard Sharpe <realrichardsha...@gmail.com> Autobuild-User(master): Richard Sharpe <sha...@samba.org> Autobuild-Date(master): Sat Apr 27 18:09:37 CEST 2013 on sn-devel-104 commit 27e9115eb01f02d5d07d2cf35887f99ff8d823b8 Author: Volker Lendecke <v...@samba.org> Date: Wed Apr 17 12:34:14 2013 +0200 torture: Use ZERO_STRUCTPN instead of explicit deref Signed-off-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: source4/torture/smb2/lease.c | 37 +++++++++++++++++++++++++++++++++++++ source4/torture/smb2/util.c | 2 +- 2 files changed, 38 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/smb2/lease.c b/source4/torture/smb2/lease.c index 21d4679..992c21b 100644 --- a/source4/torture/smb2/lease.c +++ b/source4/torture/smb2/lease.c @@ -25,6 +25,7 @@ #include "libcli/smb2/smb2_calls.h" #include "torture/torture.h" #include "torture/smb2/proto.h" +#include "libcli/smb/smbXcli_base.h" #define CHECK_VAL(v, correct) do { \ if ((v) != (correct)) { \ @@ -117,6 +118,12 @@ static bool test_lease_request(struct torture_context *tctx, const char *dname = "lease.dir"; bool ret = true; int i; + uint32_t caps; + + caps = smb2cli_conn_server_capabilities(tree->session->transport->conn); + if (!(caps & SMB2_CAP_LEASING)) { + torture_skip(tctx, "leases are not supported"); + } smb2_util_unlink(tree, fname); smb2_util_unlink(tree, fname2); @@ -193,6 +200,12 @@ static bool test_lease_upgrade(struct torture_context *tctx, NTSTATUS status; const char *fname = "lease.dat"; bool ret = true; + uint32_t caps; + + caps = smb2cli_conn_server_capabilities(tree->session->transport->conn); + if (!(caps & SMB2_CAP_LEASING)) { + torture_skip(tctx, "leases are not supported"); + } smb2_util_unlink(tree, fname); @@ -301,6 +314,12 @@ static bool test_lease_upgrade2(struct torture_context *tctx, const char *fname = "lease.dat"; bool ret = true; int i; + uint32_t caps; + + caps = smb2cli_conn_server_capabilities(tree->session->transport->conn); + if (!(caps & SMB2_CAP_LEASING)) { + torture_skip(tctx, "leases are not supported"); + } for (i = 0; i < NUM_UPGRADE_TESTS; i++) { struct lease_upgrade2_test t = lease_upgrade2_tests[i]; @@ -515,6 +534,12 @@ static bool test_lease_break(struct torture_context *tctx, const char *fname = "lease.dat"; bool ret = true; int i; + uint32_t caps; + + caps = smb2cli_conn_server_capabilities(tree->session->transport->conn); + if (!(caps & SMB2_CAP_LEASING)) { + torture_skip(tctx, "leases are not supported"); + } tree->session->transport->lease.handler = torture_lease_handler; tree->session->transport->lease.private_data = tree; @@ -677,6 +702,12 @@ static bool test_lease_oplock(struct torture_context *tctx, const char *fname = "lease.dat"; bool ret = true; int i; + uint32_t caps; + + caps = smb2cli_conn_server_capabilities(tree->session->transport->conn); + if (!(caps & SMB2_CAP_LEASING)) { + torture_skip(tctx, "leases are not supported"); + } tree->session->transport->lease.handler = torture_lease_handler; tree->session->transport->lease.private_data = tree; @@ -796,6 +827,12 @@ static bool test_lease_multibreak(struct torture_context *tctx, NTSTATUS status; const char *fname = "lease.dat"; bool ret = true; + uint32_t caps; + + caps = smb2cli_conn_server_capabilities(tree->session->transport->conn); + if (!(caps & SMB2_CAP_LEASING)) { + torture_skip(tctx, "leases are not supported"); + } tree->session->transport->lease.handler = torture_lease_handler; tree->session->transport->lease.private_data = tree; diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 59748b7..cb9a527 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -692,7 +692,7 @@ void smb2_generic_create_share(struct smb2_create *io, struct smb2_lease *ls, } if (ls) { - ZERO_STRUCT(*ls); + ZERO_STRUCTPN(ls); ls->lease_key.data[0] = leasekey; ls->lease_key.data[1] = ~leasekey; ls->lease_state = leasestate; -- Samba Shared Repository