From 522418ce16f8d0af8dcf4673a795b42e14ea9e9c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 16 Aug 2007 00:22:35 +0000 Subject: r24475: Fix the error mapping for SMB_POSIX_PATH_OPEN. Jeremy. (This used to be commit 6dac315ba1d9b9582c2b573e0785b2f6d627f846) --- source3/smbd/trans2.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/smbd') diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 355c040a1c..a01e79b624 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -6515,6 +6515,18 @@ static void call_trans2setfilepathinfo(connection_struct *conn, ERRSRV, ERRbadpath); return; } + if (info_level == SMB_POSIX_PATH_OPEN && + 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. + */ + return ERROR_BOTH(NT_STATUS_OBJECT_NAME_COLLISION, + ERRDOS, ERRfilexists); + } + reply_nterror(req, status); return; } -- cgit