From 543380147e7b035ac034672cf69a391e4d76e5ff Mon Sep 17 00:00:00 2001 From: Manikandan Selvaganesh Date: Thu, 26 Nov 2015 12:32:10 +0530 Subject: glusterd: glusterfsd to support volfile-server-transport type "unix" If glusterfsd uses transport type "unix", 'addrstr' can be empty. So, it may fail to fetch the trusted volfile in this case. This patch allows to fetch volfile even if addrstr is empty. Backport of http://review.gluster.org/#/c/12757/ > Change-Id: I831c5cd0b07b90ae843ec63f0fad9241d9407f6b > BUG: 1279484 > Signed-off-by: Manikandan Selvaganesh > Signed-off-by: Mohamed Ashiq > Reviewed-on: http://review.gluster.org/12757 > Reviewed-by: Vijaikumar Mallikarjuna > Tested-by: NetBSD Build System > Tested-by: Gluster Build System > Reviewed-by: Niels de Vos > Reviewed-by: Atin Mukherjee Change-Id: I831c5cd0b07b90ae843ec63f0fad9241d9407f6b BUG: 1285961 Signed-off-by: Manikandan Selvaganesh Signed-off-by: Mohamed Ashiq Reviewed-on: http://review.gluster.org/12815 Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Atin Mukherjee --- xlators/mgmt/glusterd/src/glusterd-handshake.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd') diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index fac2747cf8f..6579f62da44 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -790,8 +790,9 @@ __server_getspec (rpcsvc_request_t *req) * server, self-heal daemon etc., so that they are not inadvertently * blocked by a auth.{allow,reject} setting. The trusted volfile is not * meant for external users. + * For unix domain socket, address will be empty. */ - if (strlen (addrstr) && gf_is_local_addr (addrstr)) { + if (strlen (addrstr) == 0 || gf_is_local_addr (addrstr)) { ret = build_volfile_path (volume, filename, sizeof (filename), -- cgit