summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-03 17:52:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:06 -0500
commit6eb9567c3f68869f691e29d5daffe3ea28858a46 (patch)
tree9689d53f498ecbf1134bc493d642f4282aecd746 /source4
parent8d5f642ee174efae25b7fe0498f07b9a13f8bfa1 (diff)
downloadsamba-6eb9567c3f68869f691e29d5daffe3ea28858a46.tar.gz
samba-6eb9567c3f68869f691e29d5daffe3ea28858a46.tar.bz2
samba-6eb9567c3f68869f691e29d5daffe3ea28858a46.zip
r9009: directory not empty is not an error on failure to delete directory in delete on close
(This used to be commit dada509f5e374872cded9035611c9d4fd9f4c4c7)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 3ae8e2150f..d3b9681b58 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -75,7 +75,7 @@ static int pvfs_dir_handle_destructor(void *p)
DEBUG(0,("Warning: xattr rmdir hook failed for '%s' - %s\n",
h->name->full_name, nt_errstr(status)));
}
- if (rmdir(h->name->full_name) != 0) {
+ if (rmdir(h->name->full_name) != 0 && errno != ENOTEMPTY) {
DEBUG(0,("pvfs_close: failed to rmdir '%s' - %s\n",
h->name->full_name, strerror(errno)));
}