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

Revert "s3/vfs_glusterfs: Dynamically determine NAME_MAX"

Browse Source 
This reverts commit 8e3a042eb9.

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Günther Deschner 2019-06-03 14:27:18 +02:00
parent ff4a5f643f
commit 1ea533bd5f
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source3/modules/vfs_glusterfs.c
View File

@ -1454,36 +1454,20 @@ static int vfs_gluster_chflags(struct vfs_handle_struct *handle,
static int vfs_gluster_get_real_filename(struct vfs_handle_struct *handle,
const char *path, const char *name,
TALLOC_CTX *mem_ctx, char **_found_name)
TALLOC_CTX *mem_ctx, char **found_name)
{
int ret;
char *key_buf = NULL, *val_buf = NULL;
long name_max;
char *found_name = NULL;
char key_buf[NAME_MAX + 64];
char val_buf[NAME_MAX + 1];
name_max = pathconf(path, _PC_NAME_MAX);
if ((name_max + 1) < 1) {
errno = EINVAL;
return -1;
}
if (strlen(name) >= name_max) {
if (strlen(name) >= NAME_MAX) {
errno = ENAMETOOLONG;
return -1;
}
key_buf = talloc_asprintf(mem_ctx, "glusterfs.get_real_filename:%s",
name);
if (key_buf == NULL) {
errno = ENOMEM;
return -1;
}
snprintf(key_buf, NAME_MAX + 64,
"glusterfs.get_real_filename:%s", name);
val_buf = talloc_zero_array(mem_ctx, char, name_max + 1);
if (val_buf == NULL) {
errno = ENOMEM;
return -1;
}
ret = glfs_getxattr(handle->data, path, key_buf, val_buf, NAME_MAX + 1);
if (ret == -1) {
if (errno == ENOATTR) {
@ -1492,16 +1476,11 @@ static int vfs_gluster_get_real_filename(struct vfs_handle_struct *handle,
return -1;
}
found_name = talloc_strdup(mem_ctx, val_buf);
if (found_name == NULL) {
*found_name = talloc_strdup(mem_ctx, val_buf);
if (found_name[0] == NULL) {
errno = ENOMEM;
return -1;
}
*_found_name = found_name;
TALLOC_FREE(key_buf);
TALLOC_FREE(val_buf);
return 0;
}