From 30981de200e21335bb80f326706613081bee756b Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 22 Mar 2011 13:48:58 +0000 Subject: [PATCH] Minor cleanups courtesy of Nysal - thanks! This commit was SVN r24552. --- orte/mca/plm/rsh/plm_rsh_component.c | 6 ++++-- orte/mca/plm/slurm/plm_slurm_module.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/orte/mca/plm/rsh/plm_rsh_component.c b/orte/mca/plm/rsh/plm_rsh_component.c index e99706b944..d178ce4db6 100644 --- a/orte/mca/plm/rsh/plm_rsh_component.c +++ b/orte/mca/plm/rsh/plm_rsh_component.c @@ -164,9 +164,11 @@ int orte_plm_rsh_component_query(mca_base_module_t **module, int *priority) "%s plm:rsh: unable to be used: SGE indicated but cannot find path " "or execution permissions not set for launching agent qrsh", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - *module = NULL; - return ORTE_ERROR; + free(tmp); + *module = NULL; + return ORTE_ERROR; } + free(tmp); mca_plm_rsh_component.using_qrsh = true; *priority = mca_plm_rsh_component.priority; *module = (mca_base_module_t *) &orte_plm_rsh_module; diff --git a/orte/mca/plm/slurm/plm_slurm_module.c b/orte/mca/plm/slurm/plm_slurm_module.c index 783b62e882..049f58373b 100644 --- a/orte/mca/plm/slurm/plm_slurm_module.c +++ b/orte/mca/plm/slurm/plm_slurm_module.c @@ -126,7 +126,7 @@ static int plm_slurm_init(void) ORTE_ERROR_LOG(rc); } - if (ORTE_SUCCESS == orte_plm_base_rsh_launch_agent_setup()) { + if (ORTE_SUCCESS == orte_plm_base_rsh_launch_agent_setup(NULL, NULL)) { local_launch_available = true; }