summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorRajesh Joseph <rjoseph@redhat.com>2016-08-02 15:33:34 +0000
committerJeff Darcy <jdarcy@redhat.com>2016-08-31 14:23:14 -0700
commitecb8d38d34c6cdd16e34bbe40d3e64e9d1cc9909 (patch)
treeba282dc7495e12f3a0f52a00dc119f84f9ea70af /api
parent8eebc4c960366e8ff26751914654ccc21bb1a6fd (diff)
gfapi: SSL connection for mgmt connection is not working
Problem: libgfapi does not enable SSL on mgmt connection. Fix: Enable SSL when it is enabled on mgmt connection is enabled, i.e. presence of /var/lib/glusterd/secure-access file > Change-Id: I1ce4935b04e6140aeab819e42076defd580b0727 > BUG: 1362602 > Signed-off-by: Rajesh Joseph <rjoseph@redhat.com> > Reviewed-on: http://review.gluster.org/15073 > Smoke: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Niels de Vos <ndevos@redhat.com> > Reviewed-by: Kaushal M <kaushal@redhat.com> (cherry picked from commit 62f4e41e9eafd2838d2a11989f08b0e7627284b4) Change-Id: I282729825229e961f03b7f8e8a9fa0aa2c8fc6a7 BUG: 1371650 Signed-off-by: Rajesh Joseph <rjoseph@redhat.com> Reviewed-on: http://review.gluster.org/15361 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'api')
-rw-r--r--api/src/glfs-mgmt.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index fd6b2f5c60c..8c9872cfa53 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -36,6 +36,7 @@
#include "glfs-internal.h"
#include "glfs-mem-types.h"
#include "gfapi-messages.h"
+#include "syscall.h"
int glfs_volfile_fetch (struct glfs *fs);
int32_t glfs_get_volume_info_rpc (call_frame_t *frame, xlator_t *this,
@@ -916,6 +917,10 @@ glfs_mgmt_init (struct glfs *fs)
if (ret)
goto out;
+ if (sys_access (SECURE_ACCESS_FILE, F_OK) == 0) {
+ ctx->secure_mgmt = 1;
+ }
+
rpc = rpc_clnt_new (options, THIS, THIS->name, 8);
if (!rpc) {
ret = -1;