From 9436c86caf9b2f7ec33c3022dfed2a653d3ec965 Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Wed, 26 Feb 2014 16:52:26 +0000 Subject: SYSDB: sysdb_getnetgr returns ENOENT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace call of ldb_search by sss_ldb_search to make sure that ENOENT is returned if no results were found. Resolves: https://fedorahosted.org/sssd/ticket/1991 Reviewed-by: Lukáš Slebodník Reviewed-by: Jakub Hrozek --- src/db/sysdb_search.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'src/db') diff --git a/src/db/sysdb_search.c b/src/db/sysdb_search.c index 60ad6136..ff14c4a9 100644 --- a/src/db/sysdb_search.c +++ b/src/db/sysdb_search.c @@ -782,11 +782,10 @@ errno_t sysdb_getnetgr(TALLOC_CTX *mem_ctx, TALLOC_CTX *tmp_ctx; static const char *attrs[] = SYSDB_NETGR_ATTRS; struct ldb_dn *base_dn; - struct ldb_result *result; + struct ldb_result *result = NULL; char *sanitized_netgroup; char *lc_sanitized_netgroup; char *netgroup_dn; - int lret; errno_t ret; tmp_ctx = talloc_new(NULL); @@ -816,18 +815,15 @@ errno_t sysdb_getnetgr(TALLOC_CTX *mem_ctx, goto done; } - lret = ldb_search(domain->sysdb->ldb, tmp_ctx, &result, base_dn, - LDB_SCOPE_SUBTREE, attrs, - SYSDB_NETGR_TRIPLES_FILTER, lc_sanitized_netgroup, - sanitized_netgroup, sanitized_netgroup, - netgroup_dn); - ret = sysdb_error_to_errno(lret); - if (ret != EOK) { - goto done; - } + ret = sss_ldb_search(domain->sysdb->ldb, tmp_ctx, &result, base_dn, + LDB_SCOPE_SUBTREE, attrs, + SYSDB_NETGR_TRIPLES_FILTER, lc_sanitized_netgroup, + sanitized_netgroup, sanitized_netgroup, + netgroup_dn); - *res = talloc_steal(mem_ctx, result); - ret = EOK; + if (ret == EOK || ret == ENOENT) { + *res = talloc_steal(mem_ctx, result); + } done: talloc_zfree(tmp_ctx); -- cgit