Pickup some minor debugging changes

Signed-off-by: Ralph Castain <rhc@open-mpi.org>

Author: Ralph Castain

opal/mca/pmix/pmix4x/pmix/src/mca/pnet/opa/pnet_opa.c

@@ -251,12 +251,13 @@ static pmix_status_t allocate(pmix_nspace_t *nptr,
         return PMIX_ERR_TAKE_NEXT_OPTION;
     }
 
-    if (0 == strncmp(info->key, PMIX_SETUP_APP_ENVARS, PMIX_MAX_KEYLEN)) {
+    if (PMIX_CHECK_KEY(info, PMIX_SETUP_APP_ENVARS)) {
         envars = PMIX_INFO_TRUE(info);
-    } else if (0 == strncmp(info->key, PMIX_SETUP_APP_ALL, PMIX_MAX_KEYLEN)) {
+    } else if (PMIX_CHECK_KEY(info, PMIX_SETUP_APP_ALL)) {
         envars = PMIX_INFO_TRUE(info);
         seckeys = PMIX_INFO_TRUE(info);
-    } else if (0 == strncmp(info->key, PMIX_SETUP_APP_NONENVARS, PMIX_MAX_KEYLEN)) {
+    } else if (PMIX_CHECK_KEY(info, PMIX_SETUP_APP_NONENVARS) ||
+               PMIX_CHECK_KEY(info, PMIX_ALLOC_NETWORK_SEC_KEY)) {
         seckeys = PMIX_INFO_TRUE(info);
     }
 
@@ -362,6 +363,14 @@ static pmix_status_t setup_local_network(pmix_nspace_t *nptr,
                     return PMIX_ERR_NOMEM;
                 }
                 pmix_value_xfer(kv->value, &info[n].value);
+                if (PMIX_ENVAR == kv->value->type) {
+                    pmix_output_verbose(2, pmix_pnet_base_framework.framework_output,
+                                        "pnet:opa:setup_local_network adding %s=%s to environment",
+                                        kv->value->data.envar.envar, kv->value->data.envar.value);
+                } else {
+                    pmix_output_verbose(2, pmix_pnet_base_framework.framework_output,
+                                        "pnet:opa:setup_local_network loading blob");
+                }
                 pmix_list_append(&nptr->setup_data, &kv->super);
             }
         }

opal/mca/pmix/pmix4x/pmix/src/mca/pnet/tcp/pnet_tcp.c

@@ -329,8 +329,8 @@ static pmix_status_t allocate(pmix_nspace_t *nptr,
     /* check directives to see if a crypto key and/or
      * network resource allocations requested */
     PMIX_CONSTRUCT(&mylist, pmix_list_t);
-    if (0 == strncmp(info->key, PMIX_SETUP_APP_ENVARS, PMIX_MAX_KEYLEN) ||
-        0 == strncmp(info->key, PMIX_SETUP_APP_ALL, PMIX_MAX_KEYLEN)) {
+    if (PMIX_CHECK_KEY(info, PMIX_SETUP_APP_ENVARS) ||
+        PMIX_CHECK_KEY(info, PMIX_SETUP_APP_ALL)) {
         if (NULL != mca_pnet_tcp_component.include) {
         pmix_output_verbose(2, pmix_pnet_base_framework.framework_output,
                             "pnet: tcp harvesting envars %s excluding %s",
@@ -342,7 +342,7 @@ static pmix_status_t allocate(pmix_nspace_t *nptr,
             return rc;
         }
         return PMIX_SUCCESS;
-    } else if (0 != strncmp(info->key, PMIX_ALLOC_NETWORK, PMIX_MAX_KEYLEN)) {
+    } else if (PMIX_CHECK_KEY(info, PMIX_ALLOC_NETWORK)) {
         /* not a network allocation request */
         return PMIX_SUCCESS;
     }