sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: Update streaminfo implementations now that only base names are passed through the vfs

Browse Source
This commit is contained in:
Tim Prouty 2009-07-06 15:26:57 -07:00
parent 38b081f852
commit 431e63cd8b
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/modules/onefs_streams.c
View File

@ -739,17 +739,10 @@ NTSTATUS onefs_streaminfo(vfs_handle_struct *handle,
/* Get a valid stat. */
if ((fsp != NULL) && (fsp->fh->fd != -1)) {
if (is_ntfs_stream_name(fsp->fsp_name)) {
return NT_STATUS_INVALID_PARAMETER;
}
ret = SMB_VFS_FSTAT(fsp, &sbuf);
} else {
struct smb_filename *smb_fname = NULL;
if (is_ntfs_stream_name(fname)) {
return NT_STATUS_INVALID_PARAMETER;
}
status = create_synthetic_smb_fname(talloc_tos(), fname, NULL,
NULL, &smb_fname);
if (!NT_STATUS_IS_OK(status)) {

12
source3/modules/vfs_default.c
View File

@ -1151,7 +1151,17 @@ static NTSTATUS vfswrap_streaminfo(vfs_handle_struct *handle,
ret = SMB_VFS_FSTAT(fsp, &sbuf);
}
else {
ret = vfs_stat_smb_fname(handle->conn, fname, &sbuf);
struct smb_filename *smb_fname = NULL;
NTSTATUS status;
status = create_synthetic_smb_fname(talloc_tos(), fname, NULL,
NULL, &smb_fname);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
ret = SMB_VFS_STAT(handle->conn, smb_fname);
sbuf = smb_fname->st;
TALLOC_FREE(smb_fname);
}
if (ret == -1) {

6
source3/modules/vfs_streams_depot.c
View File

@ -819,15 +819,9 @@ static NTSTATUS streams_depot_streaminfo(vfs_handle_struct *handle,
}
if ((fsp != NULL) && (fsp->fh->fd != -1)) {
if (is_ntfs_stream_name(fsp->fsp_name)) {
return NT_STATUS_INVALID_PARAMETER;
}
ret = SMB_VFS_NEXT_FSTAT(handle, fsp, &smb_fname_base->st);
}
else {
if (is_ntfs_stream_name(fname)) {
return NT_STATUS_INVALID_PARAMETER;
}
if (lp_posix_pathnames()) {
ret = SMB_VFS_NEXT_LSTAT(handle, smb_fname_base);
} else {

16
source3/modules/vfs_streams_xattr.c
View File

@ -785,20 +785,22 @@ static NTSTATUS streams_xattr_streaminfo(vfs_handle_struct *handle,
struct streaminfo_state state;
if ((fsp != NULL) && (fsp->fh->fd != -1)) {
if (is_ntfs_stream_name(fsp->fsp_name)) {
return NT_STATUS_INVALID_PARAMETER;
}
ret = SMB_VFS_FSTAT(fsp, &sbuf);
}
else {
if (is_ntfs_stream_name(fname)) {
return NT_STATUS_INVALID_PARAMETER;
struct smb_filename *smb_fname = NULL;
status = create_synthetic_smb_fname(talloc_tos(), fname, NULL,
NULL, &smb_fname);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
if (lp_posix_pathnames()) {
ret = vfs_lstat_smb_fname(handle->conn, fname, &sbuf);
ret = SMB_VFS_LSTAT(handle->conn, smb_fname);
} else {
ret = vfs_stat_smb_fname(handle->conn, fname, &sbuf);
ret = SMB_VFS_STAT(handle->conn, smb_fname);
}
sbuf = smb_fname->st;
TALLOC_FREE(smb_fname);
}
if (ret == -1) {