diff options
| author | Volodymyr Khomenko <Volodymyr_Khomenko@dell.com> | 2011-10-12 09:57:57 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-10-24 19:17:07 +0200 |
| commit | 1ee32547cc6cf5ff6afd3cedbc1a466de3692cb7 (patch) | |
| tree | 5de9974434423ff98118a35e818cb7d2a39eb09e | |
| parent | cf083f6e07f594b10d7e9dd2b15e742dfdb3432b (diff) | |
| download | samba-1ee32547cc6cf5ff6afd3cedbc1a466de3692cb7.tar.gz samba-1ee32547cc6cf5ff6afd3cedbc1a466de3692cb7.tar.xz samba-1ee32547cc6cf5ff6afd3cedbc1a466de3692cb7.zip | |
Fix bug #8515 - Empty CIFS share can be blocked for other clients by deleting it via empty path (DELETE_PENDING until the last client)
Disallow "." in can_set_delete_on_close().
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Oct 12 21:07:27 CEST 2011 on sn-devel-104
(cherry picked from commit bd260f03ab492d03c2890db47dc6fb4f1b824a1a)
(cherry picked from commit c6e2256e2ef024ecdbebb9cb04d919342daeb780)
| -rw-r--r-- | source3/locking/locking.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 095d0b17b9d..8f192a6ef89 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -1350,6 +1350,14 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, uint32 dosmode) /* Don't allow delete on close for non-empty directories. */ if (fsp->is_directory) { SMB_ASSERT(!is_ntfs_stream_smb_fname(fsp->fsp_name)); + + /* Or the root of a share. */ + if (ISDOT(fsp->fsp_name->base_name)) { + DEBUG(10,("can_set_delete_on_close: can't set delete on " + "close for the root of a share.\n")); + return NT_STATUS_ACCESS_DENIED; + } + return can_delete_directory(fsp->conn, fsp->fsp_name->base_name); } |