diff options
| author | Jeremy Allison <jra@samba.org> | 2014-05-01 11:11:20 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-05-19 12:20:12 +0200 |
| commit | cc20cef310ef60ea66d4a838d602eedbdcf9ffb4 (patch) | |
| tree | eb395ae78e4e7c8d4394a59d9e2801f2bd39bb1d | |
| parent | 9b62ae8337aaf154c141e9eec016c8a98de0becf (diff) | |
| download | samba-cc20cef310ef60ea66d4a838d602eedbdcf9ffb4.tar.gz | |
s3: smbd: Remove open_file_fchmod().
No longer used (hurrah!).
Bug 10564 - Lock order violation and file lost
https://bugzilla.samba.org/show_bug.cgi?id=10564
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri May 2 23:47:38 CEST 2014 on sn-devel-104
| -rw-r--r-- | source3/smbd/open.c | 33 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 3 |
2 files changed, 0 insertions, 36 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index a596bceb181..6d4f199f4bb 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2824,39 +2824,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, return NT_STATUS_OK; } - -/**************************************************************************** - Open a file for for write to ensure that we can fchmod it. -****************************************************************************/ - -NTSTATUS open_file_fchmod(connection_struct *conn, - struct smb_filename *smb_fname, - files_struct **result) -{ - if (!VALID_STAT(smb_fname->st)) { - return NT_STATUS_INVALID_PARAMETER; - } - - return SMB_VFS_CREATE_FILE( - conn, /* conn */ - NULL, /* req */ - 0, /* root_dir_fid */ - smb_fname, /* fname */ - FILE_WRITE_DATA, /* access_mask */ - (FILE_SHARE_READ | FILE_SHARE_WRITE | /* share_access */ - FILE_SHARE_DELETE), - FILE_OPEN, /* create_disposition*/ - 0, /* create_options */ - 0, /* file_attributes */ - INTERNAL_OPEN_ONLY, /* oplock_request */ - 0, /* allocation_size */ - 0, /* private_flags */ - NULL, /* sd */ - NULL, /* ea_list */ - result, /* result */ - NULL); /* pinfo */ -} - static NTSTATUS mkdir_internal(connection_struct *conn, struct smb_filename *smb_dname, uint32 file_attributes) diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index b89015bf92a..79978a1fb65 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -626,9 +626,6 @@ bool is_stat_open(uint32 access_mask); void remove_deferred_open_entry(struct file_id id, uint64_t mid, struct server_id pid); bool is_deferred_open_async(const void *ptr); -NTSTATUS open_file_fchmod(connection_struct *conn, - struct smb_filename *smb_fname, - files_struct **result); NTSTATUS create_directory(connection_struct *conn, struct smb_request *req, struct smb_filename *smb_dname); void msg_file_was_renamed(struct messaging_context *msg, |