From f4093e062cf1646b8f01d7078e63708aeb36a95d Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Thu, 24 Nov 2011 14:39:40 +0100
Subject: Fix sdap_id_ctx/ipa_id_ctx mismatch in IPA provider

This was causing a segfault during HBAC processing and any ID lookups
except for netgroups
---
 src/providers/ipa/ipa_id.c   | 2 +-
 src/providers/ipa/ipa_init.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/providers/ipa')

diff --git a/src/providers/ipa/ipa_id.c b/src/providers/ipa/ipa_id.c
index 14a344f2a..a014c9f20 100644
--- a/src/providers/ipa/ipa_id.c
+++ b/src/providers/ipa/ipa_id.c
@@ -80,7 +80,7 @@ void ipa_account_info_handler(struct be_req *breq)
     case BE_REQ_USER: /* user */
     case BE_REQ_GROUP: /* group */
     case BE_REQ_INITGROUPS: /* init groups for user */
-        return sdap_account_info_handler(breq);
+        return sdap_handle_account_info(breq, ctx);
 
     case BE_REQ_NETGROUP:
         if (ar->filter_type != BE_FILTER_NAME) {
diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c
index 8b553ef06..9fbca3ae4 100644
--- a/src/providers/ipa/ipa_init.c
+++ b/src/providers/ipa/ipa_init.c
@@ -351,6 +351,7 @@ int sssm_ipa_access_init(struct be_ctx *bectx,
 {
     int ret;
     struct ipa_access_ctx *ipa_access_ctx;
+    struct ipa_id_ctx *id_ctx;
 
     ipa_access_ctx = talloc_zero(bectx, struct ipa_access_ctx);
     if (ipa_access_ctx == NULL) {
@@ -358,11 +359,12 @@ int sssm_ipa_access_init(struct be_ctx *bectx,
         return ENOMEM;
     }
 
-    ret = sssm_ipa_id_init(bectx, ops, (void **) &ipa_access_ctx->sdap_ctx);
+    ret = sssm_ipa_id_init(bectx, ops, (void **) &id_ctx);
     if (ret != EOK) {
         DEBUG(1, ("sssm_ipa_id_init failed.\n"));
         goto done;
     }
+    ipa_access_ctx->sdap_ctx = id_ctx->sdap_id_ctx;
 
     ret = dp_copy_options(ipa_access_ctx, ipa_options->basic,
                           IPA_OPTS_BASIC, &ipa_access_ctx->ipa_options);
-- 
cgit