>From 551e17167698505ad00a00309e6b29fe553bb1ab Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 13 Dec 2013 18:20:08 +0100 Subject: [PATCH 1/3] LDAP: Don't fail if subdomain cannot be found by sid Domain needn't contain sid if id_provider is ldap. With enabled id mapping, user couldn't be stored, because domain couldn't be found by sid. Resolves: https://fedorahosted.org/sssd/ticket/2172 --- src/providers/ldap/sdap_async_users.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c index ebbc171e49d09d117a3a86f572c69df015e2ab6e..56d5b21467827464063b487b15910e847575ed2b 100644 --- a/src/providers/ldap/sdap_async_users.c +++ b/src/providers/ldap/sdap_async_users.c @@ -123,6 +123,7 @@ int sdap_save_user(TALLOC_CTX *memctx, bool use_id_mapping; char *sid_str; char *dom_sid_str = NULL; + struct sss_domain_info *subdomain; DEBUG(SSSDBG_TRACE_FUNC, ("Save user\n")); @@ -161,11 +162,12 @@ int sdap_save_user(TALLOC_CTX *memctx, /* If this object has a SID available, we will determine the correct * domain by its SID. */ if (sid_str != NULL) { - dom = find_subdomain_by_sid(get_domains_head(dom), sid_str); - if (dom == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("SID %s does not belong to any known " + subdomain = find_subdomain_by_sid(get_domains_head(dom), sid_str); + if (subdomain) { + dom = subdomain; + } else { + DEBUG(SSSDBG_TRACE_FUNC, ("SID %s does not belong to any known " "domain\n", sid_str)); - return ERR_DOMAIN_NOT_FOUND; } } -- 1.8.4.2