diff options
author | Tim Prouty <tprouty@samba.org> | 2009-06-16 12:01:13 -0700 |
---|---|---|
committer | Tim Prouty <tprouty@samba.org> | 2009-06-17 20:11:53 -0700 |
commit | 4e3656b8d1d0bf8c0c4ade01332e7384ea890810 (patch) | |
tree | efcb240c8b0dbdd791e01dfe62a50f4cfdca47e5 /source3/modules/vfs_default.c | |
parent | 5cfac1a1bd59712d7a771d3631e869c5d078a0f3 (diff) | |
download | samba-4e3656b8d1d0bf8c0c4ade01332e7384ea890810.tar.gz samba-4e3656b8d1d0bf8c0c4ade01332e7384ea890810.tar.xz samba-4e3656b8d1d0bf8c0c4ade01332e7384ea890810.zip |
s3: Change SMB_VFS_OPEN to take an smb_filename struct
This was a little messy because of all of the vfs modules I had to
touch. Most of them were pretty straight forward, but the streams
modules required a little attention to handle smb_filename. Since the
use of smb_filename enables the vfs modules to access the raw,
over-the-wire stream, a little bit of the handling that was being done
by split_ntfs_stream_name has now been shifted into the individual
stream modules. It may be a little more code, but overall it gives
more flexibility to the streams modules, while also allowing correct
stream handling.
Diffstat (limited to 'source3/modules/vfs_default.c')
-rw-r--r-- | source3/modules/vfs_default.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 28adce5768..0e7ba05632 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -214,13 +214,31 @@ static void vfswrap_init_search_op(vfs_handle_struct *handle, /* File operations */ -static int vfswrap_open(vfs_handle_struct *handle, const char *fname, - files_struct *fsp, int flags, mode_t mode) +static int vfswrap_open(vfs_handle_struct *handle, + struct smb_filename *smb_fname, + files_struct *fsp, int flags, mode_t mode) { int result; + NTSTATUS status; + char *fname = NULL; START_PROFILE(syscall_open); + + /* + * XXX: Should an error be returned if there is a stream rather than + * trying to open a filename with a ':'? + */ + status = get_full_smb_filename(talloc_tos(), smb_fname, + &fname); + if (!NT_STATUS_IS_OK(status)) { + errno = map_errno_from_nt_status(status); + return -1; + } + result = sys_open(fname, flags, mode); + + TALLOC_FREE(fname); + END_PROFILE(syscall_open); return result; } |