Module Name:	src
Committed By:	lha
Date:		Fri Apr  2 14:59:48 UTC 2004

Modified Files:
	src/crypto/dist/heimdal: configure.in
	src/crypto/dist/heimdal/appl/ftp/ftp: ftp.1 main.c
	src/crypto/dist/heimdal/appl/ftp/ftpd: ftpd.8 ftpd.c
	src/crypto/dist/heimdal/appl/kx: krb4.c
	src/crypto/dist/heimdal/appl/telnet/telnet: main.c
	src/crypto/dist/heimdal/appl/telnet/telnetd: telnetd.c
	src/crypto/dist/heimdal/cf: aix.m4 broken-getnameinfo.m4
	    broken-realloc.m4 krb-readline.m4 retsigtype.m4 roken-frag.m4
	    roken.m4
	src/crypto/dist/heimdal/doc: setup.texi
	src/crypto/dist/heimdal/kdc: config.c connect.c kaserver.c kdc.8
	    kdc_locl.h kerberos4.c kerberos5.c
	src/crypto/dist/heimdal/kuser: kinit.c klist.c
	src/crypto/dist/heimdal/lib/asn1: gen_free.c gen_length.c
	src/crypto/dist/heimdal/lib/gssapi: 8003.c accept_sec_context.c
	    acquire_cred.c context_time.c get_mic.c gssapi_locl.h
	    init_sec_context.c release_cred.c unwrap.c verify_mic.c wrap.c
	src/crypto/dist/heimdal/lib/hdb: db3.c
	src/crypto/dist/heimdal/lib/kadm5: init_c.c truncate_log.c
	src/crypto/dist/heimdal/lib/krb5: crypto.c eai_to_heim_errno.c
	    get_cred.c get_in_tkt.c krb5-protos.h krb5.conf.5 krb5.h mcache.c
	    principal.c
	src/crypto/dist/heimdal/lib/roken: roken-common.h
	src/crypto/dist/heimdal/lib/vers: print_version.c
	src/include/heimdal: config.h version.h
	src/lib/libgssapi: Makefile
Removed Files:
	src/crypto/dist/heimdal: Makefile.in acinclude.m4
	    heimdal-0.6-import-log
	src/crypto/dist/heimdal/admin: Makefile.in
	src/crypto/dist/heimdal/appl: Makefile.in
	src/crypto/dist/heimdal/appl/afsutil: Makefile.in
	src/crypto/dist/heimdal/appl/dceutils: Makefile.in
	src/crypto/dist/heimdal/appl/ftp: Makefile.in
	src/crypto/dist/heimdal/appl/ftp/common: Makefile.in
	src/crypto/dist/heimdal/appl/ftp/ftp: Makefile.in
	src/crypto/dist/heimdal/appl/ftp/ftpd: Makefile.in
	src/crypto/dist/heimdal/appl/kf: Makefile.in
	src/crypto/dist/heimdal/appl/kx: Makefile.in
	src/crypto/dist/heimdal/appl/login: Makefile.in
	src/crypto/dist/heimdal/appl/otp: Makefile.in
	src/crypto/dist/heimdal/appl/popper: Makefile.in
	src/crypto/dist/heimdal/appl/push: Makefile.in
	src/crypto/dist/heimdal/appl/rcp: Makefile.in
	src/crypto/dist/heimdal/appl/rsh: Makefile.in
	src/crypto/dist/heimdal/appl/su: Makefile.in
	src/crypto/dist/heimdal/appl/telnet: Makefile.in
	src/crypto/dist/heimdal/appl/telnet/libtelnet: Makefile.in
	src/crypto/dist/heimdal/appl/telnet/telnet: Makefile.in
	src/crypto/dist/heimdal/appl/telnet/telnetd: Makefile.in
	src/crypto/dist/heimdal/appl/test: Makefile.in
	src/crypto/dist/heimdal/appl/xnlock: Makefile.in
	src/crypto/dist/heimdal/doc: Makefile.in
	src/crypto/dist/heimdal/include: Makefile.in
	src/crypto/dist/heimdal/include/kadm5: Makefile.in
	src/crypto/dist/heimdal/kadmin: Makefile.in
	src/crypto/dist/heimdal/kdc: Makefile.in
	src/crypto/dist/heimdal/kpasswd: Makefile.in
	src/crypto/dist/heimdal/kuser: Makefile.in
	src/crypto/dist/heimdal/lib: Makefile.in
	src/crypto/dist/heimdal/lib/45: Makefile.in
	src/crypto/dist/heimdal/lib/asn1: Makefile.in
	src/crypto/dist/heimdal/lib/auth: Makefile.in
	src/crypto/dist/heimdal/lib/auth/afskauthlib: Makefile.in
	src/crypto/dist/heimdal/lib/auth/pam: Makefile.in
	src/crypto/dist/heimdal/lib/auth/sia: Makefile.in
	src/crypto/dist/heimdal/lib/com_err: Makefile.in
	src/crypto/dist/heimdal/lib/des: Makefile.in
	src/crypto/dist/heimdal/lib/editline: Makefile.in
	src/crypto/dist/heimdal/lib/gssapi: Makefile.in
	src/crypto/dist/heimdal/lib/hdb: Makefile.in
	src/crypto/dist/heimdal/lib/kadm5: Makefile.in
	src/crypto/dist/heimdal/lib/kafs: Makefile.in
	src/crypto/dist/heimdal/lib/kdfs: Makefile.in
	src/crypto/dist/heimdal/lib/krb5: Makefile.in
	src/crypto/dist/heimdal/lib/otp: Makefile.in
	src/crypto/dist/heimdal/lib/roken: Makefile.in
	src/crypto/dist/heimdal/lib/sl: Makefile.in
	src/crypto/dist/heimdal/lib/vers: Makefile.in
	src/crypto/dist/heimdal/tools: Makefile.in

