Fix singletons

This commit was SVN r24864.

orte/orted/orted_main.c

@@ -51,7 +51,6 @@
 #include "opal/mca/event/event.h"
 #include "opal/mca/base/base.h"
 #include "opal/util/output.h"
-#include "opal/util/opal_sos.h"
 #include "opal/util/cmd_line.h"
 #include "opal/util/opal_environ.h"
 #include "opal/util/os_path.h"
@@ -329,10 +328,6 @@ int orte_daemon(int argc, char *argv[])
             return ret;
         }
     }
-    /* finalize the OPAL utils. As they are opened again from orte_init->opal_init
-     * we continue to have a reference count on them. So we have to finalize them twice...
-     */
-    opal_finalize_util();
  
     if ((int)ORTE_VPID_INVALID != orted_globals.fail) {
         orted_globals.abort=false;
@@ -402,7 +397,7 @@ int orte_daemon(int argc, char *argv[])
     /* setup the primary daemon command receive function */
     ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_DAEMON,
                                   ORTE_RML_NON_PERSISTENT, orte_daemon_recv, NULL);
-    if (ret != ORTE_SUCCESS && OPAL_SOS_GET_ERROR_CODE(ret) != ORTE_ERR_NOT_IMPLEMENTED) {
+    if (ret != ORTE_SUCCESS && ret != ORTE_ERR_NOT_IMPLEMENTED) {
         ORTE_ERROR_LOG(ret);
         goto DONE;
     }