diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-11-15 06:57:26 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:50 -0500 |
commit | 187412f3da4fbc6feeca15bd0c2527534255964e (patch) | |
tree | bd09f3cab5515bd89233a509d2a42238894f24eb /source4/ntvfs/posix/pvfs_rename.c | |
parent | 4719461a07a5494f01b4295e6f9e0479ea8e96a0 (diff) | |
download | samba-187412f3da4fbc6feeca15bd0c2527534255964e.tar.gz samba-187412f3da4fbc6feeca15bd0c2527534255964e.tar.bz2 samba-187412f3da4fbc6feeca15bd0c2527534255964e.zip |
r3747: - added some of the infrastructure needed for streams support in pvfs
(the IDL, and the load/save meta-data logic)
- changed pvfs_resolve_name() to default to non-wildcard, needing
PVFS_RESOLVE_WILDCARD to enable wildcards. Most callers don't want
wildcards, so defaulting this way makes more sense.
- fixed deletion of EAs
(This used to be commit e7afd4403cc1b7e0928776929f8988aa6f15640b)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_rename.c')
-rw-r--r-- | source4/ntvfs/posix/pvfs_rename.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source4/ntvfs/posix/pvfs_rename.c b/source4/ntvfs/posix/pvfs_rename.c index aae17f327c..efaf63ba9d 100644 --- a/source4/ntvfs/posix/pvfs_rename.c +++ b/source4/ntvfs/posix/pvfs_rename.c @@ -250,12 +250,14 @@ static NTSTATUS pvfs_rename_mv(struct ntvfs_module_context *ntvfs, struct pvfs_filename *name1, *name2; /* resolve the cifs name to a posix name */ - status = pvfs_resolve_name(pvfs, req, ren->rename.in.pattern1, 0, &name1); + status = pvfs_resolve_name(pvfs, req, ren->rename.in.pattern1, + PVFS_RESOLVE_WILDCARD, &name1); if (!NT_STATUS_IS_OK(status)) { return status; } - status = pvfs_resolve_name(pvfs, req, ren->rename.in.pattern2, 0, &name2); + status = pvfs_resolve_name(pvfs, req, ren->rename.in.pattern2, + PVFS_RESOLVE_WILDCARD, &name2); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -325,10 +327,6 @@ static NTSTATUS pvfs_rename_nt(struct ntvfs_module_context *ntvfs, return status; } - if (name1->has_wildcard || name2->has_wildcard) { - return NT_STATUS_OBJECT_PATH_SYNTAX_BAD; - } - if (!name1->exists) { return NT_STATUS_OBJECT_NAME_NOT_FOUND; } |