diff options
author | Sheetal Pamecha <spamecha@redhat.com> | 2019-08-19 15:27:57 +0530 |
---|---|---|
committer | Amar Tumballi <amarts@gmail.com> | 2019-09-12 08:02:34 +0000 |
commit | 61d438e73857776a1f96a7334f56b132275a587b (patch) | |
tree | 17f3fa5bb186097fd67dc21c2c1ba2e23e25dbab /tests/basic/gfapi/glfsxmp-coverage.c | |
parent | da76f7bbef4d311775a5f75c96a54785170a1727 (diff) |
libgfapi: return correct errno on invalid volume name
glfs_init when called with volume name prefixed by '/'
sets errno to 0. Setting errno to EINVAL to resolve the issue.
Also volname is a parameter to glfs_new.
Thus, validating volname in glfs_new itself and
returning EINVAL from that function
fixes: bz#1507896
Change-Id: I0d4d2423e26cc07644d50ec8cce788ecc639203d
Signed-off-by: Sheetal Pamecha <spamecha@redhat.com>
Diffstat (limited to 'tests/basic/gfapi/glfsxmp-coverage.c')
-rw-r--r-- | tests/basic/gfapi/glfsxmp-coverage.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/basic/gfapi/glfsxmp-coverage.c b/tests/basic/gfapi/glfsxmp-coverage.c index 474ba9c0949..51650023efd 100644 --- a/tests/basic/gfapi/glfsxmp-coverage.c +++ b/tests/basic/gfapi/glfsxmp-coverage.c @@ -1843,20 +1843,25 @@ main(int argc, char *argv[]) sleep(2); - fs2 = glfs_new(argv[1]); - if (!fs2) { - fprintf(stderr, "glfs_new: returned NULL\n"); - return 1; - } if (argc == 2) { + /* Generally glfs_new() requires volume name as an argument */ + fs2 = glfs_new("test_only_volume"); + if (!fs2) { + fprintf(stderr, "glfs_new(fs2): returned NULL\n"); + return 1; + } ret = glfs_set_volfile(fs2, argv[1]); if (ret) - fprintf(stderr, "glfs_set_volfile failed\n"); + fprintf(stderr, "glfs_set_volfile failed(fs2)\n"); } else { - // ret = glfs_set_volfile_server (fs2, "unix", "/tmp/gluster.sock", 0); + fs2 = glfs_new(argv[1]); + if (!fs2) { + fprintf(stderr, "glfs_new(fs2): returned NULL\n"); + return 1; + } ret = glfs_set_volfile_server(fs2, "tcp", argv[2], 24007); if (ret) - fprintf(stderr, "glfs_set_volfile_server failed\n"); + fprintf(stderr, "glfs_set_volfile_server failed(fs2)\n"); } ret = glfs_set_statedump_path(fs2, "/tmp"); |