summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-02-09 02:03:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:51 -0500
commit86e5659abac9938e7ac0cea989ca33e807b3e181 (patch)
tree0f40cf6be9480356660189e83ad6009579178d8c
parent5920d870cfc6be3c5bbc65ab63a6e63d1d7286f4 (diff)
downloadsamba-86e5659abac9938e7ac0cea989ca33e807b3e181.tar.gz
samba-86e5659abac9938e7ac0cea989ca33e807b3e181.tar.bz2
samba-86e5659abac9938e7ac0cea989ca33e807b3e181.zip
r21257: Better fix for bug #4188 :
Windows Vista RC1 and RC2 can't delete directory on Samba share based on work by Joe Meadows <jmeadows@webopolis.com>. Jeremy. (This used to be commit 2dab8928769938ab79da7b7ce2d165fc388f9b00)
-rw-r--r--source3/lib/dummysmbd.c17
-rw-r--r--source3/locking/locking.c37
-rw-r--r--source3/smbd/dir.c39
3 files changed, 44 insertions, 49 deletions
diff --git a/source3/lib/dummysmbd.c b/source3/lib/dummysmbd.c
index c97dec5ef3..a291a5884d 100644
--- a/source3/lib/dummysmbd.c
+++ b/source3/lib/dummysmbd.c
@@ -38,22 +38,13 @@ void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lo
{
}
-NTSTATUS dptr_create(connection_struct *conn, pstring path, BOOL old_handle, BOOL expect_close,uint16 spid,
- const char *wcard, BOOL wcard_has_wild, uint32 attr, struct dptr_struct **dptr_ret)
-{
- return NT_STATUS_OK;
-}
-
-int dptr_CloseDir(struct dptr_struct *dptr)
+void send_stat_cache_delete_message(const char *name)
{
- return 0;
}
-const char *dptr_ReadDirName(struct dptr_struct *dptr, long *poffset, SMB_STRUCT_STAT *pst)
+NTSTATUS can_delete_directory(struct connection_struct *conn,
+ const char *dirname)
{
- return NULL;
+ return NT_STATUS_OK;
}
-void send_stat_cache_delete_message(const char *name)
-{
-}
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 39cc991b5f..ffac43aff5 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1151,42 +1151,7 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, BOOL delete_on_close,
/* Don't allow delete on close for non-empty directories. */
if (fsp->is_directory) {
- long offset = 0;
- NTSTATUS status;
- SMB_STRUCT_STAT st;
- struct dptr_struct *dirptr;
- const char *name;
-
- status = dptr_create(fsp->conn,
- fsp->fsp_name,
- False,
- True,
- 0,
- "*",
- True,
- 0,
- &dirptr);
- if (!NT_STATUS_IS_OK(status)) {
- return status;
- }
-
- /* Read 3 entries. Ignore first 2 (they're . and .. ) */
- name = dptr_ReadDirName(dirptr, &offset, &st);
- if (!name) {
- dptr_CloseDir(dirptr);
- return NT_STATUS_ACCESS_DENIED;
- }
- name = dptr_ReadDirName(dirptr, &offset, &st);
- if (!name) {
- dptr_CloseDir(dirptr);
- return NT_STATUS_ACCESS_DENIED;
- }
- name = dptr_ReadDirName(dirptr, &offset, &st);
- dptr_CloseDir(dirptr);
- if (name) {
- DEBUG(10,("can_set_delete_on_close: got name %s - can't delete\n", name ));
- return NT_STATUS_DIRECTORY_NOT_EMPTY;
- }
+ return can_delete_directory(fsp->conn, fsp->fsp_name);
}
return NT_STATUS_OK;
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 9f0350fe6d..2795b2a24b 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1279,3 +1279,42 @@ BOOL SearchDir(struct smb_Dir *dirp, const char *name, long *poffset)
}
return False;
}
+
+/*****************************************************************
+ Is this directory empty ?
+*****************************************************************/
+
+NTSTATUS can_delete_directory(struct connection_struct *conn,
+ const char *dirname)
+{
+ NTSTATUS status = NT_STATUS_OK;
+ long dirpos = 0;
+ const char *dname;
+ struct smb_Dir *dir_hnd = OpenDir(conn, dirname, NULL, 0);
+
+ if (!dir_hnd) {
+ return map_nt_error_from_unix(errno);
+ }
+
+ while ((dname = ReadDirName(dir_hnd,&dirpos))) {
+ SMB_STRUCT_STAT st;
+
+ /* Quick check for "." and ".." */
+ if (dname[0] == '.') {
+ if (!dname[1] || (dname[1] == '.' && !dname[2])) {
+ continue;
+ }
+ }
+
+ if (!is_visible_file(conn, dirname, dname, &st, True)) {
+ continue;
+ }
+
+ DEBUG(10,("can_delete_directory: got name %s - can't delete\n", dname ));
+ status = NT_STATUS_DIRECTORY_NOT_EMPTY;
+ break;
+ }
+ CloseDir(dir_hnd);
+
+ return status;
+}