[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-1920-g34c2172
Volker Lendecke
vlendec at samba.org
Sat May 30 09:29:33 GMT 2009
The branch, master has been updated
via 34c2172ae83d30f2d4e20baab8e3d3676179110f (commit)
from 29d25d5ebfc5b0c76d066685de5cd12e8ebb6cda (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 34c2172ae83d30f2d4e20baab8e3d3676179110f
Author: Jeremy Allison <jra at samba.org>
Date: Sat May 30 11:30:16 2009 +0200
Simplify the dropbox patch
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/filename.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index bcd8560..059dca2 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -513,8 +513,14 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
goto fail;
}
- /* ENOENT is the only valid error here. */
- if ((errno != 0) && (errno != ENOENT)) {
+ /*
+ * ENOENT/EACCESS are the only valid errors
+ * here. EACCESS needs handling here for
+ * "dropboxes", i.e. directories where users
+ * can only put stuff with permission -wx.
+ */
+ if ((errno != 0) && (errno != ENOENT)
+ && (errno != EACCES)) {
/*
* ENOTDIR and ELOOP both map to
* NT_STATUS_OBJECT_PATH_NOT_FOUND
@@ -524,12 +530,11 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
errno == ELOOP) {
result =
NT_STATUS_OBJECT_PATH_NOT_FOUND;
- goto fail;
- } else if (errno != EACCES) {
+ } else {
result =
map_nt_error_from_unix(errno);
- goto fail;
}
+ goto fail;
}
/*
--
Samba Shared Repository
More information about the samba-cvs
mailing list