From 965121630c02240ef417a5237e0529145ed5d230 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 25 May 2020 17:36:51 -0400
Subject: [PATCH] lib/base: heim_config_parse_dir_multi do not overwrite error

In heim_config_parse_dir_multi() do not call heim_enomem(context)
when returning ENOMEM when a better error has already been set in
the context.  Just return ENOMEM.

Change-Id: I9bd9de552b2b04b5a7328ac635e911d6e95422ef
---
 lib/base/config_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base/config_file.c b/lib/base/config_file.c
index 44b88f3b8..c8653250a 100644
--- a/lib/base/config_file.c
+++ b/lib/base/config_file.c
@@ -527,7 +527,7 @@ heim_config_parse_dir_multi(heim_context context,
         free(path);
         if (ret == ENOMEM) {
             (void) closedir(d);
-            return heim_enomem(context);
+            return ENOMEM;
         }
         /* Ignore malformed config files so we don't lock out admins, etc... */
     }
-- 
2.11.4.GIT