summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-11-21 12:14:53 -0800
committerJeremy Allison <jra@samba.org>2008-11-21 12:14:53 -0800
commit97fb05c2c0d0b08f3ed5aa7358a4d6d8c1725012 (patch)
treeab3142c02ae83f60cd92f2717d567f36612d918c /source3/include
parent9164b14a9fb1fee9ddec275032bb911d34b683d5 (diff)
downloadsamba-97fb05c2c0d0b08f3ed5aa7358a4d6d8c1725012.tar.gz
samba-97fb05c2c0d0b08f3ed5aa7358a4d6d8c1725012.tar.bz2
samba-97fb05c2c0d0b08f3ed5aa7358a4d6d8c1725012.zip
First part of fix for bug #5903 - vfs_streams_xattr breaks contents of the file.
Restructures parts of open code so that fsp must be allocated before calling open_file_ntcreate(_internal). Also fix up file ref-counting inside files.c. Jeremy.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index dd4b9d15f7..2cf1a9645e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4866,7 +4866,7 @@ bool sysv_cache_reload(void);
NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn,
const char *fname,
- uint16_t current_vuid, files_struct **result);
+ uint16_t current_vuid, files_struct *fsp);
void print_fsp_end(files_struct *fsp, enum file_close_type close_type);
/* The following definitions come from printing/printing.c */
@@ -7860,9 +7860,9 @@ void file_sync_all(connection_struct *conn);
void file_free(struct smb_request *req, files_struct *fsp);
files_struct *file_fnum(uint16 fnum);
files_struct *file_fsp(struct smb_request *req, uint16 fid);
-NTSTATUS dup_file_fsp(struct smb_request *req, files_struct *fsp,
+void dup_file_fsp(struct smb_request *req, files_struct *from,
uint32 access_mask, uint32 share_access,
- uint32 create_options, files_struct **result);
+ uint32 create_options, files_struct *to);
/* The following definitions come from smbd/ipc.c */