1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00

r23107: Fix renames on file descriptors that are supposed to overwrite the

target. Needs merging for 3.0.25a (sorry).
Jeremy.
(This used to be commit a56bce3d44e89b4fd7806cc5b464c7481ec0197f)
This commit is contained in:
Jeremy Allison 2007-05-24 01:57:02 +00:00 committed by Gerald (Jerry) Carter
parent f5038178a9
commit 4aa857d875

View File

@ -4245,9 +4245,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, files_struct *fsp, pstrin
ZERO_STRUCT(sbuf);
status = unix_convert(conn, newname, False, newname_last_component, &sbuf);
/* We expect this to be NT_STATUS_OBJECT_PATH_NOT_FOUND */
if (!NT_STATUS_EQUAL(NT_STATUS_OBJECT_PATH_NOT_FOUND, status)) {
return NT_STATUS_OBJECT_NAME_COLLISION;
/* If an error we expect this to be NT_STATUS_OBJECT_PATH_NOT_FOUND */
if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(NT_STATUS_OBJECT_PATH_NOT_FOUND, status)) {
return status;
}