sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

First part of fix for bug #8419 - Make VFS op "streaminfo" stackable.

Browse Source 
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Oct 17 21:39:32 CEST 2011 on sn-devel-104
This commit is contained in:
Frank Lahm 2011-10-17 11:10:29 -07:00 committed by Jeremy Allison
parent b96a9e1c5b
commit c3bdcab516
8 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/filename_util.c
View File

@ -47,7 +47,7 @@ NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx,
/**
* There are actually legitimate callers of this such as functions that
* enumerate streams using the SMB_VFS_STREAMINFO interface and then want to
* enumerate streams using the vfs_streaminfo interface and then want to
* operate on each stream.
*/
NTSTATUS create_synthetic_smb_fname(TALLOC_CTX *ctx, const char *base_name,

6
source3/smbd/close.c
View File

@ -212,8 +212,8 @@ NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
status = SMB_VFS_STREAMINFO(conn, NULL, fname, talloc_tos(),
&num_streams, &stream_info);
status = vfs_streaminfo(conn, NULL, fname, talloc_tos(),
&num_streams, &stream_info);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
DEBUG(10, ("no streams around\n"));
@ -222,7 +222,7 @@ NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
}
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("SMB_VFS_STREAMINFO failed: %s\n",
DEBUG(10, ("vfs_streaminfo failed: %s\n",
nt_errstr(status)));
goto fail;
}

4
source3/smbd/filename.c
View File

@ -1184,8 +1184,8 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
}
/* Fall back to a case-insensitive scan of all streams on the file. */
status = SMB_VFS_STREAMINFO(conn, NULL, smb_fname->base_name, mem_ctx,
&num_streams, &streams);
status = vfs_streaminfo(conn, NULL, smb_fname->base_name, mem_ctx,
&num_streams, &streams);
if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
SET_STAT_INVALID(smb_fname->st);

4
source3/smbd/nttrans.c
View File

@ -702,7 +702,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
if (NT_STATUS_IS_OK(status) && num_names) {
file_status &= ~NO_EAS;
}
status = SMB_VFS_STREAMINFO(conn, NULL, smb_fname->base_name, ctx,
status = vfs_streaminfo(conn, NULL, smb_fname->base_name, ctx,
&num_streams, &streams);
/* There is always one stream, ::$DATA. */
if (NT_STATUS_IS_OK(status) && num_streams > 1) {
@ -1283,7 +1283,7 @@ static void call_nt_transact_create(connection_struct *conn,
if (NT_STATUS_IS_OK(status) && num_names) {
file_status &= ~NO_EAS;
}
status = SMB_VFS_STREAMINFO(conn, NULL, smb_fname->base_name, ctx,
status = vfs_streaminfo(conn, NULL, smb_fname->base_name, ctx,
&num_streams, &streams);
/* There is always one stream, ::$DATA. */
if (NT_STATUS_IS_OK(status) && num_streams > 1) {

6
source3/smbd/open.c
View File

@ -2972,8 +2972,8 @@ NTSTATUS open_streams_for_delete(connection_struct *conn,
TALLOC_CTX *frame = talloc_stackframe();
NTSTATUS status;
status = SMB_VFS_STREAMINFO(conn, NULL, fname, talloc_tos(),
&num_streams, &stream_info);
status = vfs_streaminfo(conn, NULL, fname, talloc_tos(),
&num_streams, &stream_info);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)
|| NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
@ -2983,7 +2983,7 @@ NTSTATUS open_streams_for_delete(connection_struct *conn,
}
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("SMB_VFS_STREAMINFO failed: %s\n",
DEBUG(10, ("vfs_streaminfo failed: %s\n",
nt_errstr(status)));
goto fail;
}

6
source3/smbd/proto.h
View File

@ -1179,6 +1179,12 @@ int vfs_lstat_smb_fname(struct connection_struct *conn, const char *fname,
SMB_STRUCT_STAT *psbuf);
NTSTATUS vfs_stat_fsp(files_struct *fsp);
NTSTATUS vfs_chown_fsp(files_struct *fsp, uid_t uid, gid_t gid);
NTSTATUS vfs_streaminfo(connection_struct *conn,
struct files_struct *fsp,
const char *fname,
TALLOC_CTX *mem_ctx,
unsigned int *num_streams,
struct stream_struct **streams);
/* The following definitions come from smbd/avahi_register.c */

5
source3/smbd/trans2.c
View File

@ -4681,9 +4681,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
return NT_STATUS_INVALID_PARAMETER;
}
status = SMB_VFS_STREAMINFO(
conn, fsp, smb_fname->base_name, talloc_tos(),
&num_streams, &streams);
status = vfs_streaminfo(conn, fsp, smb_fname->base_name,
talloc_tos(), &num_streams, &streams);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("could not get stream info: %s\n",

15
source3/smbd/vfs.c
View File

@ -1126,6 +1126,21 @@ NTSTATUS vfs_stat_fsp(files_struct *fsp)
return NT_STATUS_OK;
}
/**
* Initialize num_streams and streams, then call VFS op streaminfo
*/
NTSTATUS vfs_streaminfo(connection_struct *conn,
struct files_struct *fsp,
const char *fname,
TALLOC_CTX *mem_ctx,
unsigned int *num_streams,
struct stream_struct **streams)
{
*num_streams = 0;
*streams = NULL;
return SMB_VFS_STREAMINFO(conn, fsp, fname, mem_ctx, num_streams, streams);
}
/*
generate a file_id from a stat structure
*/