diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2017-05-13 02:45:49 +0200 |
|---|---|---|
| committer | Jeff Darcy <jeff@pl.atyp.us> | 2018-05-03 11:47:03 +0000 |
| commit | cfa4ff1417aba42f0dff3fe9d8e17acdaae4ffb2 (patch) | |
| tree | 6c159c40064a2e1b04264d6501e5a66c31b59c43 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 86a0a7e562f4f1c2f5e68c10a917aeaf1d984365 (diff) | |
Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes #1450546
Instead, rely on programs to be in PATH, as gluster already
does in many places across its code base.
Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246
BUG: 1450546
Signed-off-by: Niklas Hambuechen <mail@nh2.me>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index f7b6ffc21af..42a4411d92e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -6662,7 +6662,6 @@ static struct fs_info { char *fs_tool_pattern; char *fs_tool_pkg; } glusterd_fs[] = { - /* some linux have these in /usr/sbin/and others in /sbin/? */ { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" }, { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" }, @@ -6683,7 +6682,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) char *trail = NULL; runner_t runner = {0, }; struct fs_info *fs = NULL; - char fs_tool_name[256] = {0, }; static dict_t *cached_fs = NULL; memset (key, 0, sizeof (key)); @@ -6720,17 +6718,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count) cur_word = "N/A"; goto cached; } - - snprintf (fs_tool_name, sizeof (fs_tool_name), - "/usr/sbin/%s", fs->fs_tool_name); - if (sys_access (fs_tool_name, R_OK|X_OK) == 0) - runner_add_arg (&runner, fs_tool_name); - else { - snprintf (fs_tool_name, sizeof (fs_tool_name), - "/sbin/%s", fs->fs_tool_name); - if (sys_access (fs_tool_name, R_OK|X_OK) == 0) - runner_add_arg (&runner, fs_tool_name); - } + runner_add_arg (&runner, fs->fs_tool_name); break; } } |