Log Message:
Merge changes between heimdal-0.6 and heimdal-0.6.1


To generate a diff of this commit:
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/Makefile.in
cvs rdiff -r1.1.1.3 -r0 src/crypto/dist/heimdal/acinclude.m4
cvs rdiff -r1.3 -r1.4 src/crypto/dist/heimdal/configure.in
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/heimdal/heimdal-0.6-import-log
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/admin/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/afsutil/Makefile.in
cvs rdiff -r1.7 -r0 src/crypto/dist/heimdal/appl/dceutils/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/ftp/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/ftp/common/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/ftp/ftp/Makefile.in
cvs rdiff -r1.3 -r1.4 src/crypto/dist/heimdal/appl/ftp/ftp/ftp.1
cvs rdiff -r1.2 -r1.3 src/crypto/dist/heimdal/appl/ftp/ftp/main.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/ftp/ftpd/Makefile.in
cvs rdiff -r1.4 -r1.5 src/crypto/dist/heimdal/appl/ftp/ftpd/ftpd.8
cvs rdiff -r1.2 -r1.3 src/crypto/dist/heimdal/appl/ftp/ftpd/ftpd.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/kf/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/kx/Makefile.in
cvs rdiff -r1.5 -r1.6 src/crypto/dist/heimdal/appl/kx/krb4.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/login/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/otp/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/popper/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/push/Makefile.in
cvs rdiff -r1.6 -r0 src/crypto/dist/heimdal/appl/rcp/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/rsh/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/su/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/telnet/Makefile.in
cvs rdiff -r1.1.1.7 -r0 \
    src/crypto/dist/heimdal/appl/telnet/libtelnet/Makefile.in
cvs rdiff -r1.1.1.7 -r0 \
    src/crypto/dist/heimdal/appl/telnet/telnet/Makefile.in
cvs rdiff -r1.2 -r1.3 src/crypto/dist/heimdal/appl/telnet/telnet/main.c
cvs rdiff -r1.1.1.7 -r0 \
    src/crypto/dist/heimdal/appl/telnet/telnetd/Makefile.in
cvs rdiff -r1.2 -r1.3 src/crypto/dist/heimdal/appl/telnet/telnetd/telnetd.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/test/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/appl/xnlock/Makefile.in
cvs rdiff -r1.3 -r1.4 src/crypto/dist/heimdal/cf/aix.m4 \
    src/crypto/dist/heimdal/cf/krb-readline.m4
cvs rdiff -r1.2 -r1.3 src/crypto/dist/heimdal/cf/broken-getnameinfo.m4 \
    src/crypto/dist/heimdal/cf/broken-realloc.m4 \
    src/crypto/dist/heimdal/cf/retsigtype.m4 \
    src/crypto/dist/heimdal/cf/roken.m4
cvs rdiff -r1.6 -r1.7 src/crypto/dist/heimdal/cf/roken-frag.m4
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/doc/Makefile.in
cvs rdiff -r1.6 -r1.7 src/crypto/dist/heimdal/doc/setup.texi
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/include/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/include/kadm5/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/kadmin/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/kdc/Makefile.in
cvs rdiff -r1.11 -r1.12 src/crypto/dist/heimdal/kdc/config.c \
    src/crypto/dist/heimdal/kdc/connect.c src/crypto/dist/heimdal/kdc/kdc.8
