diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-04-17 22:35:33 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-04-28 02:24:57 +0200 |
| commit | 086c06e361962e1c118d8eed2316e9df7834ae8b (patch) | |
| tree | 22609078f318ab8e45acda1765026e7cb60a9852 /source4/auth | |
| parent | 7a26989d4c62f38dcafc2a688b8cbaccc6499480 (diff) | |
| download | samba-086c06e361962e1c118d8eed2316e9df7834ae8b.tar.gz samba-086c06e361962e1c118d8eed2316e9df7834ae8b.tar.xz samba-086c06e361962e1c118d8eed2316e9df7834ae8b.zip | |
kerberos: Remove un-used event context argument from smb_krb5_init_context()
The event context here was only specified in the server or admin-tool
context, which does not do network communication, so this only caused
a talloc_reference() and never any useful result.
The actual network communication code sets an event context directly
before making the network call.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Apr 28 02:24:57 CEST 2014 on sn-devel-104
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/gensec/gensec_gssapi.c | 1 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.c | 12 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.h | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index 63fda1f807d..fdae2a8bb9f 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -179,7 +179,6 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security) } ret = smb_krb5_init_context(gensec_gssapi_state, - NULL, gensec_security->settings->lp_ctx, &gensec_gssapi_state->smb_krb5_context); if (ret) { diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index 12aab3404f9..4404b6734c0 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -474,7 +474,6 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx, } krb5_error_code smb_krb5_init_context(void *parent_ctx, - struct tevent_context *ev, struct loadparm_context *lp_ctx, struct smb_krb5_context **smb_krb5_context) { @@ -529,17 +528,6 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx, } krb5_set_warn_dest(kctx, logf); - /* Set use of our socket lib */ - if (ev) { - struct tevent_context *previous_ev; - ret = smb_krb5_context_set_event_ctx(*smb_krb5_context, - ev, &previous_ev); - if (ret) { - talloc_free(tmp_ctx); - return ret; - } - } - /* Set options in kerberos */ krb5_set_dns_canonicalize_hostname(kctx, diff --git a/source4/auth/kerberos/krb5_init_context.h b/source4/auth/kerberos/krb5_init_context.h index b955ae508dd..3c32069ba2f 100644 --- a/source4/auth/kerberos/krb5_init_context.h +++ b/source4/auth/kerberos/krb5_init_context.h @@ -34,7 +34,7 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx, struct loadparm_context *lp_ctx, krb5_context *_krb5_context); -krb5_error_code smb_krb5_init_context(void *parent_ctx, struct tevent_context *ev, +krb5_error_code smb_krb5_init_context(void *parent_ctx, struct loadparm_context *lp_ctx, struct smb_krb5_context **smb_krb5_context); |