diff options
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; } |