summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-12-18 15:40:05 -0800
committerJeremy Allison <jra@samba.org>2008-12-18 15:40:05 -0800
commit4283ae489b6e227beba196e8a315a9727f03cc07 (patch)
tree7308561653b9e52eab8fc13181c0ad41ae2da208 /source4/auth
parentf9bb8fbe832409893b17f2113d7b35b9ffe91540 (diff)
parentd031472227b44d040698e6dff52dc79028fde854 (diff)
downloadsamba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.gz
samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.bz2
samba-4283ae489b6e227beba196e8a315a9727f03cc07.zip
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/gensec/gensec.h1
-rw-r--r--source4/auth/kerberos/krb5_init_context.c3
-rw-r--r--source4/auth/session.h3
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