From ed80c73efa51780a39dfc9c72821cf88e95d264c Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Tue, 2 Mar 2010 23:53:16 -0500
Subject: sysdb: convert sysdb_delete_user

---
 src/providers/ldap/ldap_id.c | 43 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

(limited to 'src/providers/ldap/ldap_id.c')

diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index 4bbc07a6..8ac09893 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -48,7 +48,6 @@ struct users_get_state {
 
 static void users_get_connect_done(struct tevent_req *subreq);
 static void users_get_done(struct tevent_req *subreq);
-static void users_get_delete(struct tevent_req *subreq);
 
 struct tevent_req *users_get_send(TALLOC_CTX *memctx,
                                   struct tevent_context *ev,
@@ -191,15 +190,13 @@ static void users_get_done(struct tevent_req *subreq)
 
         switch (state->filter_type) {
         case BE_FILTER_NAME:
-            subreq = sysdb_delete_user_send(state, state->ev,
-                                            state->sysdb, NULL,
-                                            state->domain, state->name, 0);
-            if (!subreq) {
-                tevent_req_error(req, ENOMEM);
+            ret = sysdb_delete_user(state, state->sysdb,
+                                    state->domain, state->name, 0);
+            if (ret) {
+                tevent_req_error(req, ret);
                 return;
             }
-            tevent_req_set_callback(subreq, users_get_delete, req);
-            return;
+            break;
 
         case BE_FILTER_IDNUM:
             errno = 0;
@@ -209,15 +206,13 @@ static void users_get_done(struct tevent_req *subreq)
                 return;
             }
 
-            subreq = sysdb_delete_user_send(state, state->ev,
-                                            state->sysdb, NULL,
-                                            state->domain, NULL, uid);
-            if (!subreq) {
-                tevent_req_error(req, ENOMEM);
+            ret = sysdb_delete_user(state, state->sysdb,
+                                    state->domain, NULL, uid);
+            if (ret) {
+                tevent_req_error(req, ret);
                 return;
             }
-            tevent_req_set_callback(subreq, users_get_delete, req);
-            return;
+            break;
 
         default:
             tevent_req_error(req, EINVAL);
@@ -228,24 +223,6 @@ static void users_get_done(struct tevent_req *subreq)
     tevent_req_done(req);
 }
 
-static void users_get_delete(struct tevent_req *subreq)
-{
-    struct tevent_req *req = tevent_req_callback_data(subreq,
-                                                      struct tevent_req);
-    struct users_get_state *state = tevent_req_data(req,
-                                                     struct users_get_state);
-    int ret;
-
-    ret = sysdb_delete_user_recv(subreq);
-    talloc_zfree(subreq);
-    if (ret) {
-        DEBUG(2, ("User (%s) delete returned %d (%s)\n",
-                  state->name, ret, strerror(ret)));
-    }
-
-    tevent_req_done(req);
-}
-
 int users_get_recv(struct tevent_req *req)
 {
     TEVENT_REQ_RETURN_ON_ERROR(req);
-- 
cgit