s4:lib/tevent: rename structs

[kamenim/samba.git] / source4 / libcli / cldap / cldap.h

diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 8aa98f03312eeaf8c16a70ad22179d5eac434f86..17e88716c5120e4c0cdf5346b17e9e816cdd3bef 100644 (file)
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -19,8 +19,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "libcli/util/asn_1.h"
-#include "librpc/gen_ndr/nbt.h"
+#include "../lib/util/asn1.h"
+#include "../libcli/netlogon.h"
 
 struct ldap_message;
 
@@ -52,7 +52,7 @@ struct cldap_request {
        /* the ldap message_id */
        int message_id;
 
-       struct timed_event *te;
+       struct tevent_timer *te;
 
        /* the encoded request */
        DATA_BLOB encoded;
@@ -72,10 +72,11 @@ struct cldap_request {
 */
 struct cldap_socket {
        struct socket_context *sock;
-       struct event_context *event_ctx;
+       struct tevent_context *event_ctx;
+       struct smb_iconv_convenience *iconv_convenience;
 
        /* the fd event */
-       struct fd_event *fde;
+       struct tevent_fd *fde;
 
        /* a queue of outgoing requests */
        struct cldap_request *send_queue;
@@ -111,7 +112,8 @@ struct cldap_search {
 };
 
 struct cldap_socket *cldap_socket_init(TALLOC_CTX *mem_ctx, 
-                                      struct event_context *event_ctx);
+                                      struct tevent_context *event_ctx, 
+                                      struct smb_iconv_convenience *iconv_convenience);
 NTSTATUS cldap_set_incoming_handler(struct cldap_socket *cldap,
                                    void (*handler)(struct cldap_socket *, struct ldap_message *, 
                                                    struct socket_address *),
@@ -159,9 +161,10 @@ struct cldap_netlogon {
                const char *domain_sid;
                int acct_control;
                uint32_t version;
+               bool map_response;
        } in;
        struct {
-               union nbt_cldap_netlogon netlogon;
+               struct netlogon_samlogon_response netlogon;
        } out;
 };
 
@@ -176,4 +179,4 @@ NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap,
                              uint32_t message_id,
                              struct socket_address *src,
                              uint32_t version,
-                             union nbt_cldap_netlogon *netlogon);
+                             struct netlogon_samlogon_response *netlogon);