e3c68b
From d91eadbbb3e2d02e7297214da394b0e232544386 Mon Sep 17 00:00:00 2001
e3c68b
From: Jiffin Tony Thottan <jthottan@redhat.com>
e3c68b
Date: Tue, 2 May 2017 14:06:00 +0530
e3c68b
Subject: [PATCH 066/124] glusterd/ganesha : add proper NULL check in
e3c68b
 manage_export_config
e3c68b
e3c68b
Label: DOWNSTREAM ONLY
e3c68b
e3c68b
Change-Id: I872b2b6b027f04e61f60ad85588f50e1ef2f988c
e3c68b
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
e3c68b
Reviewed-on: https://review.gluster.org/17150
e3c68b
Smoke: Gluster Build System <jenkins@build.gluster.org>
e3c68b
Reviewed-by: soumya k <skoduri@redhat.com>
e3c68b
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
e3c68b
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
e3c68b
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
e3c68b
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
e3c68b
Reviewed-on: https://code.engineering.redhat.com/gerrit/167151
e3c68b
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
e3c68b
Tested-by: RHGS Build Bot <nigelb@redhat.com>
e3c68b
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
e3c68b
---
e3c68b
 xlators/mgmt/glusterd/src/glusterd-ganesha.c | 2 +-
e3c68b
 1 file changed, 1 insertion(+), 1 deletion(-)
e3c68b
e3c68b
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
e3c68b
index d9fdfc6..fe0bffc 100644
e3c68b
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
e3c68b
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
e3c68b
@@ -435,7 +435,7 @@ manage_export_config(char *volname, char *value, char **op_errstr)
e3c68b
                     CONFDIR, value, volname, NULL);
e3c68b
     ret = runner_run(&runner);
e3c68b
 
e3c68b
-    if (ret && !(*op_errstr))
e3c68b
+    if (ret && op_errstr)
e3c68b
         gf_asprintf(op_errstr,
e3c68b
                     "Failed to create"
e3c68b
                     " NFS-Ganesha export config file.");
e3c68b
-- 
e3c68b
1.8.3.1
e3c68b