Rebase the code to use talloc, tdb, tevent, ldb as external

dependencies based on the latest samba code.
Convert all references to the old events library to use the
renamed tevent library.

7 files changed, 24 insertions, 20 deletions

diff --git a/server/providers/data_provider.c b/server/providers/data_provider.c
index a0e3b08d2..85a824e47 100644
--- a/server/providers/data_provider.c
+++ b/server/providers/data_provider.c
@@ -47,7 +47,7 @@ struct dp_backend;
 struct dp_frontend;
 
 struct dp_ctx {
-    struct event_context *ev;
+    struct tevent_context *ev;
     struct confdb_ctx *cdb;
     struct service_sbus_ctx *ss_ctx;
     struct sbus_srv_ctx *sbus_srv;
@@ -1081,7 +1081,7 @@ done:
 }
 
 static int dp_process_init(TALLOC_CTX *mem_ctx,
-                           struct event_context *ev,
+                           struct tevent_context *ev,
                            struct confdb_ctx *cdb)
 {
     struct dp_ctx *dpctx;
diff --git a/server/providers/data_provider_be.c b/server/providers/data_provider_be.c
index 9ed3d2ce6..c9faff954 100644
--- a/server/providers/data_provider_be.c
+++ b/server/providers/data_provider_be.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <dlfcn.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
@@ -168,8 +169,8 @@ struct be_async_req {
     struct be_req *req;
 };
 
-static void be_async_req_handler(struct event_context *ev,
-                                 struct timed_event *te,
+static void be_async_req_handler(struct tevent_context *ev,
+                                 struct tevent_timer *te,
                                  struct timeval tv, void *pvt)
 {
     struct be_async_req *async_req;
@@ -184,7 +185,7 @@ static int be_file_request(struct be_ctx *ctx,
                            struct be_req *req)
 {
     struct be_async_req *areq;
-    struct timed_event *te;
+    struct tevent_timer *te;
     struct timeval tv;
 
     areq = talloc(req, struct be_async_req);
@@ -198,7 +199,7 @@ static int be_file_request(struct be_ctx *ctx,
     tv.tv_sec = 0;
     tv.tv_usec = 0;
 
-    te = event_add_timed(ctx->ev, req, tv, be_async_req_handler, areq);
+    te = tevent_add_timer(ctx->ev, req, tv, be_async_req_handler, areq);
     if (te == NULL) {
         return EIO;
     }
@@ -769,7 +770,7 @@ done:
 int be_process_init(TALLOC_CTX *mem_ctx,
                     const char *be_name,
                     const char *be_domain,
-                    struct event_context *ev,
+                    struct tevent_context *ev,
                     struct confdb_ctx *cdb)
 {
     struct be_ctx *ctx;
diff --git a/server/providers/dp_backend.h b/server/providers/dp_backend.h
index cdd2c51b7..df09544fc 100644
--- a/server/providers/dp_backend.h
+++ b/server/providers/dp_backend.h
@@ -29,7 +29,7 @@
 struct be_mod_ops;
 
 struct be_ctx {
-    struct event_context *ev;
+    struct tevent_context *ev;
     struct confdb_ctx *cdb;
     struct sysdb_ctx *sysdb;
     struct service_sbus_ctx *ss_ctx;
diff --git a/server/providers/dp_sbus.c b/server/providers/dp_sbus.c
index f6fc12ffe..22be6c843 100644
--- a/server/providers/dp_sbus.c
+++ b/server/providers/dp_sbus.c
@@ -19,7 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "util/util.h"
+#include "config.h"
+#include "talloc.h"
+#include "tevent.h"
 #include "confdb/confdb.h"
 #include "sbus/sssd_dbus.h"
 #include "providers/data_provider.h"
diff --git a/server/providers/ldap_be.c b/server/providers/ldap_be.c
index b13224c5b..e5c317306 100644
--- a/server/providers/ldap_be.c
+++ b/server/providers/ldap_be.c
@@ -68,16 +68,16 @@ struct ldap_req {
     LDAP *ldap;
     struct ldap_ops *ops;
     char *user_dn;
-    event_fd_handler_t next_task;
+    tevent_fd_handler_t next_task;
     enum ldap_be_ops next_op;
     int msgid;
 };
 
 static int schedule_next_task(struct ldap_req *lr, struct timeval tv,
-                              event_timed_handler_t task)
+                              tevent_timer_handler_t task)
 {
     int ret;
-    struct timed_event *te;
+    struct tevent_timer *te;
     struct timeval timeout;
 
     ret = gettimeofday(&timeout, NULL);
@@ -89,7 +89,7 @@ static int schedule_next_task(struct ldap_req *lr, struct timeval tv,
     timeout.tv_usec += tv.tv_usec;
 
 
-    te = event_add_timed(lr->req->be_ctx->ev, lr, timeout, task, lr); 
+    te = tevent_add_timer(lr->req->be_ctx->ev, lr, timeout, task, lr); 
     if (te == NULL) {
         return EIO;
     }
@@ -101,7 +101,7 @@ static int wait_for_fd(struct ldap_req *lr)
 {
     int ret;
     int fd;
-    struct fd_event *fde;
+    struct tevent_fd *fde;
 
     ret = ldap_get_option(lr->ldap, LDAP_OPT_DESC, &fd);
     if (ret != LDAP_OPT_SUCCESS) {
@@ -109,7 +109,7 @@ static int wait_for_fd(struct ldap_req *lr)
         return ret;
     }
 
-    fde = event_add_fd(lr->req->be_ctx->ev, lr, fd, EVENT_FD_READ, lr->next_task, lr);
+    fde = tevent_add_fd(lr->req->be_ctx->ev, lr, fd, TEVENT_FD_READ, lr->next_task, lr);
     if (fde == NULL) {
         return EIO;
     }
@@ -257,8 +257,8 @@ static int ldap_be_bind(struct ldap_req *lr)
     return LDAP_SUCCESS;
 }
 
-static void ldap_be_loop(struct event_context *ev, struct fd_event *te,
-                     uint16_t fd, void *pvt)
+static void ldap_be_loop(struct tevent_context *ev, struct tevent_fd *te,
+                         uint16_t fd, void *pvt)
 {
     int ret;
     int pam_status=PAM_SUCCESS;
@@ -534,8 +534,8 @@ done:
     req->fn(req, pam_status, NULL);
 }
 
-static void ldap_start(struct event_context *ev, struct timed_event *te,
-                     struct timeval tv, void *pvt)
+static void ldap_start(struct tevent_context *ev, struct tevent_timer *te,
+                       struct timeval tv, void *pvt)
 {
     int ret;
     int pam_status;
diff --git a/server/providers/providers.h b/server/providers/providers.h
index 19eab827c..44e7028ab 100644
--- a/server/providers/providers.h
+++ b/server/providers/providers.h
@@ -20,5 +20,5 @@
 */
 
 int dp_process_init(TALLOC_CTX *mem_ctx,
-                    struct event_context *ev,
+                    struct tevent_context *ev,
                     struct confdb_ctx *cdb);
diff --git a/server/providers/proxy.c b/server/providers/proxy.c
index e072ec3c7..3c39c8f87 100644
--- a/server/providers/proxy.c
+++ b/server/providers/proxy.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <pwd.h>
 #include <grp.h>
+#include <dlfcn.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>