Author: abartlet Date: 2008-07-28 06:20:35 +0000 (Mon, 28 Jul 2008) New Revision: 799
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=799 Log: Merged with upstream Heimdal -r 23473. Dropped gss_wrap_ex patch (will maintain this with metze in GIT, then commit it here when finished). Andrew Bartlett Added: trunk/heimdal/cf/symbol-version.py trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-gss-cb-hash-agility-04.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-kerberos-referrals-11.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-otp-preauth-05.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-preauth-framework-08.txt trunk/heimdal/lib/krb5/send_to_kdc_plugin.h trunk/heimdal/lib/roken/cloexec.c trunk/heimdal/lib/roken/xfree.c Removed: trunk/heimdal/lib/gssapi/mech/gss_unwrap_ex.c trunk/heimdal/lib/gssapi/mech/gss_wrap_ex.c trunk/heimdal/lib/krb5/keytab_krb4.c Modified: trunk/heimdal/ChangeLog trunk/heimdal/admin/change.c trunk/heimdal/admin/get.c trunk/heimdal/appl/su/ChangeLog trunk/heimdal/appl/su/Makefile.am trunk/heimdal/appl/su/su.c trunk/heimdal/appl/telnet/libtelnet/encrypt.c trunk/heimdal/appl/telnet/libtelnet/genget.c trunk/heimdal/cf/ChangeLog trunk/heimdal/cf/krb-ipv6.m4 trunk/heimdal/cf/krb-readline.m4 trunk/heimdal/cf/version-script.m4 trunk/heimdal/doc/ack.texi trunk/heimdal/kadmin/ank.c trunk/heimdal/kdc/default_config.c trunk/heimdal/kdc/digest.c trunk/heimdal/kdc/kerberos5.c trunk/heimdal/kdc/krb5tgs.c trunk/heimdal/kdc/kx509.c trunk/heimdal/kdc/misc.c trunk/heimdal/kdc/pkinit.c trunk/heimdal/kdc/process.c trunk/heimdal/kdc/set_dbinfo.c trunk/heimdal/kdc/windc.c trunk/heimdal/kpasswd/kpasswd-generator.c trunk/heimdal/kpasswd/kpasswdd.c trunk/heimdal/kuser/kinit.c trunk/heimdal/lib/Makefile.am trunk/heimdal/lib/gssapi/ChangeLog trunk/heimdal/lib/gssapi/Makefile.am trunk/heimdal/lib/gssapi/gssapi/gssapi.h trunk/heimdal/lib/gssapi/gssapi/gssapi_krb5.h trunk/heimdal/lib/gssapi/gssapi_mech.h trunk/heimdal/lib/gssapi/krb5/accept_sec_context.c trunk/heimdal/lib/gssapi/krb5/delete_sec_context.c trunk/heimdal/lib/gssapi/krb5/display_status.c trunk/heimdal/lib/gssapi/krb5/external.c trunk/heimdal/lib/gssapi/krb5/gsskrb5_locl.h trunk/heimdal/lib/gssapi/krb5/init_sec_context.c trunk/heimdal/lib/gssapi/krb5/set_cred_option.c trunk/heimdal/lib/gssapi/krb5/set_sec_context_option.c trunk/heimdal/lib/gssapi/krb5/wrap.c trunk/heimdal/lib/gssapi/mech/gss_krb5.c trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c trunk/heimdal/lib/gssapi/ntlm/crypto.c trunk/heimdal/lib/gssapi/ntlm/external.c trunk/heimdal/lib/gssapi/ntlm/init_sec_context.c trunk/heimdal/lib/gssapi/test_context.c trunk/heimdal/lib/hcrypto/ChangeLog trunk/heimdal/lib/hcrypto/rand-egd.c trunk/heimdal/lib/hcrypto/rand-fortuna.c trunk/heimdal/lib/hcrypto/rand-unix.c trunk/heimdal/lib/hcrypto/rand.c trunk/heimdal/lib/hcrypto/test_rsa.c trunk/heimdal/lib/hcrypto/ui.c trunk/heimdal/lib/hdb/Makefile.am trunk/heimdal/lib/hdb/common.c trunk/heimdal/lib/hdb/db.c trunk/heimdal/lib/hdb/db3.c trunk/heimdal/lib/hdb/dbinfo.c trunk/heimdal/lib/hdb/ext.c trunk/heimdal/lib/hdb/hdb-ldap.c trunk/heimdal/lib/hdb/hdb.c trunk/heimdal/lib/hdb/keys.c trunk/heimdal/lib/hdb/keytab.c trunk/heimdal/lib/hdb/mkey.c trunk/heimdal/lib/hdb/ndbm.c trunk/heimdal/lib/hdb/print.c trunk/heimdal/lib/hdb/version-script.map trunk/heimdal/lib/hx509/ChangeLog trunk/heimdal/lib/hx509/Makefile.am trunk/heimdal/lib/hx509/cert.c trunk/heimdal/lib/hx509/cms.c trunk/heimdal/lib/hx509/file.c trunk/heimdal/lib/hx509/hxtool-commands.in trunk/heimdal/lib/hx509/hxtool.c trunk/heimdal/lib/hx509/ks_dir.c trunk/heimdal/lib/hx509/ks_file.c trunk/heimdal/lib/hx509/ks_p12.c trunk/heimdal/lib/hx509/req.c trunk/heimdal/lib/hx509/revoke.c trunk/heimdal/lib/hx509/softp11.c trunk/heimdal/lib/hx509/version-script.map trunk/heimdal/lib/kadm5/ad.c trunk/heimdal/lib/kadm5/chpass_s.c trunk/heimdal/lib/kadm5/init_c.c trunk/heimdal/lib/kadm5/ipropd_slave.c trunk/heimdal/lib/kadm5/log.c trunk/heimdal/lib/kadm5/password_quality.c trunk/heimdal/lib/kafs/ChangeLog trunk/heimdal/lib/kafs/common.c trunk/heimdal/lib/krb5/Makefile.am trunk/heimdal/lib/krb5/acache.c trunk/heimdal/lib/krb5/acl.c trunk/heimdal/lib/krb5/addr_families.c trunk/heimdal/lib/krb5/auth_context.c trunk/heimdal/lib/krb5/build_auth.c trunk/heimdal/lib/krb5/cache.c trunk/heimdal/lib/krb5/changepw.c trunk/heimdal/lib/krb5/config_file.c trunk/heimdal/lib/krb5/context.c trunk/heimdal/lib/krb5/convert_creds.c trunk/heimdal/lib/krb5/copy_host_realm.c trunk/heimdal/lib/krb5/creds.c trunk/heimdal/lib/krb5/crypto.c trunk/heimdal/lib/krb5/data.c trunk/heimdal/lib/krb5/digest.c trunk/heimdal/lib/krb5/error_string.c trunk/heimdal/lib/krb5/expand_hostname.c trunk/heimdal/lib/krb5/fcache.c trunk/heimdal/lib/krb5/generate_subkey.c trunk/heimdal/lib/krb5/get_addrs.c trunk/heimdal/lib/krb5/get_cred.c trunk/heimdal/lib/krb5/get_default_principal.c trunk/heimdal/lib/krb5/get_default_realm.c trunk/heimdal/lib/krb5/get_for_creds.c trunk/heimdal/lib/krb5/get_host_realm.c trunk/heimdal/lib/krb5/get_in_tkt.c trunk/heimdal/lib/krb5/get_in_tkt_pw.c trunk/heimdal/lib/krb5/init_creds.c trunk/heimdal/lib/krb5/init_creds_pw.c trunk/heimdal/lib/krb5/kcm.c trunk/heimdal/lib/krb5/keyblock.c trunk/heimdal/lib/krb5/keytab.c trunk/heimdal/lib/krb5/keytab_any.c trunk/heimdal/lib/krb5/keytab_file.c trunk/heimdal/lib/krb5/keytab_keyfile.c trunk/heimdal/lib/krb5/keytab_memory.c trunk/heimdal/lib/krb5/krb5.h trunk/heimdal/lib/krb5/krb5_address.3 trunk/heimdal/lib/krb5/krb5_ccache.3 trunk/heimdal/lib/krb5/krb5_err.et trunk/heimdal/lib/krb5/krb5_locl.h trunk/heimdal/lib/krb5/krbhst-test.c trunk/heimdal/lib/krb5/krbhst.c trunk/heimdal/lib/krb5/kuserok.c trunk/heimdal/lib/krb5/locate_plugin.h trunk/heimdal/lib/krb5/log.c trunk/heimdal/lib/krb5/mcache.c trunk/heimdal/lib/krb5/mk_priv.c trunk/heimdal/lib/krb5/mk_rep.c trunk/heimdal/lib/krb5/pac.c trunk/heimdal/lib/krb5/padata.c trunk/heimdal/lib/krb5/pkinit.c trunk/heimdal/lib/krb5/plugin.c trunk/heimdal/lib/krb5/principal.c trunk/heimdal/lib/krb5/rd_cred.c trunk/heimdal/lib/krb5/rd_error.c trunk/heimdal/lib/krb5/rd_rep.c trunk/heimdal/lib/krb5/rd_req.c trunk/heimdal/lib/krb5/rd_safe.c trunk/heimdal/lib/krb5/recvauth.c trunk/heimdal/lib/krb5/replay.c trunk/heimdal/lib/krb5/scache.c trunk/heimdal/lib/krb5/send_to_kdc.c trunk/heimdal/lib/krb5/sendauth.c trunk/heimdal/lib/krb5/set_default_realm.c trunk/heimdal/lib/krb5/sock_principal.c trunk/heimdal/lib/krb5/test_cc.c trunk/heimdal/lib/krb5/test_keytab.c trunk/heimdal/lib/krb5/ticket.c trunk/heimdal/lib/krb5/time.c trunk/heimdal/lib/krb5/transited.c trunk/heimdal/lib/krb5/v4_glue.c trunk/heimdal/lib/krb5/verify_init.c trunk/heimdal/lib/krb5/verify_user.c trunk/heimdal/lib/krb5/version-script.map trunk/heimdal/lib/krb5/write_message.c trunk/heimdal/lib/ntlm/ChangeLog trunk/heimdal/lib/roken/ChangeLog trunk/heimdal/lib/roken/Makefile.am trunk/heimdal/lib/roken/dumpdata.c trunk/heimdal/lib/roken/mini_inetd.c trunk/heimdal/lib/roken/rkpty.c trunk/heimdal/lib/roken/roken-common.h trunk/heimdal/lib/wind/ChangeLog trunk/heimdal/lib/wind/Makefile.am trunk/heimdal/lib/wind/gen-bidi.py trunk/heimdal/lib/wind/gen-combining.py trunk/heimdal/lib/wind/gen-normalize.py trunk/heimdal/lib/wind/gen-punycode-examples.py trunk/heimdal/tests/gss/check-context.in trunk/heimdal/tests/gss/check-spnego.in Changeset: Sorry, the patch is too large (24100 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=799