|
 |
21ab4e |
From 8003a0731acd44f69f7d9652b217097cc396620c Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Date: Tue, 2 May 2017 14:06:00 +0530
|
|
|
21ab4e |
Subject: [PATCH 410/426] glusterd/ganesha : add proper NULL check in
|
|
|
21ab4e |
manage_export_config
|
|
|
21ab4e |
|
|
|
21ab4e |
Upstream reference :
|
|
|
21ab4e |
>Change-Id: I872b2b6b027f04e61f60ad85588f50e1ef2f988c
|
|
|
21ab4e |
>BUG: 1425723
|
|
|
21ab4e |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
>Reviewed-on: https://review.gluster.org/17150
|
|
|
21ab4e |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
21ab4e |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
21ab4e |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: I872b2b6b027f04e61f60ad85588f50e1ef2f988c
|
|
|
21ab4e |
BUG: 1446645
|
|
|
21ab4e |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/104975
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 2 +-
|
|
|
21ab4e |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
index b7a6db4..f74b784 100644
|
|
|
21ab4e |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
21ab4e |
@@ -467,7 +467,7 @@ manage_export_config (char *volname, char *value, char **op_errstr)
|
|
|
21ab4e |
CONFDIR, value, volname, NULL);
|
|
|
21ab4e |
ret = runner_run(&runner);
|
|
|
21ab4e |
|
|
|
21ab4e |
- if (ret && !(*op_errstr))
|
|
|
21ab4e |
+ if (ret && op_errstr)
|
|
|
21ab4e |
gf_asprintf (op_errstr, "Failed to create"
|
|
|
21ab4e |
" NFS-Ganesha export config file.");
|
|
|
21ab4e |
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|