diff options
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); |