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 07e24d9ea4cd113d2da5c5485405a3ebf4f670c7..716699cfde5bcd13035ae9d3e6073e243f9e62d4 100644 (file)
--- 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 e341d147cbf4e4c43f32f0583a0d87833074ed45..cefb6b65e6bd0805dc36d3c1367cbf9aac6f3dd1 100644 (file)
--- 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);