diff options
| author | Jeremy Allison <jra@samba.org> | 2007-01-13 02:13:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:06 -0500 |
| commit | 50b3dacb525d026dd7d280948d8a63075756d029 (patch) | |
| tree | 367aee057a29d66a17e1956155e0c2499fac9183 /source3/smbd | |
| parent | dd5e9e2ae7ba3c4f3d4d8e02c7a993dd8e164c5b (diff) | |
| download | samba-50b3dacb525d026dd7d280948d8a63075756d029.tar.gz samba-50b3dacb525d026dd7d280948d8a63075756d029.tar.bz2 samba-50b3dacb525d026dd7d280948d8a63075756d029.zip | |
r20722: RAW-CHKPATH should now pass, build farm should
go back to normal. Sorry about that.
Jeremy.
(This used to be commit d4127034fb89185fe7464d57c9f56f7914da6141)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/filename.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index dd1e0de20f..a36b7ff282 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -391,15 +391,24 @@ NTSTATUS unix_convert(connection_struct *conn, * Windows applications depend on the difference between * these two errors. */ - if (errno == ENOENT) { + + /* ENOENT and ENOTDIR both map to NT_STATUS_OBJECT_PATH_NOT_FOUND + in the filename walk. */ + + if (errno == ENOENT || errno == ENOTDIR) { return NT_STATUS_OBJECT_PATH_NOT_FOUND; } return map_nt_error_from_unix(errno); } - if (errno == ENOTDIR) { - /* Name exists but is not a directory. */ - return map_nt_error_from_unix(ENOTDIR); + /* ENOENT is the only valid error here. */ + if (errno != ENOENT) { + /* ENOENT and ENOTDIR both map to NT_STATUS_OBJECT_PATH_NOT_FOUND + in the filename walk. */ + if (errno == ENOTDIR) { + return NT_STATUS_OBJECT_PATH_NOT_FOUND; + } + return map_nt_error_from_unix(errno); } /* |