diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-17 09:22:33 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 13:13:33 +1100 |
| commit | e7d5f0a357c42593a015b80390dedf920117a7e2 (patch) | |
| tree | a4fa1a53f0294607b4abeb6f389ce719502fe849 /auth/gensec/gensec.h | |
| parent | 0f2b27e7d428e75b8e6079ee5f36a0cccd4d1785 (diff) | |
| download | samba-e7d5f0a357c42593a015b80390dedf920117a7e2.tar.gz | |
gensec: move event context from gensec_*_init() to gensec_update()
This avoids keeping the event context around on a the gensec_security
context structure long term.
In the Samba3 server, the event context we either supply is a NULL
pointer as no server-side modules currently use the event context.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'auth/gensec/gensec.h')
| -rw-r--r-- | auth/gensec/gensec.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/auth/gensec/gensec.h b/auth/gensec/gensec.h index ee87a4da79e..acfc54926c4 100644 --- a/auth/gensec/gensec.h +++ b/auth/gensec/gensec.h @@ -92,6 +92,7 @@ struct gensec_security_ops { NTSTATUS (*magic)(struct gensec_security *gensec_security, const DATA_BLOB *first_packet); NTSTATUS (*update)(struct gensec_security *gensec_security, TALLOC_CTX *out_mem_ctx, + struct tevent_context *ev, const DATA_BLOB in, DATA_BLOB *out); NTSTATUS (*seal_packet)(struct gensec_security *gensec_security, TALLOC_CTX *sig_mem_ctx, uint8_t *data, size_t length, @@ -161,7 +162,6 @@ struct gensec_security { bool subcontext; uint32_t want_features; uint8_t dcerpc_auth_level; - struct tevent_context *event_ctx; struct tsocket_address *local_addr, *remote_addr; struct gensec_settings *settings; @@ -212,13 +212,13 @@ 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 tevent_context *ev, struct gensec_settings *settings); NTSTATUS gensec_start_mech_by_ops(struct gensec_security *gensec_security, const struct gensec_security_ops *ops); NTSTATUS gensec_start_mech_by_sasl_list(struct gensec_security *gensec_security, const char **sasl_names); NTSTATUS gensec_update(struct gensec_security *gensec_security, TALLOC_CTX *out_mem_ctx, + struct tevent_context *ev, const DATA_BLOB in, DATA_BLOB *out); struct tevent_req *gensec_update_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, @@ -267,7 +267,6 @@ 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 tevent_context *ev, struct gensec_settings *settings, struct auth4_context *auth_context, struct gensec_security **gensec_security); |