diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-15 13:44:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:49 -0500 |
| commit | 6051d516547813d48b58d0519ee9f52b291c1ed2 (patch) | |
| tree | 40c95c795b5cbab61e487ed71dc32489a045e11d /source3/smbd | |
| parent | fe068284e90ee78d78c6e52de45cec0479107185 (diff) | |
| download | samba-6051d516547813d48b58d0519ee9f52b291c1ed2.tar.gz samba-6051d516547813d48b58d0519ee9f52b291c1ed2.tar.bz2 samba-6051d516547813d48b58d0519ee9f52b291c1ed2.zip | |
r24461: Fix Bug 4852, thank to anto <sistemac@prosoft.ba> for reporting it.
(This used to be commit 0fecd8a0c3aaa64e137d2efd3f9cc7705837ea2a)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index a95f2ec87e..786fe9c6a1 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1718,9 +1718,23 @@ void reply_open_and_X(connection_struct *conn, struct smb_request *req) END_PROFILE(SMBopenX); if (open_was_deferred(req->mid)) { /* We have re-scheduled this call. */ + END_PROFILE(SMBopenX); + return; + } + if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) { + /* + * We hit an existing file, and if we're returning DOS + * error codes OBJECT_NAME_COLLISION would map to + * ERRDOS/183, we need to return ERRDOS/80, see bug + * 4852. + */ + reply_botherror(req, NT_STATUS_OBJECT_NAME_COLLISION, + ERRDOS, ERRfilexists); + END_PROFILE(SMBopenX); return; } reply_nterror(req, status); + END_PROFILE(SMBopenX); return; } |