From 2dbba0fe313070dba20a1db7a5cd1e7c11ff9e36 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 4 Nov 2013 12:32:04 +0100 Subject: [PATCH 1/2] vfs: Fix building the glusterfs module. Using calloc directly throws an error. This fixes building the glusterfs module. Signed-off-by: Andreas Schneider Reviewed-by: David Disseldorp (cherry picked from commit 25d62dda5c64aefeab0059d9437756f8aaec5397) --- source3/modules/vfs_glusterfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index 237236a..c944276 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -707,12 +707,12 @@ static char *vfs_gluster_getwd(struct vfs_handle_struct *handle) char *cwd; char *ret; - cwd = calloc(1, PATH_MAX + 1); + cwd = SMB_CALLOC_ARRAY(char, PATH_MAX); if (cwd == NULL) { return NULL; } - ret = glfs_getcwd(handle->data, cwd, PATH_MAX); + ret = glfs_getcwd(handle->data, cwd, PATH_MAX - 1); if (ret == 0) { free(cwd); } -- 1.8.3.1 From 850665709cfe039fbf1233b4b51ff0a7c822704d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 4 Nov 2013 12:32:05 +0100 Subject: [PATCH 2/2] vfs: Fix some build warnings in glusterfs. Signed-off-by: Andreas Schneider Reviewed-by: David Disseldorp (cherry picked from commit d35d6a2dfa92512049e762d7abc319c67118e705) --- source3/modules/vfs_glusterfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index c944276..e5c691e 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -1300,7 +1300,7 @@ static SMB_ACL_T vfs_gluster_sys_acl_get_file(struct vfs_handle_struct *handle, { struct smb_acl_t *result; char *buf; - char *key; + const char *key; ssize_t ret; switch (type) { @@ -1363,7 +1363,7 @@ static int vfs_gluster_sys_acl_set_file(struct vfs_handle_struct *handle, SMB_ACL_T theacl) { int ret; - char *key; + const char *key; char *buf; ssize_t size; -- 1.8.3.1