sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

s3: smbd: Change delete_all_streams() to take a const struct smb_filename *.

Browse Source 
Prepare for changing the interface to vfs_streaminfo().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison
2016-03-04 14:07:04 -08:00
committed by Ralph Boehme
parent 859d9784ba
commit a3856cbf89
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source3/smbd/close.c
View File

@ -161,7 +161,8 @@ static NTSTATUS close_filestruct(files_struct *fsp)
Delete all streams
****************************************************************************/
NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
NTSTATUS delete_all_streams(connection_struct *conn,
const struct smb_filename *smb_fname)
{
struct stream_struct *stream_info = NULL;
int i;
@ -169,7 +170,7 @@ NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
status = vfs_streaminfo(conn, NULL, fname, talloc_tos(),
status = vfs_streaminfo(conn, NULL, smb_fname->base_name, talloc_tos(),
&num_streams, &stream_info);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
@ -200,8 +201,10 @@ NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
continue;
}
smb_fname_stream = synthetic_smb_fname(
talloc_tos(), fname, stream_info[i].name, NULL);
smb_fname_stream = synthetic_smb_fname(talloc_tos(),
smb_fname->base_name,
stream_info[i].name,
NULL);
if (smb_fname_stream == NULL) {
DEBUG(0, ("talloc_aprintf failed\n"));
@ -427,7 +430,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
&& !is_ntfs_stream_smb_fname(fsp->fsp_name)) {
status = delete_all_streams(conn, fsp->fsp_name->base_name);
status = delete_all_streams(conn, fsp->fsp_name);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5, ("delete_all_streams failed: %s\n",
@ -1145,7 +1148,7 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
if ((fsp->conn->fs_capabilities & FILE_NAMED_STREAMS)
&& !is_ntfs_stream_smb_fname(fsp->fsp_name)) {
status = delete_all_streams(fsp->conn, fsp->fsp_name->base_name);
status = delete_all_streams(fsp->conn, fsp->fsp_name);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5, ("delete_all_streams failed: %s\n",
nt_errstr(status)));

2
source3/smbd/open.c
View File

@ -3060,7 +3060,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
/* Delete streams if create_disposition requires it */
if (!new_file_created && clear_ads(create_disposition) &&
!is_ntfs_stream_smb_fname(smb_fname)) {
status = delete_all_streams(conn, smb_fname->base_name);
status = delete_all_streams(conn, smb_fname);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(lck);
fd_close(fsp);

3
source3/smbd/proto.h
View File

@ -144,7 +144,8 @@ void msg_close_file(struct messaging_context *msg_ctx,
uint32_t msg_type,
struct server_id server_id,
DATA_BLOB *data);
NTSTATUS delete_all_streams(connection_struct *conn, const char *fname);
NTSTATUS delete_all_streams(connection_struct *conn,
const struct smb_filename *smb_fname);
bool recursive_rmdir(TALLOC_CTX *ctx,
connection_struct *conn,
struct smb_filename *smb_dname);