sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

vfs_ring: Adapt to 4.13 VFS

Browse Source
This commit is contained in:
Volker Lendecke 2020-08-10 12:12:30 +02:00 committed by Karolin Seeger
parent b29103ef46
commit 191c2cd7b9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/modules/vfs_ring.c
View File

@ -26,11 +26,12 @@
#define GRFN_PREFIX_LEN (sizeof(GRFN_PREFIX)-1) #define GRFN_PREFIX_LEN (sizeof(GRFN_PREFIX)-1)
static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle, static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle,
const char *path, const struct smb_filename *dirpath,
const char *name, const char *name,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
char **found_name) char **found_name)
{ {
const char *path = dirpath->base_name;
bool mangled; bool mangled;
char attr_name [NAME_MAX+1]; char attr_name [NAME_MAX+1];
char attr_value[NAME_MAX+1]; char attr_value[NAME_MAX+1];
@ -44,6 +45,7 @@ static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle,
path, path,
NULL, NULL,
NULL, NULL,
dirpath->twrp,
0); 0);
if (smb_fname == NULL) { if (smb_fname == NULL) {
errno = ENOMEM; errno = ENOMEM;
@ -56,7 +58,7 @@ static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle,
mangled = mangle_is_mangled(name, handle->conn->params); mangled = mangle_is_mangled(name, handle->conn->params);
if (mangled) { if (mangled) {
return SMB_VFS_NEXT_GET_REAL_FILENAME( return SMB_VFS_NEXT_GET_REAL_FILENAME(
handle, path, name, mem_ctx, found_name); handle, dirpath, name, mem_ctx, found_name);
} }
if (strlen(name) > NAME_MAX - GRFN_PREFIX_LEN) { if (strlen(name) > NAME_MAX - GRFN_PREFIX_LEN) {
@ -75,7 +77,7 @@ static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle,
path, name, strerror(errno))); path, name, strerror(errno)));
if (errno == EOPNOTSUPP) if (errno == EOPNOTSUPP)
return SMB_VFS_NEXT_GET_REAL_FILENAME( return SMB_VFS_NEXT_GET_REAL_FILENAME(
handle, path, name, mem_ctx, found_name); handle, dirpath, name, mem_ctx, found_name);
if (errno == ENOATTR) if (errno == ENOATTR)
errno = ENOENT; errno = ENOENT;
return -1; return -1;