summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-06-15 14:14:31 -0700
committerTim Prouty <tprouty@samba.org>2009-06-17 20:11:53 -0700
commit5cfac1a1bd59712d7a771d3631e869c5d078a0f3 (patch)
tree7b6830bd25ea8d0c542fad14de10b5151af2b660 /source3/modules
parent78e316ddbc15c37604c84cb08dd13c95e2539d68 (diff)
downloadsamba-5cfac1a1bd59712d7a771d3631e869c5d078a0f3.tar.gz
samba-5cfac1a1bd59712d7a771d3631e869c5d078a0f3.tar.bz2
samba-5cfac1a1bd59712d7a771d3631e869c5d078a0f3.zip
s3: Plumb smb_filename from create_file all of the way down to fd_open
I used the smb_filename struct everywhere that was feasible for the first pass. There are still some places in this path that need to be changed to use smb_filename, but this is a good start. I also: - Removed fname/path arguments from a few functions that weren't really using them. - Added a utility function for detecting whether an smb_filename is a stream.
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/onefs_open.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index c773f9ebbc..ef2f1fa487 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -685,8 +685,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn,
if (!posix_open && file_existed &&
((create_disposition == FILE_OVERWRITE) ||
(create_disposition == FILE_OVERWRITE_IF))) {
- if (!open_match_attributes(conn, fname,
- existing_dos_attributes,
+ if (!open_match_attributes(conn, existing_dos_attributes,
new_dos_attributes, psbuf->st_ex_mode,
unx_mode, &new_unx_mode)) {
DEBUG(5, ("onefs_open_file_ntcreate: attributes "
@@ -2018,15 +2017,11 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
/* Get the file name if root_dir_fid was specified. */
if (root_dir_fid != 0) {
- char *new_fname;
-
status = get_relative_fid_filename(conn, req, root_dir_fid,
- fname, &new_fname);
+ smb_fname);
if (!NT_STATUS_IS_OK(status)) {
goto fail;
}
-
- fname = new_fname;
}
/* Resolve the file name if this was a DFS pathname. */