diff options
| author | Jeremy Allison <jra@samba.org> | 2004-04-03 01:21:13 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-04-03 01:21:13 +0000 |
| commit | c2699d25462e8684bded32adada78addf88b6df5 (patch) | |
| tree | 65ea0af3901b0ada7ec3eb7191f0f09b1cda10f9 /source3 | |
| parent | 3d5fdced72a70a658f684da2430e6b625c80540a (diff) | |
| download | samba-c2699d25462e8684bded32adada78addf88b6df5.tar.gz samba-c2699d25462e8684bded32adada78addf88b6df5.tar.bz2 samba-c2699d25462e8684bded32adada78addf88b6df5.zip | |
Fix wildcard src with wildcard dest renames.
Jeremy.
(This used to be commit 58b39942444e62c9d0f98c2ba6f434d74c244a2b)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 42167c6e81..ac239c7e04 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3409,6 +3409,9 @@ static BOOL resolve_wildcards(const char *name1, char *name2) if (*p2 == '?') { *p2 = *p; p2++; + } else if (*p2 == '*') { + pstrcpy(p2, p); + break; } else { p2++; } @@ -3422,6 +3425,9 @@ static BOOL resolve_wildcards(const char *name1, char *name2) if (*p2 == '?') { *p2 = *p; p2++; + } else if (*p2 == '*') { + pstrcpy(p2, p); + break; } else { p2++; } @@ -3838,7 +3844,7 @@ directory = %s, newname = %s, last_component_dest = %s, is_8_3 = %d\n", if (sysdir_entry) { error = NT_STATUS_OBJECT_NAME_INVALID; - continue; + break; } error = NT_STATUS_ACCESS_DENIED; |