diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-08-01 11:17:48 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-08-01 16:11:00 +0200 |
| commit | 35cd60b00216d43fc30fdbf25fe0463c886d1236 (patch) | |
| tree | fbc3679e5c654f484db4a7285c6f151b72ae213a /source4 | |
| parent | a925f039ee382df0f3be434108416bab0d17e8c0 (diff) | |
| download | samba-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')
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.c | 3 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.h | 1 | ||||
| -rw-r--r-- | source4/heimdal_build/internal.mk | 10 |
3 files changed, 12 insertions, 2 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); diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index 17fc8c93ec..264a5c2f1c 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -121,6 +121,7 @@ HEIMDAL_GSSAPI_OBJ_FILES = \ $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_context.o \ $(heimdalsrcdir)/lib/gssapi/mech/gss_release_name.o \ $(heimdalsrcdir)/lib/gssapi/mech/gss_set_cred_option.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_pseudo_random.o \ $(heimdalsrcdir)/lib/gssapi/asn1_GSSAPIContextToken.o \ $(heimdalsrcdir)/lib/gssapi/spnego/init_sec_context.o \ $(heimdalsrcdir)/lib/gssapi/spnego/external.o \ @@ -380,8 +381,12 @@ HEIMDAL_HX509_OBJ_FILES = \ $(heimdalsrcdir)/lib/hx509/print.o \ $(heimdalsrcdir)/lib/hx509/req.o \ $(heimdalsrcdir)/lib/hx509/revoke.o \ + $(heimdalsrcdir)/lib/hx509/sel.o \ + $(heimdalsrcdir)/lib/hx509/sel-lex.o \ + $(heimdalsrcdir)/lib/hx509/sel-gram.o \ $(heimdalsrcdir)/lib/hx509/hx509_err.o + ####################### # Start SUBSYSTEM HEIMDAL_WIND [SUBSYSTEM::HEIMDAL_WIND] @@ -463,6 +468,8 @@ HEIMDAL_ROKEN_OBJ_FILES = \ $(heimdalsrcdir)/lib/roken/simple_exec.o \ $(heimdalsrcdir)/lib/roken/strcollect.o \ $(heimdalsrcdir)/lib/roken/rtbl.o \ + $(heimdalsrcdir)/lib/roken/cloexec.o \ + $(heimdalsrcdir)/lib/roken/xfree.o \ $(heimdalbuildsrcdir)/replace.o ####################### @@ -621,4 +628,5 @@ samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \ $(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken dist:: $(heimdalsrcdir)/lib/asn1/lex.c $(heimdalsrcdir)/lib/com_err/lex.c \ - $(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c + $(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c \ + $(heimdalsrcdir)/lib/hx509/sel-lex.c $(heimdalsrcdir)/lib/hx509/sel-gram.c |