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