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_start.c | |
| parent | 0f2b27e7d428e75b8e6079ee5f36a0cccd4d1785 (diff) | |
| download | samba-e7d5f0a357c42593a015b80390dedf920117a7e2.tar.gz samba-e7d5f0a357c42593a015b80390dedf920117a7e2.tar.bz2 samba-e7d5f0a357c42593a015b80390dedf920117a7e2.zip | |
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_start.c')
| -rw-r--r-- | auth/gensec/gensec_start.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c index aa609c9b6f..d5a5dc83bb 100644 --- a/auth/gensec/gensec_start.c +++ b/auth/gensec/gensec_start.c @@ -506,7 +506,6 @@ const char **gensec_security_oids(struct gensec_security *gensec_security, @ gensec_security return */ static NTSTATUS gensec_start(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, struct gensec_settings *settings, struct auth4_context *auth_context, struct gensec_security **gensec_security) @@ -514,7 +513,6 @@ static NTSTATUS gensec_start(TALLOC_CTX *mem_ctx, (*gensec_security) = talloc_zero(mem_ctx, struct gensec_security); NT_STATUS_HAVE_NO_MEMORY(*gensec_security); - (*gensec_security)->event_ctx = ev; SMB_ASSERT(settings->lp_ctx != NULL); (*gensec_security)->settings = talloc_reference(*gensec_security, settings); @@ -548,7 +546,6 @@ _PUBLIC_ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx, (*gensec_security)->subcontext = true; (*gensec_security)->want_features = parent->want_features; (*gensec_security)->dcerpc_auth_level = parent->dcerpc_auth_level; - (*gensec_security)->event_ctx = parent->event_ctx; (*gensec_security)->auth_context = talloc_reference(*gensec_security, parent->auth_context); (*gensec_security)->settings = talloc_reference(*gensec_security, parent->settings); (*gensec_security)->auth_context = talloc_reference(*gensec_security, parent->auth_context); @@ -564,7 +561,6 @@ _PUBLIC_ NTSTATUS gensec_subcontext_start(TALLOC_CTX *mem_ctx, */ _PUBLIC_ NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx, struct gensec_security **gensec_security, - struct tevent_context *ev, struct gensec_settings *settings) { NTSTATUS status; @@ -574,7 +570,7 @@ _PUBLIC_ NTSTATUS gensec_client_start(TALLOC_CTX *mem_ctx, return NT_STATUS_INTERNAL_ERROR; } - status = gensec_start(mem_ctx, ev, settings, NULL, gensec_security); + status = gensec_start(mem_ctx, settings, NULL, gensec_security); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -592,7 +588,6 @@ _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 tevent_context *ev, struct gensec_settings *settings, struct auth4_context *auth_context, struct gensec_security **gensec_security) @@ -604,7 +599,7 @@ _PUBLIC_ NTSTATUS gensec_server_start(TALLOC_CTX *mem_ctx, return NT_STATUS_INTERNAL_ERROR; } - status = gensec_start(mem_ctx, ev, settings, auth_context, gensec_security); + status = gensec_start(mem_ctx, settings, auth_context, gensec_security); if (!NT_STATUS_IS_OK(status)) { return status; } |