sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

r1257: Ensure we deferr a sharing violation on rename correctly.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2004-06-25 22:37:50 +00:00 committed by Gerald (Jerry) Carter
parent f17382ad8a
commit b52a04a5cd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/smbd/nttrans.c
View File

@ -1555,8 +1555,13 @@ int reply_ntrename(connection_struct *conn,
return ERROR_NT(NT_STATUS_ACCESS_DENIED);
}
if (ms_has_wild(oldname)) {
END_PROFILE(SMBntrename);
return ERROR_NT(NT_STATUS_OBJECT_PATH_SYNTAX_BAD);
}
p++;
p += srvstr_get_path(inbuf, newname, p, sizeof(newname), 0, STR_TERMINATE, &status, True);
p += srvstr_get_path(inbuf, newname, p, sizeof(newname), 0, STR_TERMINATE, &status, False);
if (!NT_STATUS_IS_OK(status)) {
END_PROFILE(SMBntrename);
return ERROR_NT(status);
@ -1575,6 +1580,11 @@ int reply_ntrename(connection_struct *conn,
if (!NT_STATUS_IS_OK(status)) {
END_PROFILE(SMBntrename);
if (open_was_deferred(SVAL(inbuf,smb_mid))) {
/* We have re-scheduled this call. */
clear_cached_errors();
return -1;
}
return ERROR_NT(status);
}