From f326ee356e7f59cebe962572f8b70731cb11a214 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Wed, 10 Sep 2008 01:59:49 +0000
Subject: [PATCH] Add some error output to the plm rsh

This commit was SVN r19532.
---
 orte/mca/plm/rsh/help-plm-rsh.txt                  | 11 +++++++++++
 orte/mca/plm/rsh/plm_rsh_module.c                  |  5 +++++
 orte/runtime/data_type_support/orte_dt_print_fns.c |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/orte/mca/plm/rsh/help-plm-rsh.txt b/orte/mca/plm/rsh/help-plm-rsh.txt
index 6202434fcd..658d814caa 100644
--- a/orte/mca/plm/rsh/help-plm-rsh.txt
+++ b/orte/mca/plm/rsh/help-plm-rsh.txt
@@ -64,3 +64,14 @@ remove the debug-daemons flag.
 The user (%d) is unknown to the system (i.e. there is no corresponding
 entry in the password file). Please contact your system administrator
 for a fix.
+#
+[cannot-resolve-shell-with-prefix]
+The rsh launcher has been given a prefix to use, but could not determine
+the type of remote shell being used on the remote node. This is a fatal
+error as we cannot determine how to construct the cmd line to set your
+remote LD_LIBRARY_PATH and PATH environmental variables.
+
+The prefix we were given are:
+
+opal_prefix: %s
+prefix_dir: %s
diff --git a/orte/mca/plm/rsh/plm_rsh_module.c b/orte/mca/plm/rsh/plm_rsh_module.c
index e9dea28f85..b44d45c32b 100644
--- a/orte/mca/plm/rsh/plm_rsh_module.c
+++ b/orte/mca/plm/rsh/plm_rsh_module.c
@@ -579,6 +579,11 @@ static int setup_launch(int *argcptr, char ***argvptr,
                       (orted_prefix != NULL ? orted_prefix : ""),
                       prefix_dir, bin_base,
                       orted_cmd);
+        } else {
+            orte_show_help("help-plm-rsh.txt", "cannot-resolve-shell-with-prefix", true,
+                           (NULL == opal_prefix) ? "NULL" : opal_prefix,
+                           prefix_dir);
+            return ORTE_ERR_SILENT;
         }
     } else {
         /* no prefix directory, so just aggregate the result */
diff --git a/orte/runtime/data_type_support/orte_dt_print_fns.c b/orte/runtime/data_type_support/orte_dt_print_fns.c
index 8851f396a8..3d1825241c 100644
--- a/orte/runtime/data_type_support/orte_dt_print_fns.c
+++ b/orte/runtime/data_type_support/orte_dt_print_fns.c
@@ -297,7 +297,7 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
     }
     
     asprintf(&tmp, "\n%sData for node: Name: %s\t%s\tLaunch id: %ld\tArch: %0x\tState: %0x",
-             pfx2, src->name,
+             pfx2, (NULL == src->name) ? "UNKNOWN" : src->name,
              pfx2, (long)src->launch_id,
              src->arch, src->state);