From 67dc8c49535c5591c592f079f3e4d9f879e4db32 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 30 Aug 2016 15:37:43 +0200 Subject: [PATCH 6/6] SYSDB: Fix error handling in sysdb_get_user_members_recursively MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We ignored failures from sysdb_search_entry Reviewed-by: Petr Čech --- src/db/sysdb_ops.c | 3 +++ src/db/sysdb_views.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index 1f25749588f0ff25ab5eb9c189e34853d4940ee8..eaba8de77bc102543a8f66142cd6c1369f8d0c5b 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -3938,6 +3938,9 @@ errno_t sysdb_get_user_members_recursively(TALLOC_CTX *mem_ctx, ret = sysdb_search_entry(tmp_ctx, dom->sysdb, base_dn, LDB_SCOPE_SUBTREE, filter, attrs, &count, &msgs); + if (ret != EOK) { + goto done; + } res = talloc_zero(tmp_ctx, struct ldb_result); if (res == NULL) { diff --git a/src/db/sysdb_views.c b/src/db/sysdb_views.c index e095c713074fd0b5749e4b6a91347fe41911e561..cc1bc85f93231dbfb42d6c31348eee97f7166bb9 100644 --- a/src/db/sysdb_views.c +++ b/src/db/sysdb_views.c @@ -1309,7 +1309,10 @@ errno_t sysdb_add_group_member_overrides(struct sss_domain_info *domain, ret = sysdb_get_user_members_recursively(tmp_ctx, domain, obj->dn, &res_members); - if (ret != EOK) { + if (ret == ENOENT) { + ret = EOK; + goto done; + } else if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, "sysdb_get_user_members_recursively failed.\n"); goto done; -- 2.1.0