Minor cleanups courtesy of Nysal - thanks!

This commit was SVN r24552.

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;
+             free(tmp);
-            return ORTE_ERROR;
+             *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;

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;
     }