[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri Apr 26 13:04:02 UTC 2019
The branch, master has been updated
via 633698c9715 Revert "lib/replace: define NAME_MAX for platforms that don't have it"
via e28d172b00c s3/vfs_glusterfs_fuse: Dynamically determine NAME_MAX
via 8e3a042eb9e s3/vfs_glusterfs: Dynamically determine NAME_MAX
from b50ca162733 gitlab-ci: Remove Ubuntu 14.04
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 633698c971598090b6883d39d370ba202514ef32
Author: Günther Deschner <gd at samba.org>
Date: Thu Apr 25 14:49:48 2019 +0200
Revert "lib/replace: define NAME_MAX for platforms that don't have it"
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13872
This reverts commit e3c894fb6b87df8aa56e29ef3b16ae1ef456a875.
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Günther Deschner <gd at samba.org>
Autobuild-Date(master): Fri Apr 26 13:03:05 UTC 2019 on sn-devel-184
commit e28d172b00cadf492c22bd892e2dda3bf2fe2d70
Author: Anoop C S <anoopcs at redhat.com>
Date: Thu Apr 25 16:42:01 2019 +0530
s3/vfs_glusterfs_fuse: Dynamically determine NAME_MAX
This allows the vfs_glusterfs_fuse build to complete on AIX.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13872
Signed-off-by: Anoop C S <anoopcs at redhat.com>
Reviewed-by: Guenther Deschner <gd at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8e3a042eb9e502821b147f1bbb2d98d59f17a095
Author: Anoop C S <anoopcs at redhat.com>
Date: Thu Apr 25 16:41:53 2019 +0530
s3/vfs_glusterfs: Dynamically determine NAME_MAX
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13872
Signed-off-by: Anoop C S <anoopcs at redhat.com>
Reviewed-by: Guenther Deschner <gd at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/replace/replace.h | 4 ----
source3/modules/vfs_glusterfs.c | 37 ++++++++++++++++++++++++++++--------
source3/modules/vfs_glusterfs_fuse.c | 32 +++++++++++++++++++++++++------
3 files changed, 55 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 4d9b81f6825..212ed265d4a 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -858,10 +858,6 @@ typedef unsigned long long ptrdiff_t ;
#define PATH_MAX 1024
#endif
-#ifndef NAME_MAX
-#define NAME_MAX 255
-#endif
-
#ifndef MAX_DNS_NAME_LENGTH
#define MAX_DNS_NAME_LENGTH 256 /* Actually 255 but +1 for terminating null. */
#endif
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index ba8973fa6d3..2b5385e44b0 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1454,20 +1454,36 @@ 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[NAME_MAX + 64];
- char val_buf[NAME_MAX + 1];
+ char *key_buf = NULL, *val_buf = NULL;
+ long name_max;
+ char *found_name = NULL;
- if (strlen(name) >= NAME_MAX) {
+ name_max = pathconf(path, _PC_NAME_MAX);
+ if ((name_max + 1) < 1) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ if (strlen(name) >= name_max) {
errno = ENAMETOOLONG;
return -1;
}
- snprintf(key_buf, NAME_MAX + 64,
- "glusterfs.get_real_filename:%s", name);
+ key_buf = talloc_asprintf(mem_ctx, "glusterfs.get_real_filename:%s",
+ name);
+ if (key_buf == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+ 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) {
@@ -1476,11 +1492,16 @@ 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[0] == NULL) {
+ found_name = talloc_strdup(mem_ctx, val_buf);
+ if (found_name == NULL) {
errno = ENOMEM;
return -1;
}
+ *_found_name = found_name;
+
+ TALLOC_FREE(key_buf);
+ TALLOC_FREE(val_buf);
+
return 0;
}
diff --git a/source3/modules/vfs_glusterfs_fuse.c b/source3/modules/vfs_glusterfs_fuse.c
index 8855cd18d01..0b1de9fcdb2 100644
--- a/source3/modules/vfs_glusterfs_fuse.c
+++ b/source3/modules/vfs_glusterfs_fuse.c
@@ -28,19 +28,35 @@ static int vfs_gluster_fuse_get_real_filename(struct vfs_handle_struct *handle,
char **_found_name)
{
int ret;
- char key_buf[NAME_MAX + 64];
- char val_buf[NAME_MAX + 1];
+ char *key_buf = NULL, *val_buf = NULL;
+ long name_max;
char *found_name = NULL;
- if (strlen(name) >= NAME_MAX) {
+ name_max = pathconf(path, _PC_NAME_MAX);
+ if ((name_max + 1) < 1) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ if (strlen(name) >= name_max) {
errno = ENAMETOOLONG;
return -1;
}
- snprintf(key_buf, NAME_MAX + 64,
- "glusterfs.get_real_filename:%s", name);
+ key_buf = talloc_asprintf(mem_ctx, "glusterfs.get_real_filename:%s",
+ name);
+ if (key_buf == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ val_buf = talloc_zero_array(mem_ctx, char, name_max + 1);
+ if (val_buf == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
- ret = getxattr(path, key_buf, val_buf, NAME_MAX + 1);
+ ret = getxattr(path, key_buf, val_buf, name_max + 1);
if (ret == -1) {
if (errno == ENOATTR) {
errno = EOPNOTSUPP;
@@ -54,6 +70,10 @@ static int vfs_gluster_fuse_get_real_filename(struct vfs_handle_struct *handle,
return -1;
}
*_found_name = found_name;
+
+ TALLOC_FREE(key_buf);
+ TALLOC_FREE(val_buf);
+
return 0;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list