From 129310e872a0a70e721ba59363e518176ef406d6 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 13 Feb 2012 14:54:55 +0100
Subject: Allocate setent structure on state, not on the client context

https://fedorahosted.org/sssd/ticket/1189
---
 src/responder/autofs/autofssrv_cmd.c | 4 ++--
 src/responder/nss/nsssrv_cmd.c       | 8 ++++----
 src/responder/nss/nsssrv_netgroup.c  | 4 ++--
 src/responder/nss/nsssrv_services.c  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/responder/autofs/autofssrv_cmd.c b/src/responder/autofs/autofssrv_cmd.c
index 73dbc5eaa..2be872902 100644
--- a/src/responder/autofs/autofssrv_cmd.c
+++ b/src/responder/autofs/autofssrv_cmd.c
@@ -436,7 +436,7 @@ setautomntent_send(TALLOC_CTX *mem_ctx,
         DEBUG(SSSDBG_TRACE_LIBS,
               ("Map %s is being looked up, registering for notification\n",
                state->mapname));
-        ret = autofs_setent_add_ref(cmdctx->cctx, state->map, req);
+        ret = autofs_setent_add_ref(state, state->map, req);
         if (ret != EOK) {
             goto fail;
         }
@@ -460,7 +460,7 @@ setautomntent_send(TALLOC_CTX *mem_ctx,
         }
         state->map->map_table = actx->maps;
 
-        ret = autofs_setent_add_ref(cmdctx->cctx, state->map, req);
+        ret = autofs_setent_add_ref(state, state->map, req);
         if (ret != EOK) {
             talloc_free(state->map);
             goto fail;
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index 68f6e0bb4..7ec0b7c03 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -1210,7 +1210,7 @@ struct tevent_req *nss_cmd_setpwent_send(TALLOC_CTX *mem_ctx,
              * Register for notification when it's
              * ready.
              */
-            ret = nss_setent_add_ref(state->client, state->nctx->pctx, req);
+            ret = nss_setent_add_ref(state, state->nctx->pctx, req);
             if (ret != EOK) {
                 talloc_free(req);
                 return NULL;
@@ -1232,7 +1232,7 @@ struct tevent_req *nss_cmd_setpwent_send(TALLOC_CTX *mem_ctx,
     state->getent_ctx = nctx->pctx;
 
     /* Add a callback reference for ourselves */
-    ret = nss_setent_add_ref(state->client, state->nctx->pctx, req);
+    ret = nss_setent_add_ref(state, state->nctx->pctx, req);
     if (ret) goto error;
 
     /* ok, start the searches */
@@ -2508,7 +2508,7 @@ struct tevent_req *nss_cmd_setgrent_send(TALLOC_CTX *mem_ctx,
              * Register for notification when it's
              * ready.
              */
-            ret = nss_setent_add_ref(state->client, state->nctx->gctx, req);
+            ret = nss_setent_add_ref(state, state->nctx->gctx, req);
             if (ret != EOK) {
                 talloc_free(req);
                 return NULL;
@@ -2530,7 +2530,7 @@ struct tevent_req *nss_cmd_setgrent_send(TALLOC_CTX *mem_ctx,
     state->getent_ctx = nctx->gctx;
 
     /* Add a callback reference for ourselves */
-    ret = nss_setent_add_ref(state->client, state->nctx->gctx, req);
+    ret = nss_setent_add_ref(state, state->nctx->gctx, req);
     if (ret) goto error;
 
     /* ok, start the searches */
diff --git a/src/responder/nss/nsssrv_netgroup.c b/src/responder/nss/nsssrv_netgroup.c
index 9943bca60..5c79342c9 100644
--- a/src/responder/nss/nsssrv_netgroup.c
+++ b/src/responder/nss/nsssrv_netgroup.c
@@ -254,7 +254,7 @@ static struct tevent_req *setnetgrent_send(TALLOC_CTX *mem_ctx,
         /* Result object is still being constructed
          * Register for notification when it's ready
          */
-        ret = nss_setent_add_ref(cmdctx->cctx, state->netgr, req);
+        ret = nss_setent_add_ref(state, state->netgr, req);
         if (ret != EOK) {
             goto error;
         }
@@ -281,7 +281,7 @@ static struct tevent_req *setnetgrent_send(TALLOC_CTX *mem_ctx,
         state->netgr->lookup_table = nctx->netgroups;
 
         /* Add a reference for ourselves */
-        ret = nss_setent_add_ref(cmdctx->cctx, state->netgr, req);
+        ret = nss_setent_add_ref(state, state->netgr, req);
         if (ret != EOK) {
             talloc_free(state->netgr);
             goto error;
diff --git a/src/responder/nss/nsssrv_services.c b/src/responder/nss/nsssrv_services.c
index 3ce3d0902..38754ff07 100644
--- a/src/responder/nss/nsssrv_services.c
+++ b/src/responder/nss/nsssrv_services.c
@@ -1464,7 +1464,7 @@ setservent_step_done(struct tevent_req *req)
     talloc_zfree(req);
     if (ret == ENOENT) {
         DEBUG(SSSDBG_TRACE_FUNC,
-              ("Domain [%d] returned no results\n", dctx->domain->name));
+              ("Domain [%s] returned no results\n", dctx->domain->name));
     } else if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               ("Error [%s] while retrieving info from domain [%s]. "
-- 
cgit