diff options
| author | Volker Lendecke <Volker.Lendecke@SerNet.DE> | 2013-08-28 15:42:22 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-08-30 10:07:24 +0200 |
| commit | 0150086d44e90351634a68aced1e44ad076a693c (patch) | |
| tree | 1ef7126ab46ed622cdf89d642a40347c3f6dca7f | |
| parent | b55072ccf8d801726aec49a925f5a69277a10494 (diff) | |
| download | samba-0150086d44e90351634a68aced1e44ad076a693c.tar.gz | |
smbd: Simplify dropbox special case in unix_convert
EACCESS needs special treatment: If we want to create a fresh file,
return OBJECT_PATH_NOT_FOUND, so that the client will continue creating
the file. If the client wants us to open a potentially existing file,
we need to correctly return ACCESS_DENIED.
This patch makes this behaviour hopefully a bit clearer than the code
before did.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
The last 2 patches address bug #10114 - Dropbox (write-only-directory) case
isn't handled correctly in pathname lookup.
| -rw-r--r-- | source3/smbd/filename.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 934634a5b6c..8ef0c0a9579 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -713,13 +713,29 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, /* * 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. + * here. */ - if ((errno != 0) && (errno != ENOENT) - && ((ucf_flags & UCF_CREATING_FILE) && - (errno != EACCES))) { + if (errno == EACCES) { + if (ucf_flags & UCF_CREATING_FILE) { + /* + * This is the dropbox + * behaviour. A dropbox is a + * directory with only -wx + * permissions, so + * get_real_filename fails + * with EACCESS, it needs to + * list the directory. We + * nevertheless want to allow + * users creating a file. + */ + status = NT_STATUS_OBJECT_PATH_NOT_FOUND; + } else { + status = NT_STATUS_ACCESS_DENIED; + } + goto fail; + } + + if ((errno != 0) && (errno != ENOENT)) { /* * ENOTDIR and ELOOP both map to * NT_STATUS_OBJECT_PATH_NOT_FOUND |