From: Pavan Deolasee <pavan.deolasee@gmail.com>
Date: Thu, 19 Nov 2015 05:10:00 +0000 (+0530)
Subject: Check if configuration parametere such as cord/datanode(Specific)ExtraPgHba
X-Git-Tag: XL9_5_R1BETA1~150
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=23fcb13b276ef6fbb7f89236b28f54b0431998ae;p=postgres-xl.git

Check if configuration parametere such as cord/datanode(Specific)ExtraPgHba
exists before trying to read its value
---

diff --git a/contrib/pgxc_ctl/coord_cmd.c b/contrib/pgxc_ctl/coord_cmd.c
index 07e24d9ea4..716699cfde 100644
--- a/contrib/pgxc_ctl/coord_cmd.c
+++ b/contrib/pgxc_ctl/coord_cmd.c
@@ -178,9 +178,9 @@ cmd_t *prepare_initCoordinatorMaster(char *nodeName)
 			"#=================================================\n"
 			"# Addition at initialization, %s\n",
 			timeStampString(timestamp, MAXTOKEN));
-	if (!is_none(sval(VAR_coordExtraPgHba)))
+	if (doesExist(VAR_coordExtraPgHba, 0) && !is_none(sval(VAR_coordExtraPgHba)))
 		AddMember(confFiles, sval(VAR_coordExtraPgHba));
-	if (!is_none(aval(VAR_coordSpecificExtraPgHba)[jj]))
+	if (doesExist(VAR_coordSpecificExtraPgHba, jj) && !is_none(aval(VAR_coordSpecificExtraPgHba)[jj]))
 		AddMember(confFiles, aval(VAR_coordSpecificExtraPgHba)[jj]);
 	appendFiles(f, confFiles);
 	CleanArray(confFiles);
diff --git a/contrib/pgxc_ctl/datanode_cmd.c b/contrib/pgxc_ctl/datanode_cmd.c
index e341d147cb..cefb6b65e6 100644
--- a/contrib/pgxc_ctl/datanode_cmd.c
+++ b/contrib/pgxc_ctl/datanode_cmd.c
@@ -183,9 +183,9 @@ cmd_t *prepare_initDatanodeMaster(char *nodeName)
 			"#=================================================\n"
 			"# Addition at initialization, %s\n",
 			timeStampString(timeStamp, MAXTOKEN));
-	if (!is_none(sval(VAR_datanodeExtraPgHba)))
+	if (doesExist(VAR_datanodeExtraPgHba, 0) && !is_none(sval(VAR_datanodeExtraPgHba)))
 		AddMember(fileList, sval(VAR_datanodeExtraPgHba));
-	if (!is_none(aval(VAR_datanodeSpecificExtraPgHba)[idx]))
+	if (doesExist(VAR_datanodeSpecificExtraPgHba, idx) && !is_none(aval(VAR_datanodeSpecificExtraPgHba)[idx]))
 		AddMember(fileList, aval(VAR_datanodeSpecificExtraPgHba)[idx]);
 	appendFiles(f, fileList);
 	CleanArray(fileList);