diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-24 11:51:58 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-05-24 11:51:58 +0000 |
| commit | aa285580c3457c0f71dd6f9a90df345f41908747 (patch) | |
| tree | 4ff8c0627c7d79dc19e428579f76023d0f51d042 | |
| parent | bff3f59be4f0df2abd56a5b669384cbad9d2d998 (diff) | |
| download | samba-aa285580c3457c0f71dd6f9a90df345f41908747.tar.gz | |
r23113: one more rename-on-an-fd fix from Jeremy
| -rw-r--r-- | source/smbd/reply.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/smbd/reply.c b/source/smbd/reply.c index 7fc4f0e1c46..6e9aa65dded 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -4195,9 +4195,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; } |