* Don't use localhost for login - convert to machine's hostname

* unregister the processes when we know they're dead.  This seems to still
  cause some hangs (but then, so did not doing this)

This commit was SVN r2896.

src/mca/llm/base/llm_base_parse_hostfile.c

@@ -4,6 +4,8 @@
 
 #include "ompi_config.h"
 
+#include <unistd.h>
+
 #include "class/ompi_list.h"
 #include "runtime/runtime.h"
 #include "util/output.h"
@@ -95,7 +97,13 @@ parse_line(int first, mca_llm_base_hostfile_node_t *node)
     int ret;
 
     if (MCA_LLM_BASE_STRING == first) {
-        strncpy(node->hostname, mca_llm_base_string, MAXHOSTNAMELEN);
+        /* don't allow localhost or 127.0.0.1 */
+        if ((strncmp("localhost", mca_llm_base_string, strlen("localhost")) != 0) ||
+            (strcmp("127.0.0.1", mca_llm_base_string) != 0)) {
+            gethostname(node->hostname, MAXHOSTNAMELEN);
+        } else {
+            strncpy(node->hostname, mca_llm_base_string, MAXHOSTNAMELEN);
+        }
         node->given_count = 1;
     } else {
         parse_error();

src/mca/pcm/rsh/pcm_rsh_spawn.c

@@ -486,13 +486,10 @@ internal_wait_cb(pid_t pid, int status, void *data)
     }
 
     /* unregister all the procs */
-#if 0
-    /* BWB - fix me when deadlock in gpr is fixed */
     for (i = lower ; i <= upper ; ++i) {
         test = ns_base_get_proc_name_string(ns_base_create_process_name(0, jobid, i));
         ompi_registry.rte_unregister(test);
     }
-#endif
 
     /* bwb - fix me - should only remove this range */
     mca_pcm_base_remove_job(jobid);