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