Merge pull request #5248 from grondo/sign_unwrap-leak

libjob: fix leak in sign_unwrap()

Author: mergify[bot]

src/common/libjob/test/unwrap.c

@@ -47,6 +47,16 @@ static void test_api (unwrap_f unwrap)
         "error.text says: %s",
         error.text);
 
+    userid = 0;
+    result = (*unwrap) (s, false, NULL, &error);
+    ok (result != NULL && userid == 0,
+        "unwrap_string() works with NULL userid");
+    if (result == NULL)
+        diag ("got error: %s", error.text);
+    is (result, "bar",
+        "got expected result");
+    free (result);
+
     userid = 0;
     result = (*unwrap) (s, false, NULL, NULL);
     ok (result != NULL && userid == 0,

src/common/libjob/unwrap.c

@@ -76,12 +76,16 @@ char *unwrap_string (const char *s,
     int64_t userid64;
     int flags = verify ? 0 : FLUX_SIGN_NOVERIFY;
 
-    if (!(sec = flux_security_create (0))
-        || flux_security_configure (sec, NULL) < 0) {
+    if (!(sec = flux_security_create (0))) {
         errprintf (errp,
-                   "failed to initialize security context: %s",
+                   "failed to create security context: %s",
                    strerror (errno));
-        return NULL;
+    }
+    if (flux_security_configure (sec, NULL) < 0) {
+        errprintf (errp,
+                   "failed to configure security context: %s",
+                   flux_security_last_error (sec));
+        goto done;
     }
     if (flux_sign_unwrap_anymech (sec,
                                   s,