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.

1 files changed, 4 insertions, 4 deletions

diff --git a/server/sbus/sssd_dbus_common.c b/server/sbus/sssd_dbus_common.c
index 465e920f2..a9e0d816f 100644
--- a/server/sbus/sssd_dbus_common.c
+++ b/server/sbus/sssd_dbus_common.c
@@ -20,10 +20,10 @@ struct timeval _dbus_timeout_get_interval_tv(int interval) {
  * from the libevents mainloop
  */
 void sbus_remove_watch(DBusWatch *watch, void *data) {
-    struct fd_event *fde;
+    struct tevent_fd *fde;
 
     DEBUG(5, ("%lX\n", watch));
-    fde = talloc_get_type(dbus_watch_get_data(watch), struct fd_event);
+    fde = talloc_get_type(dbus_watch_get_data(watch), struct tevent_fd);
 
     /* Freeing the event object will remove it from the event loop */
     talloc_free(fde);
@@ -36,8 +36,8 @@ void sbus_remove_watch(DBusWatch *watch, void *data) {
  * Hook for D-BUS to remove time-based events from the mainloop
  */
 void sbus_remove_timeout(DBusTimeout *timeout, void *data) {
-    struct timed_event *te;
-    te = talloc_get_type(dbus_timeout_get_data(timeout), struct timed_event);
+    struct tevent_timer *te;
+    te = talloc_get_type(dbus_timeout_get_data(timeout), struct tevent_timer);
 
     /* Freeing the event object will remove it from the event loop */
     talloc_free(te);