summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorVolodymyr Khomenko <Volodymyr_Khomenko@dell.com>2011-10-12 09:57:57 -0700
committerJeremy Allison <jra@samba.org>2011-10-12 21:07:27 +0200
commitbd260f03ab492d03c2890db47dc6fb4f1b824a1a (patch)
tree735b0ed2408702881efdb91ea120558591db9162 /source3/locking
parent1e4761d05978b7a495d121acc1deaa7049f3911c (diff)
downloadsamba-bd260f03ab492d03c2890db47dc6fb4f1b824a1a.tar.gz
samba-bd260f03ab492d03c2890db47dc6fb4f1b824a1a.tar.bz2
samba-bd260f03ab492d03c2890db47dc6fb4f1b824a1a.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
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/locking.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 90417309fe..38d8c090a6 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1473,6 +1473,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);
}