cvs rdiff -r1.4 -r1.5 src/crypto/dist/heimdal/kdc/kaserver.c \
    src/crypto/dist/heimdal/kdc/kerberos4.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/heimdal/kdc/kdc_locl.h \
    src/crypto/dist/heimdal/kdc/kerberos5.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/kpasswd/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/kuser/Makefile.in
cvs rdiff -r1.9 -r1.10 src/crypto/dist/heimdal/kuser/kinit.c
cvs rdiff -r1.7 -r1.8 src/crypto/dist/heimdal/kuser/klist.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/45/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/asn1/Makefile.in
cvs rdiff -r1.2 -r1.3 src/crypto/dist/heimdal/lib/asn1/gen_free.c \
    src/crypto/dist/heimdal/lib/asn1/gen_length.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/auth/Makefile.in
cvs rdiff -r1.1.1.7 -r0 \
    src/crypto/dist/heimdal/lib/auth/afskauthlib/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/auth/pam/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/auth/sia/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/com_err/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/des/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/editline/Makefile.in
cvs rdiff -r1.7 -r1.8 src/crypto/dist/heimdal/lib/gssapi/8003.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/gssapi/Makefile.in
cvs rdiff -r1.4 -r1.5 src/crypto/dist/heimdal/lib/gssapi/accept_sec_context.c \
    src/crypto/dist/heimdal/lib/gssapi/context_time.c \
    src/crypto/dist/heimdal/lib/gssapi/gssapi_locl.h
cvs rdiff -r1.11 -r1.12 src/crypto/dist/heimdal/lib/gssapi/acquire_cred.c
cvs rdiff -r1.9 -r1.10 src/crypto/dist/heimdal/lib/gssapi/get_mic.c \
    src/crypto/dist/heimdal/lib/gssapi/unwrap.c \
    src/crypto/dist/heimdal/lib/gssapi/verify_mic.c \
    src/crypto/dist/heimdal/lib/gssapi/wrap.c
cvs rdiff -r1.10 -r1.11 src/crypto/dist/heimdal/lib/gssapi/init_sec_context.c
cvs rdiff -r1.6 -r1.7 src/crypto/dist/heimdal/lib/gssapi/release_cred.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/hdb/Makefile.in
cvs rdiff -r1.4 -r1.5 src/crypto/dist/heimdal/lib/hdb/db3.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/kadm5/Makefile.in
cvs rdiff -r1.5 -r1.6 src/crypto/dist/heimdal/lib/kadm5/init_c.c
cvs rdiff -r1.2 -r1.3 src/crypto/dist/heimdal/lib/kadm5/truncate_log.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/kafs/Makefile.in
cvs rdiff -r1.7 -r0 src/crypto/dist/heimdal/lib/kdfs/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/krb5/Makefile.in
cvs rdiff -r1.12 -r1.13 src/crypto/dist/heimdal/lib/krb5/crypto.c
cvs rdiff -r1.3 -r1.4 src/crypto/dist/heimdal/lib/krb5/eai_to_heim_errno.c
cvs rdiff -r1.5 -r1.6 src/crypto/dist/heimdal/lib/krb5/get_cred.c \
    src/crypto/dist/heimdal/lib/krb5/get_in_tkt.c
cvs rdiff -r1.8 -r1.9 src/crypto/dist/heimdal/lib/krb5/krb5-protos.h \
    src/crypto/dist/heimdal/lib/krb5/principal.c
cvs rdiff -r1.15 -r1.16 src/crypto/dist/heimdal/lib/krb5/krb5.conf.5
cvs rdiff -r1.4 -r1.5 src/crypto/dist/heimdal/lib/krb5/krb5.h
cvs rdiff -r1.10 -r1.11 src/crypto/dist/heimdal/lib/krb5/mcache.c
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/otp/Makefile.in
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/roken/Makefile.in
cvs rdiff -r1.5 -r1.6 src/crypto/dist/heimdal/lib/roken/roken-common.h
cvs rdiff -r1.1.1.7 -r0 src/crypto/dist/heimdal/lib/sl/Makefile.in
cvs rdiff -r1.7 -r0 src/crypto/dist/heimdal/lib/vers/Makefile.in
cvs rdiff -r1.6 -r1.7 src/crypto/dist/heimdal/lib/vers/print_version.c
cvs rdiff -r1.6 -r0 src/crypto/dist/heimdal/tools/Makefile.in
cvs rdiff -r1.13 -r1.14 src/include/heimdal/config.h
cvs rdiff -r1.14 -r1.15 src/include/heimdal/version.h
cvs rdiff -r1.12 -r1.13 src/lib/libgssapi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.