svn commit: samba r19633 - in branches/SAMBA_4_0/source: auth/gensec auth/kerberos heimdal/kdc heimdal/lib/gssapi/gssapi heimdal/lib/gssapi/krb5 heimdal/lib/gssapi/mech heimdal/lib/gssapi/spnego heimdal/lib/krb5 script

[abartlet at samba.org]

Author: abartlet
Date: 2006-11-08 01:48:35 +0000 (Wed, 08 Nov 2006)
New Revision: 19633

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19633

Log:
Merge to lorikeet-heimdal, removing krb5_rd_req_return_keyblock in favour of a more tasteful replacement.

Remove kerberos_verify.c, as we don't need that code any more.
Replace with code for using the new krb5_rd_req_ctx() borrowed from
Heimdal's accecpt_sec_context.c

Andrew Bartlett

Added:
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_heimdal.c
Removed:
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_verify.c
Modified:
   branches/SAMBA_4_0/source/auth/gensec/gensec_gssapi.c
   branches/SAMBA_4_0/source/auth/gensec/gensec_krb5.c
   branches/SAMBA_4_0/source/auth/kerberos/config.mk
   branches/SAMBA_4_0/source/heimdal/kdc/kerberos5.c
   branches/SAMBA_4_0/source/heimdal/kdc/pkinit.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/accept_sec_context.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/arcfour.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/external.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/gsskrb5_locl.h
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/init_sec_context.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/set_sec_context_option.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/krb5/wrap.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/mech/gss_krb5.c
   branches/SAMBA_4_0/source/heimdal/lib/gssapi/spnego/spnego_locl.h
   branches/SAMBA_4_0/source/heimdal/lib/krb5/context.c
   branches/SAMBA_4_0/source/heimdal/lib/krb5/expand_hostname.c
   branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5-private.h
   branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5-protos.h
   branches/SAMBA_4_0/source/heimdal/lib/krb5/krb5.h
   branches/SAMBA_4_0/source/heimdal/lib/krb5/rd_req.c
   branches/SAMBA_4_0/source/script/mkproto.pl


Changeset:
Sorry, the patch is too large (1720 lines) to include; please use WebSVN to see it!
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19633