diff options
| author | Karolin Seeger <kseeger@samba.org> | 2020-09-14 11:47:44 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-09-14 12:06:18 +0200 |
| commit | d61eb49180f628305359f605a3c841359f9b096d (patch) | |
| tree | 15395bf740ce05efe58ad9ce30cd395d2d45d8ec | |
| parent | b3845522bece6565507cdbb1f1e215d320fcc1b0 (diff) | |
| download | samba-d61eb49180f628305359f605a3c841359f9b096d.tar.gz | |
Revert "vfs_ring: Adapt to 4.13 VFS"
This reverts commit 191c2cd7b93524fc1ee119c0f995171fb38dc210.
| -rw-r--r-- | source3/modules/vfs_ring.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/modules/vfs_ring.c b/source3/modules/vfs_ring.c index eedcb25c3d8..325e57e9a30 100644 --- a/source3/modules/vfs_ring.c +++ b/source3/modules/vfs_ring.c @@ -26,12 +26,11 @@ #define GRFN_PREFIX_LEN (sizeof(GRFN_PREFIX)-1) static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle, - const struct smb_filename *dirpath, + const char *path, const char *name, TALLOC_CTX *mem_ctx, char **found_name) { - const char *path = dirpath->base_name; bool mangled; char attr_name [NAME_MAX+1]; char attr_value[NAME_MAX+1]; @@ -45,7 +44,6 @@ static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle, path, NULL, NULL, - dirpath->twrp, 0); if (smb_fname == NULL) { errno = ENOMEM; @@ -58,7 +56,7 @@ static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle, mangled = mangle_is_mangled(name, handle->conn->params); if (mangled) { return SMB_VFS_NEXT_GET_REAL_FILENAME( - handle, dirpath, name, mem_ctx, found_name); + handle, path, name, mem_ctx, found_name); } if (strlen(name) > NAME_MAX - GRFN_PREFIX_LEN) { @@ -77,7 +75,7 @@ static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle, path, name, strerror(errno))); if (errno == EOPNOTSUPP) return SMB_VFS_NEXT_GET_REAL_FILENAME( - handle, dirpath, name, mem_ctx, found_name); + handle, path, name, mem_ctx, found_name); if (errno == ENOATTR) errno = ENOENT; return -1; |