summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-12-28 00:10:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:45 -0500
commit3430c1ddb825a458f294e48c351be010698bad69 (patch)
tree0a7068c70bffe5c39f16d142f2451ec68ce71f3f
parent654f747e6df985b6b519925662bf1014b98d1670 (diff)
downloadsamba-3430c1ddb825a458f294e48c351be010698bad69.tar.gz
samba-3430c1ddb825a458f294e48c351be010698bad69.tar.bz2
samba-3430c1ddb825a458f294e48c351be010698bad69.zip
r20371: In renames (via SMBmv) both src and dest can contain
wcards. I had forgotten this and had refused to allow dest to contain wcards. We now pass all the normal Samba4 smbtorture RAW-RENAME tests. Jeremy (This used to be commit 4183c1b49fd5a6107aa87249b7be236af092ed8b)
-rw-r--r--source3/smbd/reply.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 1bd87a5a13..ec588d4478 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4612,18 +4612,19 @@ int reply_mv(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
char *p;
uint32 attrs = SVAL(inbuf,smb_vwv0);
NTSTATUS status;
- BOOL path_contains_wcard = False;
+ BOOL path1_contains_wcard = False;
+ BOOL path2_contains_wcard = False;
START_PROFILE(SMBmv);
p = smb_buf(inbuf) + 1;
- p += srvstr_get_path_wcard(inbuf, name, p, sizeof(name), 0, STR_TERMINATE, &status, &path_contains_wcard);
+ p += srvstr_get_path_wcard(inbuf, name, p, sizeof(name), 0, STR_TERMINATE, &status, &path1_contains_wcard);
if (!NT_STATUS_IS_OK(status)) {
END_PROFILE(SMBmv);
return ERROR_NT(status);
}
p++;
- p += srvstr_get_path(inbuf, newname, p, sizeof(newname), 0, STR_TERMINATE, &status);
+ p += srvstr_get_path_wcard(inbuf, newname, p, sizeof(newname), 0, STR_TERMINATE, &status, &path2_contains_wcard);
if (!NT_STATUS_IS_OK(status)) {
END_PROFILE(SMBmv);
return ERROR_NT(status);
@@ -4634,7 +4635,7 @@ int reply_mv(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
DEBUG(3,("reply_mv : %s -> %s\n",name,newname));
- status = rename_internals(conn, name, newname, attrs, False, path_contains_wcard);
+ status = rename_internals(conn, name, newname, attrs, False, path1_contains_wcard);
if (!NT_STATUS_IS_OK(status)) {
END_PROFILE(SMBmv);
if (open_was_deferred(SVAL(inbuf,smb_mid))) {