summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-01 11:17:48 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-01 16:11:00 +0200
commit35cd60b00216d43fc30fdbf25fe0463c886d1236 (patch)
treefbc3679e5c654f484db4a7285c6f151b72ae213a /source4/auth
parenta925f039ee382df0f3be434108416bab0d17e8c0 (diff)
downloadsamba-35cd60b00216d43fc30fdbf25fe0463c886d1236.tar.gz
samba-35cd60b00216d43fc30fdbf25fe0463c886d1236.tar.bz2
samba-35cd60b00216d43fc30fdbf25fe0463c886d1236.zip
build with the new heimdal version
(This used to be commit 3817d653faecb70bfafb850fe7d6e83aaed7e6d1)
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/kerberos/krb5_init_context.c3
-rw-r--r--source4/auth/kerberos/krb5_init_context.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index a455fda398..02d8cd0b4e 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -208,6 +208,7 @@ static void smb_krb5_socket_handler(struct event_context *ev, struct fd_event *f
krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
void *data,
krb5_krbhst_info *hi,
+ time_t timeout,
const krb5_data *send_buf,
krb5_data *recv_buf)
{
@@ -298,7 +299,7 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
socket_set_flags(smb_krb5->sock, SOCKET_FLAG_NOCLOSE);
event_add_timed(ev, smb_krb5,
- timeval_current_ofs(context->kdc_timeout, 0),
+ timeval_current_ofs(timeout, 0),
smb_krb5_request_timeout, smb_krb5);
diff --git a/source4/auth/kerberos/krb5_init_context.h b/source4/auth/kerberos/krb5_init_context.h
index 44771f2aec..815e9a639d 100644
--- a/source4/auth/kerberos/krb5_init_context.h
+++ b/source4/auth/kerberos/krb5_init_context.h
@@ -32,5 +32,6 @@ void smb_krb5_free_context(struct smb_krb5_context *smb_krb5_context);
krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
void *data,
krb5_krbhst_info *hi,
+ time_t timeout,
const krb5_data *send_buf,
krb5_data *recv_buf);