sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00
Code

s3: smbd: SMB1 reply_ntrename() - the source cannot have a wildcard.

Browse Source 
Simplify the wildcard processing of the source name.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2020-09-28 20:45:55 -07:00 committed by Ralph Boehme
parent 5547cc803c
commit b7ca811ef5
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/smbd/nttrans.c
View File

@ -1708,7 +1708,6 @@ void reply_ntrename(struct smb_request *req)
const char *dst_original_lcomp = NULL;
const char *p;
NTSTATUS status;
bool src_has_wcard = False;
bool dest_has_wcard = False;
uint32_t attrs;
uint32_t ucf_flags_src = ucf_flags_from_smb_request(req);
@ -1728,8 +1727,8 @@ void reply_ntrename(struct smb_request *req)
rename_type = SVAL(req->vwv+1, 0);
p = (const char *)req->buf + 1;
p += srvstr_get_path_req_wcard(ctx, req, &oldname, p, STR_TERMINATE,
&status, &src_has_wcard);
p += srvstr_get_path_req(ctx, req, &oldname, p, STR_TERMINATE,
&status);
if (!NT_STATUS_IS_OK(status)) {
reply_nterror(req, status);
goto out;
@ -1765,7 +1764,6 @@ void reply_ntrename(struct smb_request *req)
* destination's last component.
*/
if (rename_type == RENAME_FLAG_RENAME) {
ucf_flags_src |= UCF_ALWAYS_ALLOW_WCARD_LCOMP;
ucf_flags_dst |= UCF_ALWAYS_ALLOW_WCARD_LCOMP;
}
@ -1841,12 +1839,12 @@ void reply_ntrename(struct smb_request *req)
dst_original_lcomp,
attrs,
false,
src_has_wcard,
false, /* src_has_wcard */
dest_has_wcard,
DELETE_ACCESS);
break;
case RENAME_FLAG_HARD_LINK:
if (src_has_wcard || dest_has_wcard) {
if (dest_has_wcard) {
/* No wildcards. */
status = NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
} else {
@ -1858,7 +1856,7 @@ void reply_ntrename(struct smb_request *req)
}
break;
case RENAME_FLAG_COPY:
if (src_has_wcard || dest_has_wcard) {
if (dest_has_wcard) {
/* No wildcards. */
status = NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
} else {