diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-18 14:54:57 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-18 14:54:57 +0000 |
| commit | d14c8604653d39dd25736279d34930ee7a3ae103 (patch) | |
| tree | 626f700b9b42b798ed7459a5cba5cd27aca9753e /source4/auth | |
| parent | 0c0b9c738f0fc1bf8aa64533a5e4e0635b84f58f (diff) | |
| parent | fc31f2c5269fd405be96b9a036baf35a60141ccf (diff) | |
| download | samba-d14c8604653d39dd25736279d34930ee7a3ae103.tar.gz samba-d14c8604653d39dd25736279d34930ee7a3ae103.tar.bz2 samba-d14c8604653d39dd25736279d34930ee7a3ae103.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/gensec/gensec.h | 1 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.c | 3 | ||||
| -rw-r--r-- | source4/auth/session.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h index cb7f3aec99..235d2008fb 100644 --- a/source4/auth/gensec/gensec.h +++ b/source4/auth/gensec/gensec.h @@ -65,6 +65,7 @@ enum gensec_role struct auth_session_info; struct cli_credentials; struct gensec_settings; +struct event_context; struct gensec_update_request { struct gensec_security *gensec_security; diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index 06db904130..ac12a498c6 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -272,8 +272,7 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context, continue; } - status = socket_connect_ev(smb_krb5->sock, NULL, remote_addr, 0, - NULL, ev); + status = socket_connect_ev(smb_krb5->sock, NULL, remote_addr, 0, ev); if (!NT_STATUS_IS_OK(status)) { talloc_free(smb_krb5); continue; diff --git a/source4/auth/session.h b/source4/auth/session.h index e0805e1584..fd298b4401 100644 --- a/source4/auth/session.h +++ b/source4/auth/session.h @@ -29,7 +29,8 @@ struct auth_session_info { }; #include "librpc/gen_ndr/netlogon.h" -#include "lib/events/events.h" + +struct event_context; /* Create a security token for a session SYSTEM (the most * trusted/prvilaged account), including the local machine account as |