git.ipfire.org Git - thirdparty/krb5.git/commit

]> git.ipfire.org Git - thirdparty/krb5.git/commit

projects / thirdparty / krb5.git / commit

author	Will Fiveash <will.fiveash@oracle.com>
	Wed, 28 Jan 2009 21:15:46 +0000 (21:15 +0000)
committer	Will Fiveash <will.fiveash@oracle.com>
	Wed, 28 Jan 2009 21:15:46 +0000 (21:15 +0000)
commit	d91a7ff0542f620a296e5718c1c5d33240efa67a
tree	a7c1efa10a6a7f928c47d274307d5eaceffec107	tree
parent	51049b194ad6d4c6ef088d9c277b59129888c1a9	commit \| diff

svn merge -r21791:21820 svn+ssh://wfiveash@svn.mit.edu/krb5/trunk

All conflicts resolved, everything builds. Did a quick test, seems to
work ok.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21822 dc483132-0cff-0310-8789-dd5450dbe970

120 files changed:

README		diff \| blob \| blame \| history
src/appl/gssftp/ftpd/ftpd.M		diff \| blob \| blame \| history
src/appl/gssftp/ftpd/ftpd.c		diff \| blob \| blame \| history
src/config-files/krb5.conf		diff \| blob \| blame \| history
src/config-files/krb5.conf.M		diff \| blob \| blame \| history
src/include/adm.h		diff \| blob \| blame \| history
src/include/adm_proto.h		diff \| blob \| blame \| history
src/include/k5-int.h		diff \| blob \| blame \| history
src/include/k5-platform.h		diff \| blob \| blame \| history
src/kadmin/dbutil/dump.c		diff \| blob \| blame \| history
src/kadmin/ktutil/ktutil.c		diff \| blob \| blame \| history
src/kadmin/server/schpw.c		diff \| blob \| blame \| history
src/kdc/do_tgs_req.c		diff \| blob \| blame \| history
src/kdc/extern.h		diff \| blob \| blame \| history
src/kdc/main.c		diff \| blob \| blame \| history
src/lib/crypto/arcfour/arcfour.c		diff \| blob \| blame \| history
src/lib/crypto/arcfour/arcfour_aead.c		diff \| blob \| blame \| history
src/lib/crypto/des/afsstring2key.c		diff \| blob \| blame \| history
src/lib/crypto/dk/checksum.c		diff \| blob \| blame \| history
src/lib/crypto/dk/dk_aead.c		diff \| blob \| blame \| history
src/lib/crypto/dk/dk_decrypt.c		diff \| blob \| blame \| history
src/lib/crypto/dk/dk_encrypt.c		diff \| blob \| blame \| history
src/lib/crypto/hash_provider/hash_crc32.c		diff \| blob \| blame \| history
src/lib/crypto/hash_provider/hash_sha1.c		diff \| blob \| blame \| history
src/lib/crypto/keyblocks.c		diff \| blob \| blame \| history
src/lib/crypto/keyed_checksum_types.c		diff \| blob \| blame \| history
src/lib/crypto/keyhash_provider/hmac_md5.c		diff \| blob \| blame \| history
src/lib/crypto/keyhash_provider/md5_hmac.c		diff \| blob \| blame \| history
src/lib/crypto/yarrow/yhash.h		diff \| blob \| blame \| history
src/lib/gssapi/generic/gssapiP_generic.h		diff \| blob \| blame \| history
src/lib/gssapi/krb5/k5seal.c		diff \| blob \| blame \| history
src/lib/gssapi/krb5/k5sealiov.c		diff \| blob \| blame \| history
src/lib/gssapi/krb5/k5sealv3iov.c		diff \| blob \| blame \| history
src/lib/gssapi/krb5/k5unseal.c		diff \| blob \| blame \| history
src/lib/gssapi/krb5/k5unsealiov.c		diff \| blob \| blame \| history
src/lib/gssapi/krb5/util_crypt.c		diff \| blob \| blame \| history
src/lib/gssapi/krb5/util_seqnum.c		diff \| blob \| blame \| history
src/lib/gssapi/mechglue/g_glue.c		diff \| blob \| blame \| history
src/lib/kadm5/admin.h		diff \| blob \| blame \| history
src/lib/kadm5/alt_prof.c		diff \| blob \| blame \| history
src/lib/kadm5/srv/libkadm5srv.exports		diff \| blob \| blame \| history
src/lib/kadm5/str_conv.c		diff \| blob \| blame \| history
src/lib/kdb/decrypt_key.c		diff \| blob \| blame \| history
src/lib/kdb/encrypt_key.c		diff \| blob \| blame \| history
src/lib/kdb/kdb5.c		diff \| blob \| blame \| history
src/lib/kdb/kdb_cpw.c		diff \| blob \| blame \| history
src/lib/kdb/kdb_default.c		diff \| blob \| blame \| history
src/lib/kdb/keytab.c		diff \| blob \| blame \| history
src/lib/krb5/asn.1/asn1_k_decode.c		diff \| blob \| blame \| history
src/lib/krb5/ccache/cc_file.c		diff \| blob \| blame \| history
src/lib/krb5/ccache/cc_keyring.c		diff \| blob \| blame \| history
src/lib/krb5/ccache/cc_memory.c		diff \| blob \| blame \| history
src/lib/krb5/ccache/cc_mslsa.c		diff \| blob \| blame \| history
src/lib/krb5/keytab/kt_file.c		diff \| blob \| blame \| history
src/lib/krb5/keytab/kt_memory.c		diff \| blob \| blame \| history
src/lib/krb5/keytab/kt_srvtab.c		diff \| blob \| blame \| history
src/lib/krb5/keytab/ktfr_entry.c		diff \| blob \| blame \| history
src/lib/krb5/krb/auth_con.c		diff \| blob \| blame \| history
src/lib/krb5/krb/bld_pr_ext.c		diff \| blob \| blame \| history
src/lib/krb5/krb/bld_princ.c		diff \| blob \| blame \| history
src/lib/krb5/krb/chpw.c		diff \| blob \| blame \| history
src/lib/krb5/krb/conv_princ.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_addrs.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_athctr.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_auth.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_cksum.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_creds.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_data.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_key.c		diff \| blob \| blame \| history
src/lib/krb5/krb/copy_tick.c		diff \| blob \| blame \| history
src/lib/krb5/krb/free_rtree.c		diff \| blob \| blame \| history
src/lib/krb5/krb/fwd_tgt.c		diff \| blob \| blame \| history
src/lib/krb5/krb/gc_via_tkt.c		diff \| blob \| blame \| history
src/lib/krb5/krb/gen_subkey.c		diff \| blob \| blame \| history
src/lib/krb5/krb/get_creds.c		diff \| blob \| blame \| history
src/lib/krb5/krb/get_in_tkt.c		diff \| blob \| blame \| history
src/lib/krb5/krb/gic_keytab.c		diff \| blob \| blame \| history
src/lib/krb5/krb/gic_pwd.c		diff \| blob \| blame \| history
src/lib/krb5/krb/kfree.c		diff \| blob \| blame \| history
src/lib/krb5/krb/mk_cred.c		diff \| blob \| blame \| history
src/lib/krb5/krb/mk_error.c		diff \| blob \| blame \| history
src/lib/krb5/krb/mk_priv.c		diff \| blob \| blame \| history
src/lib/krb5/krb/mk_rep.c		diff \| blob \| blame \| history
src/lib/krb5/krb/mk_req_ext.c		diff \| blob \| blame \| history
src/lib/krb5/krb/mk_safe.c		diff \| blob \| blame \| history
src/lib/krb5/krb/pac.c		diff \| blob \| blame \| history
src/lib/krb5/krb/parse.c		diff \| blob \| blame \| history
src/lib/krb5/krb/preauth.c		diff \| blob \| blame \| history
src/lib/krb5/krb/preauth2.c		diff \| blob \| blame \| history
src/lib/krb5/krb/rd_cred.c		diff \| blob \| blame \| history
src/lib/krb5/krb/rd_priv.c		diff \| blob \| blame \| history
src/lib/krb5/krb/rd_req_dec.c		diff \| blob \| blame \| history
src/lib/krb5/krb/rd_safe.c		diff \| blob \| blame \| history
src/lib/krb5/krb/recvauth.c		diff \| blob \| blame \| history
src/lib/krb5/krb/send_tgs.c		diff \| blob \| blame \| history
src/lib/krb5/krb/sendauth.c		diff \| blob \| blame \| history
src/lib/krb5/krb/ser_princ.c		diff \| blob \| blame \| history
src/lib/krb5/krb/serialize.c		diff \| blob \| blame \| history
src/lib/krb5/krb/set_realm.c		diff \| blob \| blame \| history
src/lib/krb5/krb/srv_rcache.c		diff \| blob \| blame \| history
src/lib/krb5/krb/t_ser.c		diff \| blob \| blame \| history
src/lib/krb5/krb/vfy_increds.c		diff \| blob \| blame \| history
src/lib/krb5/libkrb5.exports		diff \| blob \| blame \| history
src/lib/krb5/os/an_to_ln.c		diff \| blob \| blame \| history
src/lib/krb5/os/def_realm.c		diff \| blob \| blame \| history
src/lib/krb5/os/free_krbhs.c		diff \| blob \| blame \| history
src/lib/krb5/os/full_ipadr.c		diff \| blob \| blame \| history
src/lib/krb5/os/localaddr.c		diff \| blob \| blame \| history
src/lib/krb5/os/locate_kdc.c		diff \| blob \| blame \| history
src/lib/krb5/os/mk_faddr.c		diff \| blob \| blame \| history
src/lib/krb5/os/read_msg.c		diff \| blob \| blame \| history
src/lib/krb5/os/sn2princ.c		diff \| blob \| blame \| history
src/lib/krb5/rcache/rc_dfl.c		diff \| blob \| blame \| history
src/lib/rpc/unit-test/rpc_test.0/fullrun.exp		diff \| blob \| blame \| history
src/tests/asn.1/krb5_decode_test.c		diff \| blob \| blame \| history
src/tests/dejagnu/config/default.exp		diff \| blob \| blame \| history
src/tests/gss-threads/gss-misc.c		diff \| blob \| blame \| history
src/tests/resolve/resolve.c		diff \| blob \| blame \| history
src/util/profile/krb5.conf		diff \| blob \| blame \| history
src/util/trim-valgrind-logs	[new file with mode: 0755]	blob

Mirror of https://github.com/krb5/krb5.git

RSS Atom