diff options
Diffstat (limited to 'source4/auth/gensec')
-rw-r--r-- | source4/auth/gensec/gensec.c | 10 | ||||
-rw-r--r-- | source4/auth/gensec/gensec.h | 10 | ||||
-rw-r--r-- | source4/auth/gensec/schannel_state.c | 6 | ||||
-rw-r--r-- | source4/auth/gensec/socket.c | 8 |
4 files changed, 17 insertions, 17 deletions
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index 7a8da71a7d..7169b074e3 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -506,7 +506,7 @@ const char **gensec_security_oids(struct gensec_security *gensec_security, @note The mem_ctx is only a parent and may be NULL. */ static NTSTATUS gensec_start(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct gensec_settings *settings, struct messaging_context *msg, struct gensec_security **gensec_security) @@ -573,7 +573,7 @@ _PUBLIC_ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx, */ _PUBLIC_ NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx, struct gensec_security **gensec_security, - struct event_context *ev, + struct tevent_context *ev, struct gensec_settings *settings) { NTSTATUS status; @@ -599,7 +599,7 @@ _PUBLIC_ NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx, @note The mem_ctx is only a parent and may be NULL. */ _PUBLIC_ NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct gensec_settings *settings, struct messaging_context *msg, struct gensec_security **gensec_security) @@ -985,7 +985,7 @@ _PUBLIC_ NTSTATUS gensec_update(struct gensec_security *gensec_security, TALLOC_ return gensec_security->ops->update(gensec_security, out_mem_ctx, in, out); } -static void gensec_update_async_timed_handler(struct event_context *ev, struct timed_event *te, +static void gensec_update_async_timed_handler(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr) { struct gensec_update_request *req = talloc_get_type(ptr, struct gensec_update_request); @@ -1008,7 +1008,7 @@ _PUBLIC_ void gensec_update_send(struct gensec_security *gensec_security, const void *private_data) { struct gensec_update_request *req = NULL; - struct timed_event *te = NULL; + struct tevent_timer *te = NULL; req = talloc(gensec_security, struct gensec_update_request); if (!req) goto failed; diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h index 87c9b4d169..c627bda024 100644 --- a/source4/auth/gensec/gensec.h +++ b/source4/auth/gensec/gensec.h @@ -68,7 +68,7 @@ enum gensec_role struct auth_session_info; struct cli_credentials; struct gensec_settings; -struct event_context; +struct tevent_context; struct gensec_update_request { struct gensec_security *gensec_security; @@ -168,7 +168,7 @@ struct gensec_security { enum gensec_role gensec_role; bool subcontext; uint32_t want_features; - struct event_context *event_ctx; + struct tevent_context *event_ctx; struct messaging_context *msg_ctx; /* only valid as server */ struct socket_address *my_addr, *peer_addr; struct gensec_settings *settings; @@ -189,7 +189,7 @@ struct socket_context; NTSTATUS gensec_socket_init(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, struct socket_context *current_socket, - struct event_context *ev, + struct tevent_context *ev, void (*recv_handler)(void *, uint16_t), void *recv_private, struct socket_context **new_socket); @@ -220,7 +220,7 @@ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx, struct gensec_security **gensec_security); NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx, struct gensec_security **gensec_security, - struct event_context *ev, + struct tevent_context *ev, struct gensec_settings *settings); NTSTATUS gensec_start_mech_by_sasl_list(struct gensec_security *gensec_security, const char **sasl_names); @@ -272,7 +272,7 @@ NTSTATUS gensec_start_mech_by_authtype(struct gensec_security *gensec_security, uint8_t auth_type, uint8_t auth_level); const char *gensec_get_name_by_authtype(struct gensec_security *gensec_security, uint8_t authtype); NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx, - struct event_context *ev, + struct tevent_context *ev, struct gensec_settings *settings, struct messaging_context *msg, struct gensec_security **gensec_security); diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c index c73313f9c8..d86b1f2b9c 100644 --- a/source4/auth/gensec/schannel_state.c +++ b/source4/auth/gensec/schannel_state.c @@ -34,7 +34,7 @@ /** connect to the schannel ldb */ -struct ldb_context *schannel_db_connect(TALLOC_CTX *mem_ctx, struct event_context *ev_ctx, +struct ldb_context *schannel_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { char *path; @@ -140,7 +140,7 @@ NTSTATUS schannel_store_session_key_ldb(TALLOC_CTX *mem_ctx, } NTSTATUS schannel_store_session_key(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, struct creds_CredentialState *creds) { @@ -272,7 +272,7 @@ NTSTATUS schannel_fetch_session_key_ldb(TALLOC_CTX *mem_ctx, } NTSTATUS schannel_fetch_session_key(TALLOC_CTX *mem_ctx, - struct event_context *ev_ctx, + struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx, const char *computer_name, const char *domain, diff --git a/source4/auth/gensec/socket.c b/source4/auth/gensec/socket.c index 319730e2ca..a338797ecf 100644 --- a/source4/auth/gensec/socket.c +++ b/source4/auth/gensec/socket.c @@ -31,7 +31,7 @@ static const struct socket_ops gensec_socket_ops; struct gensec_socket { struct gensec_security *gensec_security; struct socket_context *socket; - struct event_context *ev; + struct tevent_context *ev; struct packet_context *packet; DATA_BLOB read_buffer; /* SASL packets are turned into liniarlised data here, for reading */ size_t orig_send_len; @@ -197,8 +197,8 @@ static void gensec_socket_error_handler(void *private, NTSTATUS status) } } -static void gensec_socket_trigger_read(struct event_context *ev, - struct timed_event *te, +static void gensec_socket_trigger_read(struct tevent_context *ev, + struct tevent_timer *te, struct timeval t, void *private) { struct gensec_socket *gensec_socket = talloc_get_type(private, struct gensec_socket); @@ -413,7 +413,7 @@ static NTSTATUS gensec_socket_send(struct socket_context *sock, NTSTATUS gensec_socket_init(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, struct socket_context *current_socket, - struct event_context *ev, + struct tevent_context *ev, void (*recv_handler)(void *, uint16_t), void *recv_private, struct socket_context **new_socket) |