svn rev #24398: branches/nss/ doc/ src/ src/clients/kinit/ src/clients/kpasswd/ ...

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24398
Commit By: ghudson
Log Message:
Merge r24242:24397 from trunk to branches/nss.  This will break the
nss branch build temporarily due to Camellia changes.



Changed Files:
U   branches/nss/NOTICE
U   branches/nss/doc/admin.texinfo
U   branches/nss/doc/krb5conf.texinfo
U   branches/nss/src/Makefile.in
U   branches/nss/src/clients/kinit/Makefile.in
U   branches/nss/src/clients/kinit/deps
A   branches/nss/src/clients/kinit/extern.h
U   branches/nss/src/clients/kinit/kinit.M
U   branches/nss/src/clients/kinit/kinit.c
A   branches/nss/src/clients/kinit/kinit_kdb.c
U   branches/nss/src/clients/kpasswd/kpasswd.c
U   branches/nss/src/clients/ksu/deps
U   branches/nss/src/clients/kvno/deps
U   branches/nss/src/config-files/krb5.conf.M
U   branches/nss/src/configure.in
U   branches/nss/src/gen-manpages/k5login.M
U   branches/nss/src/include/Makefile.in
U   branches/nss/src/include/gssrpc/auth.h
U   branches/nss/src/include/gssrpc/auth_unix.h
U   branches/nss/src/include/gssrpc/clnt.h
U   branches/nss/src/include/gssrpc/netdb.h
U   branches/nss/src/include/gssrpc/pmap_clnt.h
U   branches/nss/src/include/gssrpc/pmap_prot.h
U   branches/nss/src/include/gssrpc/pmap_rmt.h
U   branches/nss/src/include/gssrpc/rpc.h
U   branches/nss/src/include/gssrpc/rpc_msg.h
U   branches/nss/src/include/gssrpc/svc.h
U   branches/nss/src/include/gssrpc/svc_auth.h
U   branches/nss/src/include/gssrpc/types.hin
U   branches/nss/src/include/gssrpc/xdr.h
U   branches/nss/src/include/k5-buf.h
U   branches/nss/src/include/k5-int.h
U   branches/nss/src/include/kdb.h
A   branches/nss/src/include/krb5/kadm5_hook_plugin.h
U   branches/nss/src/include/krb5/krb5.hin
A   branches/nss/src/include/krb5/plugin.h
A   branches/nss/src/include/krb5/pwqual_plugin.h
U   branches/nss/src/include/net-server.h
U   branches/nss/src/kadmin/cli/deps
U   branches/nss/src/kadmin/dbutil/deps
U   branches/nss/src/kadmin/ktutil/deps
U   branches/nss/src/kadmin/server/deps
U   branches/nss/src/kadmin/server/ovsec_kadmd.c
U   branches/nss/src/kdc/Makefile.in
U   branches/nss/src/kdc/deps
U   branches/nss/src/kdc/do_as_req.c
U   branches/nss/src/kdc/do_tgs_req.c
U   branches/nss/src/kdc/kdc_authdata.c
U   branches/nss/src/kdc/kdc_preauth.c
U   branches/nss/src/kdc/kdc_util.c
U   branches/nss/src/kdc/krb5kdc.M
U   branches/nss/src/kdc/main.c
A   branches/nss/src/kdc/t_workers.py
U   branches/nss/src/lib/apputils/deps
U   branches/nss/src/lib/apputils/net-server.c
U   branches/nss/src/lib/crypto/Makefile.in
U   branches/nss/src/lib/crypto/builtin/Makefile.in
A   branches/nss/src/lib/crypto/builtin/camellia/
U   branches/nss/src/lib/crypto/builtin/deps
U   branches/nss/src/lib/crypto/builtin/des/d3_aead.c
U   branches/nss/src/lib/crypto/builtin/des/deps
U   branches/nss/src/lib/crypto/builtin/des/f_aead.c
U   branches/nss/src/lib/crypto/builtin/enc_provider/Makefile.in
U   branches/nss/src/lib/crypto/builtin/enc_provider/aes.c
A   branches/nss/src/lib/crypto/builtin/enc_provider/camellia_ctr.c
U   branches/nss/src/lib/crypto/builtin/enc_provider/deps
U   branches/nss/src/lib/crypto/builtin/enc_provider/enc_provider.h
U   branches/nss/src/lib/crypto/builtin/hash_provider/deps
U   branches/nss/src/lib/crypto/builtin/md4/deps
U   branches/nss/src/lib/crypto/builtin/md5/deps
U   branches/nss/src/lib/crypto/builtin/sha1/deps
U   branches/nss/src/lib/crypto/crypto_tests/Makefile.in
A   branches/nss/src/lib/crypto/crypto_tests/camellia-expect-vt.txt
A   branches/nss/src/lib/crypto/crypto_tests/camellia-test.c
U   branches/nss/src/lib/crypto/crypto_tests/deps
A   branches/nss/src/lib/crypto/crypto_tests/t_camellia_ccm.c
A   branches/nss/src/lib/crypto/crypto_tests/t_cmac.c
U   branches/nss/src/lib/crypto/crypto_tests/t_encrypt.c
U   branches/nss/src/lib/crypto/crypto_tests/t_prf.c
U   branches/nss/src/lib/crypto/crypto_tests/t_short.c
A   branches/nss/src/lib/crypto/crypto_tests/t_str2key.c
U   branches/nss/src/lib/crypto/crypto_tests/vectors.c
U   branches/nss/src/lib/crypto/krb/Makefile.in
U   branches/nss/src/lib/crypto/krb/aead.c
U   branches/nss/src/lib/crypto/krb/aead.h
U   branches/nss/src/lib/crypto/krb/arcfour/deps
U   branches/nss/src/lib/crypto/krb/checksum/Makefile.in
A   branches/nss/src/lib/crypto/krb/checksum/cmac.c
U   branches/nss/src/lib/crypto/krb/checksum/deps
U   branches/nss/src/lib/crypto/krb/cksumtypes.c
U   branches/nss/src/lib/crypto/krb/cksumtypes.h
U   branches/nss/src/lib/crypto/krb/combine_keys.c
U   branches/nss/src/lib/crypto/krb/crc32/deps
U   branches/nss/src/lib/crypto/krb/deps
U   branches/nss/src/lib/crypto/krb/dk/Makefile.in
D   branches/nss/src/lib/crypto/krb/dk/checksum.c
A   branches/nss/src/lib/crypto/krb/dk/checksum_cmac.c
A   branches/nss/src/lib/crypto/krb/dk/checksum_hmac.c
U   branches/nss/src/lib/crypto/krb/dk/deps
U   branches/nss/src/lib/crypto/krb/dk/derive.c
U   branches/nss/src/lib/crypto/krb/dk/dk.h
U   branches/nss/src/lib/crypto/krb/dk/dk_aead.c
A   branches/nss/src/lib/crypto/krb/dk/dk_ccm.c
U   branches/nss/src/lib/crypto/krb/dk/stringtokey.c
U   branches/nss/src/lib/crypto/krb/etypes.c
U   branches/nss/src/lib/crypto/krb/etypes.h
U   branches/nss/src/lib/crypto/krb/make_checksum_iov.c
U   branches/nss/src/lib/crypto/krb/old/deps
U   branches/nss/src/lib/crypto/krb/prf/Makefile.in
A   branches/nss/src/lib/crypto/krb/prf/cmac_prf.c
U   branches/nss/src/lib/crypto/krb/prf/deps
U   branches/nss/src/lib/crypto/krb/prf/dk_prf.c
U   branches/nss/src/lib/crypto/krb/prf/prf_int.h
U   branches/nss/src/lib/crypto/krb/rand2key/Makefile.in
A   branches/nss/src/lib/crypto/krb/rand2key/camellia_rand2key.c
U   branches/nss/src/lib/crypto/krb/rand2key/deps
U   branches/nss/src/lib/crypto/krb/rand2key/rand2key.h
U   branches/nss/src/lib/crypto/krb/raw/deps
U   branches/nss/src/lib/crypto/krb/state.c
U   branches/nss/src/lib/crypto/krb/verify_checksum_iov.c
U   branches/nss/src/lib/crypto/krb/yarrow/deps
U   branches/nss/src/lib/crypto/krb/yarrow/ycipher.c
U   branches/nss/src/lib/crypto/libk5crypto.exports
U   branches/nss/src/lib/crypto/openssl/Makefile.in
A   branches/nss/src/lib/crypto/openssl/camellia/
U   branches/nss/src/lib/crypto/openssl/enc_provider/Makefile.in
A   branches/nss/src/lib/crypto/openssl/enc_provider/camellia_ctr.c
U   branches/nss/src/lib/crypto/openssl/enc_provider/enc_provider.h
U   branches/nss/src/lib/gssapi/generic/gssapi_ext.h
U   branches/nss/src/lib/gssapi/krb5/accept_sec_context.c
U   branches/nss/src/lib/gssapi/krb5/acquire_cred.c
U   branches/nss/src/lib/gssapi/krb5/copy_ccache.c
U   branches/nss/src/lib/gssapi/krb5/deps
U   branches/nss/src/lib/gssapi/krb5/gssapiP_krb5.h
U   branches/nss/src/lib/gssapi/krb5/gssapi_krb5.c
U   branches/nss/src/lib/gssapi/krb5/gssapi_krb5.hin
U   branches/nss/src/lib/gssapi/krb5/iakerb.c
U   branches/nss/src/lib/gssapi/krb5/init_sec_context.c
U   branches/nss/src/lib/gssapi/krb5/krb5_gss_glue.c
U   branches/nss/src/lib/gssapi/krb5/rel_oid.c
U   branches/nss/src/lib/gssapi/krb5/set_allowable_enctypes.c
U   branches/nss/src/lib/gssapi/libgssapi_krb5.exports
U   branches/nss/src/lib/gssapi/mechglue/deps
U   branches/nss/src/lib/gssapi/mechglue/g_set_cred_option.c
U   branches/nss/src/lib/gssapi/mechglue/mglueP.h
U   branches/nss/src/lib/gssapi/spnego/deps
U   branches/nss/src/lib/gssapi/spnego/gssapiP_spnego.h
U   branches/nss/src/lib/gssapi/spnego/spnego_mech.c
U   branches/nss/src/lib/kadm5/clnt/deps
U   branches/nss/src/lib/kadm5/deps
U   branches/nss/src/lib/kadm5/kadm_err.et
U   branches/nss/src/lib/kadm5/server_internal.h
U   branches/nss/src/lib/kadm5/srv/Makefile.in
U   branches/nss/src/lib/kadm5/srv/deps
A   branches/nss/src/lib/kadm5/srv/kadm5_hook.c
U   branches/nss/src/lib/kadm5/srv/libkadm5srv_mit.exports
A   branches/nss/src/lib/kadm5/srv/pwqual.c
A   branches/nss/src/lib/kadm5/srv/pwqual_dict.c
A   branches/nss/src/lib/kadm5/srv/pwqual_empty.c
A   branches/nss/src/lib/kadm5/srv/pwqual_hesiod.c
A   branches/nss/src/lib/kadm5/srv/pwqual_princ.c
D   branches/nss/src/lib/kadm5/srv/server_dict.c
U   branches/nss/src/lib/kadm5/srv/server_init.c
U   branches/nss/src/lib/kadm5/srv/server_misc.c
U   branches/nss/src/lib/kadm5/srv/svr_principal.c
U   branches/nss/src/lib/kadm5/unit-test/deps
U   branches/nss/src/lib/kdb/decrypt_key.c
U   branches/nss/src/lib/kdb/deps
U   branches/nss/src/lib/kdb/encrypt_key.c
U   branches/nss/src/lib/kdb/kdb5.c
U   branches/nss/src/lib/kdb/kdb5.h
U   branches/nss/src/lib/kdb/kdb_default.c
U   branches/nss/src/lib/kdb/keytab.c
U   branches/nss/src/lib/kdb/libkdb5.exports
U   branches/nss/src/lib/krb5/asn.1/deps
U   branches/nss/src/lib/krb5/ccache/deps
U   branches/nss/src/lib/krb5/deps
U   branches/nss/src/lib/krb5/error_tables/Makefile.in
U   branches/nss/src/lib/krb5/error_tables/deps
U   branches/nss/src/lib/krb5/error_tables/init_ets.c
A   branches/nss/src/lib/krb5/error_tables/k5e1_err.et
U   branches/nss/src/lib/krb5/keytab/deps
U   branches/nss/src/lib/krb5/krb/Makefile.in
U   branches/nss/src/lib/krb5/krb/deps
U   branches/nss/src/lib/krb5/krb/gic_opt.c
U   branches/nss/src/lib/krb5/krb/init_ctx.c
A   branches/nss/src/lib/krb5/krb/plugin.c
U   branches/nss/src/lib/krb5/krb/rd_req_dec.c
U   branches/nss/src/lib/krb5/krb/t_etypes.c
U   branches/nss/src/lib/krb5/krb5_libinit.c
U   branches/nss/src/lib/krb5/libkrb5.exports
U   branches/nss/src/lib/krb5/os/deps
U   branches/nss/src/lib/krb5/os/sn2princ.c
U   branches/nss/src/lib/krb5/rcache/deps
U   branches/nss/src/lib/krb5/unicode/deps
U   branches/nss/src/lib/rpc/auth_none.c
U   branches/nss/src/lib/rpc/auth_unix.c
U   branches/nss/src/lib/rpc/authunix_prot.c
U   branches/nss/src/lib/rpc/bindresvport.c
U   branches/nss/src/lib/rpc/clnt_generic.c
U   branches/nss/src/lib/rpc/clnt_perror.c
U   branches/nss/src/lib/rpc/clnt_raw.c
U   branches/nss/src/lib/rpc/clnt_simple.c
U   branches/nss/src/lib/rpc/clnt_tcp.c
U   branches/nss/src/lib/rpc/clnt_udp.c
U   branches/nss/src/lib/rpc/get_myaddress.c
U   branches/nss/src/lib/rpc/getrpcent.c
U   branches/nss/src/lib/rpc/getrpcport.c
U   branches/nss/src/lib/rpc/pmap_clnt.c
U   branches/nss/src/lib/rpc/pmap_getmaps.c
U   branches/nss/src/lib/rpc/pmap_getport.c
U   branches/nss/src/lib/rpc/pmap_prot.c
U   branches/nss/src/lib/rpc/pmap_prot2.c
U   branches/nss/src/lib/rpc/pmap_rmt.c
U   branches/nss/src/lib/rpc/rpc_callmsg.c
U   branches/nss/src/lib/rpc/rpc_commondata.c
U   branches/nss/src/lib/rpc/rpc_dtablesize.c
U   branches/nss/src/lib/rpc/rpc_prot.c
U   branches/nss/src/lib/rpc/svc.c
U   branches/nss/src/lib/rpc/svc_auth.c
U   branches/nss/src/lib/rpc/svc_auth_unix.c
U   branches/nss/src/lib/rpc/svc_raw.c
U   branches/nss/src/lib/rpc/svc_run.c
U   branches/nss/src/lib/rpc/svc_simple.c
U   branches/nss/src/lib/rpc/svc_tcp.c
U   branches/nss/src/lib/rpc/svc_udp.c
U   branches/nss/src/lib/rpc/xdr.c
U   branches/nss/src/lib/rpc/xdr_alloc.c
U   branches/nss/src/lib/rpc/xdr_array.c
U   branches/nss/src/lib/rpc/xdr_float.c
U   branches/nss/src/lib/rpc/xdr_mem.c
U   branches/nss/src/lib/rpc/xdr_rec.c
U   branches/nss/src/lib/rpc/xdr_reference.c
U   branches/nss/src/lib/rpc/xdr_sizeof.c
U   branches/nss/src/lib/rpc/xdr_stdio.c
A   branches/nss/src/plugins/kadm5_hook/
U   branches/nss/src/plugins/kdb/db2/db2_exp.c
U   branches/nss/src/plugins/kdb/db2/deps
U   branches/nss/src/plugins/kdb/db2/kdb_db2.c
U   branches/nss/src/plugins/kdb/db2/kdb_db2.h
U   branches/nss/src/plugins/kdb/ldap/deps
U   branches/nss/src/plugins/kdb/ldap/ldap_exp.c
U   branches/nss/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.c
U   branches/nss/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
U   branches/nss/src/plugins/kdb/ldap/libkdb_ldap/deps
U   branches/nss/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
D   branches/nss/src/plugins/kdb/ldap/libkdb_ldap/ldap_fetch_mkey.c
U   branches/nss/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
U   branches/nss/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.h
U   branches/nss/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
U   branches/nss/src/plugins/preauth/encrypted_challenge/deps
U   branches/nss/src/plugins/preauth/pkinit/deps
U   branches/nss/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
U   branches/nss/src/slave/deps
U   branches/nss/src/tests/Makefile.in
U   branches/nss/src/tests/asn.1/deps
U   branches/nss/src/tests/create/deps
U   branches/nss/src/tests/dejagnu/config/default.exp
U   branches/nss/src/tests/dejagnu/krb-standalone/kadmin.exp
U   branches/nss/src/tests/gssapi/t_gssexts.c
U   branches/nss/src/tests/hammer/deps
U   branches/nss/src/tests/misc/deps
U   branches/nss/src/tests/t_general.py
A   branches/nss/src/tests/t_kadm5_hook.py
A   branches/nss/src/tests/t_lockout.py
U   branches/nss/src/tests/verify/deps
U   branches/nss/src/tests/verify/kdb5_verify.c
U   branches/nss/src/util/collected-client-lib/Makefile.in
U   branches/nss/src/util/k5test.py
_U  branches/nss/src/util/profile/
U   branches/nss/src/util/profile/prof_err.et
U   branches/nss/src/util/profile/prof_init.c
U   branches/nss/src/util/profile/prof_parse.c
U   branches/nss/src/util/profile/prof_test1
U   branches/nss/src/util/ss/deps
U   branches/nss/src/windows/identity/plugins/krb5/datarep.c
U   branches/nss/src/windows/identity/plugins/krb5/lang/en_us/langres.rc
Diff larger than 5000 lines; suppressing.