From 93becde0ff15d0a0b01ec477e9dfe641dd9569ea Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 3 Aug 2009 16:35:17 +0200
Subject: Consolidate tevent helpers

---
 server/providers/krb5/krb5_auth.c  | 16 ----------------
 server/providers/ldap/sdap_async.h | 17 -----------------
 2 files changed, 33 deletions(-)

(limited to 'server/providers')

diff --git a/server/providers/krb5/krb5_auth.c b/server/providers/krb5/krb5_auth.c
index c2bf83ff..24250b9f 100644
--- a/server/providers/krb5/krb5_auth.c
+++ b/server/providers/krb5/krb5_auth.c
@@ -165,22 +165,6 @@ failed:
     return kerr;
 }
 
-/* TODO: remove later
- * These functions are available in the latest tevent and are the ones that
- * should be used as tevent_req is rightfully opaque there */
-#ifndef tevent_req_data
-#define tevent_req_data(req, type) ((type *)req->private_state)
-#endif
-
-#ifndef tevent_req_set_callback
-#define tevent_req_set_callback(req, func, data) \
-    do { req->async.fn = func; req->async.private_data = data; } while(0)
-#endif
-
-#ifndef tevent_req_callback_data
-#define tevent_req_callback_data(req, type) ((type *)req->async.private_data)
-#endif
-
 static void wait_for_child_handler(struct tevent_context *ev,
                                 struct tevent_signal *sige, int signum,
                                 int count, void *__siginfo, void *pvt)
diff --git a/server/providers/ldap/sdap_async.h b/server/providers/ldap/sdap_async.h
index 4012729c..1cf00d47 100644
--- a/server/providers/ldap/sdap_async.h
+++ b/server/providers/ldap/sdap_async.h
@@ -24,23 +24,6 @@
 #include "providers/dp_backend.h"
 #include "providers/ldap/sdap.h"
 
-/* TODO: remove later
- * These functions are available in the latest tevent and are the ones that
- * should be used as tevent_req is rightfully opaque there */
-#ifndef tevent_req_data
-#define tevent_req_data(req, type) ((type *)req->private_state)
-#endif
-
-#ifndef tevent_req_set_callback
-#define tevent_req_set_callback(req, func, data) \
-    do { req->async.fn = func; req->async.private_data = data; } while(0)
-#endif
-
-#ifndef tevent_req_callback_data
-#define tevent_req_callback_data(req, type) ((type *)req->async.private_data)
-#endif
-
-
 struct tevent_req *sdap_connect_send(TALLOC_CTX *memctx,
                                      struct tevent_context *ev,
                                      struct sdap_options *opts,
-- 
cgit