Module Name:	basesrc
Committed By:	assar
Date:		Tue Jun 19 22:40:00 UTC 2001

Modified Files:
	basesrc/crypto/dist/heimdal/admin: ktutil.8 ktutil.c
	basesrc/crypto/dist/heimdal/appl/dceutils: ChangeLog Makefile.am
	    Makefile.in compile
	basesrc/crypto/dist/heimdal/appl/kf: kf.1 kfd.8
	basesrc/crypto/dist/heimdal/appl/otp: otpprint.1
	basesrc/crypto/dist/heimdal/appl/rcp: ChangeLog Makefile.in rcp.c
	basesrc/crypto/dist/heimdal/cf: roken-frag.m4
	basesrc/crypto/dist/heimdal/doc: migration.texi
	basesrc/crypto/dist/heimdal/kadmin: add-random-users.c kadm_conn.c
	    kadmin.8 kadmin.c kadmind.8 kadmind.c
	basesrc/crypto/dist/heimdal/kdc: 524.c config.c connect.c hprop.8
	    hpropd.8 kdc.8 kerberos5.c kstash.8 main.c string2key.8
	basesrc/crypto/dist/heimdal/kpasswd: kpasswd-generator.c kpasswd.1
	    kpasswdd.8 kpasswdd.c
	basesrc/crypto/dist/heimdal/kuser: generate-requests.c kdestroy.1
	    kdestroy.c kgetcred.1 kinit.1 kinit.c klist.1 klist.c
	basesrc/crypto/dist/heimdal/lib/auth/pam: pam.c
	basesrc/crypto/dist/heimdal/lib/com_err: com_err.c
	basesrc/crypto/dist/heimdal/lib/gssapi: acquire_cred.c
	    address_to_krb5addr.c copy_ccache.c get_mic.c gssapi.h
	    init_sec_context.c unwrap.c verify_mic.c wrap.c
	basesrc/crypto/dist/heimdal/lib/kdfs: ChangeLog Makefile.in k5dfspag.c
	basesrc/crypto/dist/heimdal/lib/krb5: acl.c appdefault.c changepw.c
	    context.c crypto.c eai_to_heim_errno.c get_addrs.c get_cred.c
	    kerberos.8 krb5-protos.h krb5.conf.5 krb5_425_conv_principal.3
	    krb5_appdefault.3 krb5_build_principal.3 krb5_config.3
	    krb5_free_principal.3 krb5_init_context.3 krb5_parse_name.3
	    krb5_sname_to_principal.3 krb5_unparse_name.3 mcache.c principal.c
	    prog_setup.c send_to_kdc.c verify_krb5_conf.8 warn.c
	basesrc/crypto/dist/heimdal/lib/roken: getifaddrs.c glob.hin
	    write_pid.c
	basesrc/crypto/dist/heimdal/lib/vers: ChangeLog Makefile.in
	    print_version.c
	basesrc/crypto/dist/heimdal/tools: Makefile.in krb5-config.1

Log Message:
merge in conflicts after 0.3f import


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/admin/ktutil.8
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/admin/ktutil.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/appl/dceutils/ChangeLog \
    basesrc/crypto/dist/heimdal/appl/dceutils/Makefile.am \
    basesrc/crypto/dist/heimdal/appl/dceutils/Makefile.in
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/dceutils/compile
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/appl/kf/kf.1
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/kf/kfd.8
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/otp/otpprint.1
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/rcp/ChangeLog \
    basesrc/crypto/dist/heimdal/appl/rcp/Makefile.in \
    basesrc/crypto/dist/heimdal/appl/rcp/rcp.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/cf/roken-frag.m4
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/doc/migration.texi
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kadmin/add-random-users.c \
    basesrc/crypto/dist/heimdal/kadmin/kadmind.8
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/kadmin/kadm_conn.c \
    basesrc/crypto/dist/heimdal/kadmin/kadmind.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/kadmin/kadmin.8 \
    basesrc/crypto/dist/heimdal/kadmin/kadmin.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kdc/524.c \
    basesrc/crypto/dist/heimdal/kdc/config.c \
    basesrc/crypto/dist/heimdal/kdc/hpropd.8 \
    basesrc/crypto/dist/heimdal/kdc/main.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/kdc/connect.c \
    basesrc/crypto/dist/heimdal/kdc/kdc.8
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kdc/hprop.8 \
    basesrc/crypto/dist/heimdal/kdc/kerberos5.c \
    basesrc/crypto/dist/heimdal/kdc/kstash.8 \
    basesrc/crypto/dist/heimdal/kdc/string2key.8
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kpasswd/kpasswd-generator.c \
    basesrc/crypto/dist/heimdal/kpasswd/kpasswdd.8
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kpasswd/kpasswd.1
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/kpasswd/kpasswdd.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kuser/generate-requests.c \
    basesrc/crypto/dist/heimdal/kuser/kgetcred.1 \
    basesrc/crypto/dist/heimdal/kuser/klist.1
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/kuser/kdestroy.1 \
    basesrc/crypto/dist/heimdal/kuser/kdestroy.c \
    basesrc/crypto/dist/heimdal/kuser/kinit.1 \
    basesrc/crypto/dist/heimdal/kuser/kinit.c \
    basesrc/crypto/dist/heimdal/kuser/klist.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/auth/pam/pam.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/com_err/com_err.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/lib/gssapi/acquire_cred.c
cvs rdiff -r1.1 -r1.2 \
    basesrc/crypto/dist/heimdal/lib/gssapi/address_to_krb5addr.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/copy_ccache.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/gssapi/get_mic.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/unwrap.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/verify_mic.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/wrap.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/gssapi/gssapi.h \
    basesrc/crypto/dist/heimdal/lib/gssapi/init_sec_context.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/kdfs/ChangeLog \
    basesrc/crypto/dist/heimdal/lib/kdfs/Makefile.in \
    basesrc/crypto/dist/heimdal/lib/kdfs/k5dfspag.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/krb5/acl.c \
    basesrc/crypto/dist/heimdal/lib/krb5/eai_to_heim_errno.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/krb5/appdefault.c \
    basesrc/crypto/dist/heimdal/lib/krb5/get_cred.c \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_425_conv_principal.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_appdefault.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_build_principal.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_config.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_free_principal.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_parse_name.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_sname_to_principal.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_unparse_name.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/krb5/changepw.c \
    basesrc/crypto/dist/heimdal/lib/krb5/crypto.c \
    basesrc/crypto/dist/heimdal/lib/krb5/get_addrs.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/lib/krb5/context.c \
    basesrc/crypto/dist/heimdal/lib/krb5/kerberos.8
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/krb5/krb5-protos.h \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_init_context.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/principal.c \
    basesrc/crypto/dist/heimdal/lib/krb5/prog_setup.c \
    basesrc/crypto/dist/heimdal/lib/krb5/send_to_kdc.c \
    basesrc/crypto/dist/heimdal/lib/krb5/warn.c
cvs rdiff -r1.6 -r1.7 basesrc/crypto/dist/heimdal/lib/krb5/krb5.conf.5
cvs rdiff -r1.7 -r1.8 basesrc/crypto/dist/heimdal/lib/krb5/mcache.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/roken/getifaddrs.c \
    basesrc/crypto/dist/heimdal/lib/roken/glob.hin
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/roken/write_pid.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/vers/ChangeLog \
    basesrc/crypto/dist/heimdal/lib/vers/Makefile.in
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/vers/print_version.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/tools/Makefile.in
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/tools/krb5-config.1

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