Rename sysdb_req to sysdb_handle.

This sysdb_req has always really been a transaction handle and not
a request.

This is part of a set of patches to rewrite transaction support in sysdb to a
hopefully better API, that will also let use use tevent_req async style to
manipulate our cache.

2 files changed, 6 insertions, 12 deletions

diff --git a/server/responder/pam/pam_LOCAL_domain.c b/server/responder/pam/pam_LOCAL_domain.c
index 010bd8d4..15116a5e 100644
--- a/server/responder/pam/pam_LOCAL_domain.c
+++ b/server/responder/pam/pam_LOCAL_domain.c
@@ -49,7 +49,7 @@
 struct LOCAL_request {
     struct sysdb_ctx *dbctx;
     struct sysdb_attrs *mod_attrs;
-    struct sysdb_req *sysdb_req;
+    struct sysdb_handle *handle;
 
     struct ldb_result *res;
     int error;
@@ -95,7 +95,7 @@ static void set_user_attr_callback(void *pvt, int ldb_status, struct ldb_result
 
     lreq = talloc_get_type(pvt, struct LOCAL_request);
 
-    sysdb_transaction_done(lreq->sysdb_req, sysdb_error_to_errno(ldb_status));
+    sysdb_transaction_done(lreq->handle, sysdb_error_to_errno(ldb_status));
 
     NEQ_CHECK_OR_JUMP(ldb_status, LDB_SUCCESS, ("set_user_attr failed.\n"),
                       lreq->error, sysdb_error_to_errno(ldb_status), done);
@@ -104,7 +104,7 @@ done:
     prepare_reply(lreq);
 }
 
-static void set_user_attr_req(struct sysdb_req *req, void *pvt)
+static void set_user_attr_req(struct sysdb_handle *handle, void *pvt)
 {
     int ret;
     struct LOCAL_request *lreq;
@@ -113,13 +113,13 @@ static void set_user_attr_req(struct sysdb_req *req, void *pvt)
 
     lreq = talloc_get_type(pvt, struct LOCAL_request);
 
-    lreq->sysdb_req = req;
+    lreq->handle = handle;
 
-    ret = sysdb_set_user_attr(req, lreq->preq->domain,
+    ret = sysdb_set_user_attr(handle, lreq->preq->domain,
                               lreq->preq->pd->user, lreq->mod_attrs,
                               set_user_attr_callback, lreq);
     if (ret != EOK)
-        sysdb_transaction_done(lreq->sysdb_req, ret);
+        sysdb_transaction_done(lreq->handle, ret);
 
     NEQ_CHECK_OR_JUMP(ret, EOK, ("sysdb_set_user_attr failed.\n"),
                       lreq->error, ret, done);
diff --git a/server/responder/pam/pamsrv_cache.c b/server/responder/pam/pamsrv_cache.c
index d1c34e5f..7cfd97b1 100644
--- a/server/responder/pam/pamsrv_cache.c
+++ b/server/responder/pam/pamsrv_cache.c
@@ -51,12 +51,6 @@ static int authtok2str(const void *mem_ctx,
     return EOK;
 }
 
-struct set_attrs_ctx {
-    struct pam_auth_req *preq;
-    struct sysdb_req *sysreq;
-    char *password;
-};
-
 static void pam_cache_auth_return(struct pam_auth_req *preq, int error)
 {
     preq->pd->pam_status = error;