summaryrefslogtreecommitdiff
path: root/source3/include/proto.h
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/include/proto.h
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/include/proto.h')
-rw-r--r--source3/include/proto.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1c7ba8725a..8435b790a8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6337,7 +6337,8 @@ NTSTATUS close_fake_file(struct smb_request *req, files_struct *fsp);
bool can_access_file_acl(struct connection_struct *conn,
const char * fname,
uint32_t access_mask);
-bool can_delete_file_in_directory(connection_struct *conn, const char *fname);
+bool can_delete_file_in_directory(connection_struct *conn,
+ const struct smb_filename *smb_fname);
bool can_access_file_data(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf, uint32 access_mask);
bool can_write_to_file(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf);
bool directory_has_default_acl(connection_struct *conn, const char *fname);
@@ -6581,6 +6582,7 @@ void send_nt_replies(connection_struct *conn,
char *params, int paramsize,
char *pdata, int datasize);
bool is_ntfs_stream_name(const char *fname);
+bool is_ntfs_stream_smb_fname(const struct smb_filename *smb_fname);
void reply_ntcreate_and_X(struct smb_request *req);
void reply_ntcancel(struct smb_request *req);
void reply_ntrename(struct smb_request *req);
@@ -6606,7 +6608,6 @@ bool is_stat_open(uint32 access_mask);
bool request_timed_out(struct timeval request_time,
struct timeval timeout);
bool open_match_attributes(connection_struct *conn,
- const char *path,
uint32 old_dos_attr,
uint32 new_dos_attr,
mode_t existing_unx_mode,
@@ -6662,7 +6663,7 @@ NTSTATUS create_file_default(connection_struct *conn,
NTSTATUS get_relative_fid_filename(connection_struct *conn,
struct smb_request *req,
uint16_t root_dir_fid,
- const char *fname, char **new_fname);
+ struct smb_filename *smb_fname);
/* The following definitions come from smbd/oplock.c */