Cleanup the initialization handshake for multicast apps

This commit was SVN r22855.

orte/mca/ess/cm/ess_cm_module.c

@@ -456,12 +456,14 @@ static void cbfunc(int status,
     n=1;
     if (ORTE_SUCCESS != (rc = opal_dss.unpack(buf, &host, &n, OPAL_STRING))) {
         ORTE_ERROR_LOG(rc);
-        return;
+        goto cleanup;
     }
     
     /* is this intended for me? */
     if (0 != strcmp(host, orte_process_info.nodename)) {
         /* nope - ignore it */
+        OPAL_OUTPUT_VERBOSE((1, orte_ess_base_output,
+                             "message for %s - not for me", host));
         goto cleanup;
     }
     
@@ -469,7 +471,7 @@ static void cbfunc(int status,
     n = 1;
     if (ORTE_SUCCESS != (rc = opal_dss.unpack(buf, &name, &n, ORTE_NAME))) {
         ORTE_ERROR_LOG(rc);
-        return;
+        goto cleanup;
     }
     /* if we got an invalid name, then declare failure */
     if (ORTE_JOBID_INVALID == name.jobid &&

orte/mca/rmcast/udp/rmcast_udp.c

@@ -869,8 +869,8 @@ static void process_recv(int fd, short event, void *cbdata)
                                  ORTE_NAME_PRINT(&name)));
             goto cleanup;
         }
-        /* if I am other than the HNP, ignore it */
+        /* if I am other than the HNP or a tool, ignore it */
-        if (!ORTE_PROC_IS_HNP) {
+        if (!ORTE_PROC_IS_HNP && !ORTE_PROC_IS_TOOL) {
             OPAL_OUTPUT_VERBOSE((10, orte_rmcast_base.rmcast_output,
                                  "%s rmcast:udp:recv from a different job family: %s",
                                  ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),