summaryrefslogtreecommitdiff
path: root/source3/smbd/trans2.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-05-19 02:25:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:37 -0500
commit28cbc5f8f9489673b0c766f450a681659a2a0387 (patch)
tree08cd98687b08b30896b1ccfe70bb5d4d9b761841 /source3/smbd/trans2.c
parent84cea46162d6328c2e3bc0166f5b27a0fa01b3f9 (diff)
downloadsamba-28cbc5f8f9489673b0c766f450a681659a2a0387.tar.gz
samba-28cbc5f8f9489673b0c766f450a681659a2a0387.tar.bz2
samba-28cbc5f8f9489673b0c766f450a681659a2a0387.zip
r779: Fix specific case of open that doesn't cause oplock break, or share mode check.
Test case provided by Volker will be added later. There may be other tests needed. Jeremy. (This used to be commit 1f8e7946edbb2930ba5f9738688dc843bc368fbf)
Diffstat (limited to 'source3/smbd/trans2.c')
-rw-r--r--source3/smbd/trans2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 23272752c6..738d12e020 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2302,7 +2302,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
}
- delete_pending = fsp->directory_delete_on_close;
+ delete_pending = fsp->is_directory ? fsp->directory_delete_on_close : 0;
} else {
/*
* Original code - this is an open file.