From 2d3db5e7930af9dd2a70727b2f2828bd73a1ec3b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 18 Feb 2015 11:48:31 -0800 Subject: s3: smbd: leases - new torture test shows stat opens can get leases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Can also issue breaks on these leases. https://bugzilla.samba.org/show_bug.cgi?id=11102 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Böhme --- source3/smbd/open.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 06770e04fb..773b146cd6 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -3099,7 +3099,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, if (file_existed) { /* - * stat opens on existing files don't get oplocks or leases. + * stat opens on existing files don't get oplocks. + * They can get leases. * * Note that we check for stat open on the *open_access_mask*, * i.e. the access mask we actually used to do the open, @@ -3108,12 +3109,8 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, * FILE_OVERWRITE and FILE_OVERWRITE_IF add in O_TRUNC, * which adds FILE_WRITE_DATA to open_access_mask. */ - if (is_stat_open(open_access_mask)) { - if (lease) { - lease->lease_state = SMB2_LEASE_NONE; - } else { - oplock_request = NO_OPLOCK; - } + if (is_stat_open(open_access_mask) && lease == NULL) { + oplock_request = NO_OPLOCK; } } -- cgit