diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-17 08:47:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:34 -0500 |
| commit | c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95 (patch) | |
| tree | c45f3949f0e5f434f129c6346a99d3fa0aab96df /source4/auth/kerberos | |
| parent | ad1cde253e5938acf2c57458b5af04f32f45edbf (diff) | |
| download | samba-c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95.tar.gz samba-c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95.tar.bz2 samba-c42219d7352bd2e7a6413f7ae1cd0fd5cded1d95.zip | |
r22969: fix some more places where we could end up with more than one event
context. We now have an event context on the torture_context, and we
can also get one from the cli_credentials structure
(This used to be commit c0f65eb6562e13530337c23e3447a6aa6eb8fc17)
Diffstat (limited to 'source4/auth/kerberos')
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.c | 3 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index 92de176e84..9eccd459fa 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -355,11 +355,11 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context, } krb5_error_code smb_krb5_init_context(void *parent_ctx, + struct event_context *ev, struct smb_krb5_context **smb_krb5_context) { krb5_error_code ret; TALLOC_CTX *tmp_ctx; - struct event_context *ev; char **config_files; const char *config_file; @@ -446,7 +446,6 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx, } krb5_set_warn_dest((*smb_krb5_context)->krb5_context, (*smb_krb5_context)->logf); - ev = event_context_find(*smb_krb5_context); /* Set use of our socket lib */ ret = krb5_set_send_to_kdc_func((*smb_krb5_context)->krb5_context, smb_krb5_send_and_recv_func, diff --git a/source4/auth/kerberos/krb5_init_context.h b/source4/auth/kerberos/krb5_init_context.h index 7aad97e2ca..3c012aa275 100644 --- a/source4/auth/kerberos/krb5_init_context.h +++ b/source4/auth/kerberos/krb5_init_context.h @@ -23,7 +23,8 @@ struct smb_krb5_context { krb5_log_facility *logf; }; -krb5_error_code smb_krb5_init_context(void *parent_ctx, +struct event_context; +krb5_error_code smb_krb5_init_context(void *parent_ctx, struct event_context *ev, struct smb_krb5_context **smb_krb5_context); void smb_krb5_free_context(struct smb_krb5_context *smb_krb5_context); |