|
 |
96eb28 |
From a6de362d3cfe16550eb16d01900f44c9aeb8cc50 Mon Sep 17 00:00:00 2001
|
|
|
96eb28 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
96eb28 |
Date: Tue, 29 May 2018 15:42:55 +0200
|
|
|
96eb28 |
Subject: [PATCH] ipa: use mpg aware group lookup in get_object_from_cache()
|
|
|
96eb28 |
|
|
|
96eb28 |
Since with algorithmic id-mapping SSSD automatically creates user
|
|
|
96eb28 |
private groups for AD user with the help of magic private groups (mpg)
|
|
|
96eb28 |
get_object_from_cache() should use mpg aware calls to make sure the
|
|
|
96eb28 |
right user object is found when handling a request to look up a user
|
|
|
96eb28 |
private group.
|
|
|
96eb28 |
|
|
|
96eb28 |
Only the lookup by gid had to be modified because
|
|
|
96eb28 |
sysdb_search_group_by_name() used for lookups by name is aware of MPGs.
|
|
|
96eb28 |
|
|
|
96eb28 |
Related to https://pagure.io/SSSD/sssd/issue/3748
|
|
|
96eb28 |
|
|
|
96eb28 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
96eb28 |
(cherry picked from commit 032221568fe4287686d0ebb11b5c1fe51cc4735f)
|
|
|
96eb28 |
---
|
|
|
96eb28 |
src/providers/ipa/ipa_subdomains_id.c | 18 ++++++++++++++++--
|
|
|
96eb28 |
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
96eb28 |
|
|
|
96eb28 |
diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c
|
|
|
96eb28 |
index d40671086854f9c1a3f8bc7fc711009298dc31c8..3943579b07c7b2d32dde192b97b86eb036b91885 100644
|
|
|
96eb28 |
--- a/src/providers/ipa/ipa_subdomains_id.c
|
|
|
96eb28 |
+++ b/src/providers/ipa/ipa_subdomains_id.c
|
|
|
96eb28 |
@@ -1030,7 +1030,14 @@ errno_t get_object_from_cache(TALLOC_CTX *mem_ctx,
|
|
|
96eb28 |
|
|
|
96eb28 |
switch (ar->entry_type & BE_REQ_TYPE_MASK) {
|
|
|
96eb28 |
case BE_REQ_GROUP:
|
|
|
96eb28 |
- ret = sysdb_search_group_by_gid(mem_ctx, dom, id, attrs, &msg;;
|
|
|
96eb28 |
+ ret = sysdb_getgrgid_attrs(mem_ctx, dom, id, attrs, &res;;
|
|
|
96eb28 |
+ if (ret == EOK) {
|
|
|
96eb28 |
+ if (res->count == 0) {
|
|
|
96eb28 |
+ ret = ENOENT;
|
|
|
96eb28 |
+ } else {
|
|
|
96eb28 |
+ msg = res->msgs[0];
|
|
|
96eb28 |
+ }
|
|
|
96eb28 |
+ }
|
|
|
96eb28 |
break;
|
|
|
96eb28 |
case BE_REQ_INITGROUPS:
|
|
|
96eb28 |
case BE_REQ_USER:
|
|
|
96eb28 |
@@ -1038,7 +1045,14 @@ errno_t get_object_from_cache(TALLOC_CTX *mem_ctx,
|
|
|
96eb28 |
ret = sysdb_search_user_by_uid(mem_ctx, dom, id, attrs, &msg;;
|
|
|
96eb28 |
if (ret == ENOENT && (ar->entry_type & BE_REQ_TYPE_MASK)
|
|
|
96eb28 |
== BE_REQ_USER_AND_GROUP) {
|
|
|
96eb28 |
- ret = sysdb_search_group_by_gid(mem_ctx, dom, id, attrs, &msg;;
|
|
|
96eb28 |
+ ret = sysdb_getgrgid_attrs(mem_ctx, dom, id, attrs, &res;;
|
|
|
96eb28 |
+ if (ret == EOK) {
|
|
|
96eb28 |
+ if (res->count == 0) {
|
|
|
96eb28 |
+ ret = ENOENT;
|
|
|
96eb28 |
+ } else {
|
|
|
96eb28 |
+ msg = res->msgs[0];
|
|
|
96eb28 |
+ }
|
|
|
96eb28 |
+ }
|
|
|
96eb28 |
}
|
|
|
96eb28 |
break;
|
|
|
96eb28 |
default:
|
|
|
96eb28 |
--
|
|
|
96eb28 |
2.14.4
|
|
|
96eb28 |
|