sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

r24476: Fix the mappings in reply_opeXXX calls. Now to test renames.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2007-08-16 00:37:07 +00:00 committed by Gerald (Jerry) Carter
parent 6dac315ba1
commit 74d10b09a6
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/smbd/reply.c
View File

@ -1551,13 +1551,23 @@ void reply_open(connection_struct *conn, struct smb_request *req)
&info, &fsp);
if (!NT_STATUS_IS_OK(status)) {
END_PROFILE(SMBopen);
if (open_was_deferred(req->mid)) {
/* We have re-scheduled this call. */
END_PROFILE(SMBopen);
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);
return;
}
reply_nterror(req, status);
END_PROFILE(SMBopen);
return;
}
@ -1718,7 +1728,6 @@ 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)) {
@ -1730,11 +1739,9 @@ void reply_open_and_X(connection_struct *conn, struct smb_request *req)
*/
reply_botherror(req, NT_STATUS_OBJECT_NAME_COLLISION,
ERRDOS, ERRfilexists);
END_PROFILE(SMBopenX);
return;
}
reply_nterror(req, status);
END_PROFILE(SMBopenX);
return;
}
@ -2075,13 +2082,23 @@ void reply_ctemp(connection_struct *conn, struct smb_request *req)
close(tmpfd);
if (!NT_STATUS_IS_OK(status)) {
END_PROFILE(SMBctemp);
if (open_was_deferred(req->mid)) {
/* We have re-scheduled this call. */
END_PROFILE(SMBctemp);
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);
return;
}
reply_nterror(req, status);
END_PROFILE(SMBctemp);
return;
}

4
source/smbd/trans2.c
View File

@ -6523,8 +6523,10 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
* ERRDOS/183, we need to return ERRDOS/80, see bug
* 4852.
*/
return ERROR_BOTH(NT_STATUS_OBJECT_NAME_COLLISION,
reply_botherror(req,
NT_STATUS_OBJECT_NAME_COLLISION,
ERRDOS, ERRfilexists);
return;
}
reply_nterror(req, status);