From 2d29b67a63779ac7b115d214bb037c12b122cf2f Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Tue, 19 Jul 2011 09:05:54 +0530 Subject: glusterfsd: check for process mode before performing mount create_fuse_mount() now checks if it is a client process before performing mount. If not a client process, it returns an error. Added changes suggested Change-Id: If8548ad60d345bb8cd09686ceed0d83522799761 BUG: 2469 Reviewed-on: http://review.gluster.com/5 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- glusterfsd/src/glusterfsd.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'glusterfsd') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index b5d6bd61fb0..35cb286ea0f 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -78,6 +78,10 @@ #include "daemon.h" +/* process mode definitions */ +#define GF_SERVER_PROCESS 0 +#define GF_CLIENT_PROCESS 1 +#define GF_GLUSTERD_PROCESS 2 /* using argp for command line parsing */ static char gf_doc[] = ""; @@ -201,6 +205,12 @@ create_fuse_mount (glusterfs_ctx_t *ctx) return 0; } + if (ctx->process_mode != GF_CLIENT_PROCESS) { + gf_log("glusterfsd", GF_LOG_ERROR, + "Not a client process, not performing mount operation"); + return -1; + } + master = GF_CALLOC (1, sizeof (*master), gfd_mt_xlator_t); if (!master) @@ -834,9 +844,6 @@ generate_uuid () return gf_strdup (tmp_str); } -#define GF_SERVER_PROCESS 0 -#define GF_CLIENT_PROCESS 1 -#define GF_GLUSTERD_PROCESS 2 static uint8_t gf_get_process_mode (char *exec_name) @@ -1073,6 +1080,7 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx) } process_mode = gf_get_process_mode (argv[0]); + ctx->process_mode = process_mode; /* Make sure after the parsing cli, if '--volfile-server' option is given, then '--volfile-id' is mandatory */ -- cgit