Module Name: src
Committed By: pettai
Date: Thu Apr 24 13:45:35 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/admin: ktutil.8
src/crypto/external/bsd/heimdal/dist/base: baselocl.h
src/crypto/external/bsd/heimdal/dist/kadmin: get.c kadmin.8 kadmind.8
util.c
src/crypto/external/bsd/heimdal/dist/kcm: kcm.8
src/crypto/external/bsd/heimdal/dist/kdc: hprop.8 hpropd.8 kdc.8
kerberos5.c kstash.8 string2key.8
src/crypto/external/bsd/heimdal/dist/kpasswd: kpasswdd.8 kpasswdd.c
src/crypto/external/bsd/heimdal/dist/kuser: copy_cred_cache.1
kdestroy.1 kgetcred.1 kimpersonate.8 kinit.1 klist.1 klist.c
src/crypto/external/bsd/heimdal/dist/lib/asn1: gen.c
src/crypto/external/bsd/heimdal/dist/lib/com_err: com_err.3
compile_et.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi: gss_acquire_cred.3
gssapi.3
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5:
init_sec_context.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech: mech.5
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: engine.c
src/crypto/external/bsd/heimdal/dist/lib/hdb: hdb.c
src/crypto/external/bsd/heimdal/dist/lib/hx509: cert.c revoke.c sel.h
src/crypto/external/bsd/heimdal/dist/lib/kadm5: ad.c iprop-log.8
iprop.8
src/crypto/external/bsd/heimdal/dist/lib/krb5: auth_context.c context.c
crypto-des3.c krb5.conf.5 krb524_convert_creds_kdc.3
krb5_c_make_checksum.3 krb5_get_in_cred.3 krb5_init_context.3
krb5_is_thread_safe.3 krb5_principal.3 krb5_string_to_key.3 salt.c
test_pknistkdf.c version-script.map
src/crypto/external/bsd/heimdal/dist/lib/roken: get_window_size.c
getarg.c resolve.c roken.h.in rtbl.3
src/crypto/external/bsd/heimdal/dist/lib/vers: print_version.c
Log Message:
Import latest heimdal-1-5-branch, merge conflicts
Ok'ed and reviewed by elric@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/admin/ktutil.8
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/base/baselocl.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kadmin/get.c \
src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 \
src/crypto/external/bsd/heimdal/dist/kadmin/util.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kcm/kcm.8
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/hprop.8 \
src/crypto/external/bsd/heimdal/dist/kdc/kdc.8
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/hpropd.8 \
src/crypto/external/bsd/heimdal/dist/kdc/kstash.8 \
src/crypto/external/bsd/heimdal/dist/kdc/string2key.8
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.8 \
src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1 \
src/crypto/external/bsd/heimdal/dist/kuser/kgetcred.1 \
src/crypto/external/bsd/heimdal/dist/kuser/kinit.1 \
src/crypto/external/bsd/heimdal/dist/kuser/klist.1 \
src/crypto/external/bsd/heimdal/dist/kuser/klist.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1 \
src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 \
src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/mech.5
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/hdb/hdb.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/revoke.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_in_cred.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_init_context.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/salt.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/get_window_size.c \
src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c \
src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in \
src/crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/vers/print_version.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
