diff options
| author | Volker Lendecke <vl@samba.org> | 2020-08-10 12:12:30 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-09-10 08:21:26 +0000 |
| commit | 191c2cd7b93524fc1ee119c0f995171fb38dc210 (patch) | |
| tree | 2755faebd84a45562ae5eec97a32771f047ba94e /source3/modules | |
| parent | b29103ef46a9f80a0184d4d999f22512b7fdcd89 (diff) | |
| download | samba-191c2cd7b93524fc1ee119c0f995171fb38dc210.tar.gz | |
vfs_ring: Adapt to 4.13 VFS
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_ring.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/modules/vfs_ring.c b/source3/modules/vfs_ring.c index 325e57e9a30..eedcb25c3d8 100644 --- a/source3/modules/vfs_ring.c +++ b/source3/modules/vfs_ring.c @@ -26,11 +26,12 @@ #define GRFN_PREFIX_LEN (sizeof(GRFN_PREFIX)-1) static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle, - const char *path, + const struct smb_filename *dirpath, 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]; @@ -44,6 +45,7 @@ static int vfs_ring_get_real_filename(struct vfs_handle_struct *handle, path, NULL, NULL, + dirpath->twrp, 0); if (smb_fname == NULL) { 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); if (mangled) { 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) { @@ -75,7 +77,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, path, name, mem_ctx, found_name); + handle, dirpath, name, mem_ctx, found_name); if (errno == ENOATTR) errno = ENOENT; return -1; |