CVS commit: basesrc/crypto/dist/heimdal

[Johan Danielsson <joda%netbsd.org@localhost>]

Module Name:    basesrc
Committed By:   joda
Date:           Thu Sep 12 13:19:25 UTC 2002

Modified Files:
        basesrc/crypto/dist/heimdal/admin: ktutil.8 ktutil.c
        basesrc/crypto/dist/heimdal/appl/dceutils: ChangeLog Makefile.am
            Makefile.in k5dcecon.c
        basesrc/crypto/dist/heimdal/appl/ftp/ftp: ftp.c
        basesrc/crypto/dist/heimdal/appl/kf: kfd.8
        basesrc/crypto/dist/heimdal/appl/kx: krb4.c
        basesrc/crypto/dist/heimdal/appl/login: env.c
        basesrc/crypto/dist/heimdal/appl/otp: otp.1 otp.c otpprint.1
        basesrc/crypto/dist/heimdal/appl/rcp: ChangeLog Makefile.am Makefile.in
            rcp.c rcp_locl.h util.c
        basesrc/crypto/dist/heimdal/cf: aix.m4 broken-getnameinfo.m4
            broken-realloc.m4 broken2.m4 db.m4 install-catman.sh
            krb-readline.m4 retsigtype.m4 roken-frag.m4 roken.m4
        basesrc/crypto/dist/heimdal/doc/standardisation:
            draft-brezak-win2k-krb-rc4-hmac-02.txt
        basesrc/crypto/dist/heimdal/kadmin: add-random-users.c del_enctype.c
            kadm_conn.c kadmin.8 kadmin.c kadmind.8 kadmind.c rename.c
        basesrc/crypto/dist/heimdal/kdc: 524.c config.c connect.c hprop.8
            hprop.c hpropd.8 kdc.8 kdc_locl.h kerberos5.c kstash.8 log.c main.c
            mit_dump.c string2key.8 v4_dump.c
        basesrc/crypto/dist/heimdal/kpasswd: kpasswd-generator.c kpasswd.1
            kpasswd.c 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/asn1: gen.c k5.asn1
        basesrc/crypto/dist/heimdal/lib/auth/pam: pam.c
        basesrc/crypto/dist/heimdal/lib/com_err: com_err.c com_err.h lex.h
        basesrc/crypto/dist/heimdal/lib/des: rnd_keys.c
        basesrc/crypto/dist/heimdal/lib/gssapi: 8003.c acquire_cred.c
            copy_ccache.c get_mic.c gssapi.h init_sec_context.c release_cred.c
            unwrap.c verify_mic.c wrap.c
        basesrc/crypto/dist/heimdal/lib/hdb: db3.c hdb-private.h hdb-protos.h
            mkey.c
        basesrc/crypto/dist/heimdal/lib/kadm5: bump_pw_expire.c init_c.c
            kadm5-private.h kadm5-protos.h kadm5_err.et keys.c truncate_log.c
        basesrc/crypto/dist/heimdal/lib/kafs: kafs.3
        basesrc/crypto/dist/heimdal/lib/kdfs: ChangeLog Makefile.am 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
            get_in_tkt.c init_creds.c kerberos.8 keytab_any.c krb5-protos.h
            krb5.conf.5 krb5_425_conv_principal.3 krb5_appdefault.3
            krb5_auth_context.3 krb5_build_principal.3 krb5_config.3
            krb5_context.3 krb5_create_checksum.3 krb5_crypto_init.3
            krb5_encrypt.3 krb5_free_principal.3 krb5_get_all_client_addrs.3
            krb5_get_krbhst.3 krb5_init_context.3 krb5_keytab.3
            krb5_krbhst_init.3 krb5_openlog.3 krb5_parse_name.3
            krb5_principal_get_realm.3 krb5_sname_to_principal.3
            krb5_timeofday.3 krb5_unparse_name.3 krb5_verify_user.3 krb5_warn.3
            mcache.c principal.c prog_setup.c send_to_kdc.c test_get_addrs.c
            verify_krb5_conf.8 version.c warn.c
        basesrc/crypto/dist/heimdal/lib/roken: acinclude.m4 environment.c
            err.hin esetenv.c getifaddrs.c ifaddrs.hin mkinstalldirs resolve.c
            roken-common.h rtbl.c snprintf.c strlcat.c strlcpy.c strsep_copy.c
            unvis.c vis.c write_pid.c
        basesrc/crypto/dist/heimdal/lib/sl: lex.l
        basesrc/crypto/dist/heimdal/lib/vers: ChangeLog Makefile.am Makefile.in
            make-print-version.c print_version.c vers.h
        basesrc/crypto/dist/heimdal/tools: Makefile.am Makefile.in
            krb5-config.1 krb5-config.in
Removed Files:
        basesrc/crypto/dist/heimdal: acconfig.h
        basesrc/crypto/dist/heimdal/cf: grok-type.m4 krb-find-db.m4 krb-irix.m4
            shared-libs.m4
        basesrc/crypto/dist/heimdal/include: stamp-h.in
        basesrc/crypto/dist/heimdal/lib/asn1: libasn1.h
        basesrc/crypto/dist/heimdal/lib/hdb: libasn1.h
        basesrc/crypto/dist/heimdal/lib/roken: compile config.h.in

Log Message:
resolve import conflicts


To generate a diff of this commit:
cvs rdiff -r1.1.1.4 -r0 basesrc/crypto/dist/heimdal/acconfig.h
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/admin/ktutil.8
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/admin/ktutil.c
cvs rdiff -r1.4 -r1.5 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/k5dcecon.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/appl/ftp/ftp/ftp.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/appl/kf/kfd.8
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/appl/kx/krb4.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/login/env.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/otp/otp.1
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/appl/otp/otp.c \
    basesrc/crypto/dist/heimdal/appl/otp/otpprint.1
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/appl/rcp/ChangeLog \
    basesrc/crypto/dist/heimdal/appl/rcp/Makefile.in
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/appl/rcp/Makefile.am \
    basesrc/crypto/dist/heimdal/appl/rcp/rcp_locl.h \
    basesrc/crypto/dist/heimdal/appl/rcp/util.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/appl/rcp/rcp.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/cf/aix.m4 \
    basesrc/crypto/dist/heimdal/cf/db.m4 \
    basesrc/crypto/dist/heimdal/cf/install-catman.sh \
    basesrc/crypto/dist/heimdal/cf/krb-readline.m4
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/cf/broken-getnameinfo.m4 \
    basesrc/crypto/dist/heimdal/cf/broken-realloc.m4 \
    basesrc/crypto/dist/heimdal/cf/broken2.m4 \
    basesrc/crypto/dist/heimdal/cf/retsigtype.m4 \
    basesrc/crypto/dist/heimdal/cf/roken.m4
cvs rdiff -r1.1.1.2 -r0 basesrc/crypto/dist/heimdal/cf/grok-type.m4
cvs rdiff -r1.1.1.3 -r0 basesrc/crypto/dist/heimdal/cf/krb-find-db.m4 \
    basesrc/crypto/dist/heimdal/cf/shared-libs.m4
cvs rdiff -r1.1 -r0 basesrc/crypto/dist/heimdal/cf/krb-irix.m4
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/cf/roken-frag.m4
cvs rdiff -r1.1 -r1.2 \
    
basesrc/crypto/dist/heimdal/doc/standardisation/draft-brezak-win2k-krb-rc4-hmac-02.txt
cvs rdiff -r1.1.1.1 -r0 basesrc/crypto/dist/heimdal/include/stamp-h.in
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kadmin/add-random-users.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kadmin/del_enctype.c \
    basesrc/crypto/dist/heimdal/kadmin/rename.c
cvs rdiff -r1.7 -r1.8 basesrc/crypto/dist/heimdal/kadmin/kadm_conn.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/kadmin/kadmin.8 \
    basesrc/crypto/dist/heimdal/kadmin/kadmin.c \
    basesrc/crypto/dist/heimdal/kadmin/kadmind.8
cvs rdiff -r1.6 -r1.7 basesrc/crypto/dist/heimdal/kadmin/kadmind.c
cvs rdiff -r1.6 -r1.7 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/kdc_locl.h \
    basesrc/crypto/dist/heimdal/kdc/kerberos5.c
cvs rdiff -r1.7 -r1.8 basesrc/crypto/dist/heimdal/kdc/connect.c \
    basesrc/crypto/dist/heimdal/kdc/kdc.8
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/kdc/hprop.8 \
    basesrc/crypto/dist/heimdal/kdc/kstash.8 \
    basesrc/crypto/dist/heimdal/kdc/main.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kdc/hprop.c \
    basesrc/crypto/dist/heimdal/kdc/log.c \
    basesrc/crypto/dist/heimdal/kdc/mit_dump.c \
    basesrc/crypto/dist/heimdal/kdc/v4_dump.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kdc/string2key.8
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kpasswd/kpasswd-generator.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/kpasswd/kpasswd.1 \
    basesrc/crypto/dist/heimdal/kpasswd/kpasswdd.8 \
    basesrc/crypto/dist/heimdal/kpasswd/kpasswdd.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/kpasswd/kpasswd.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kuser/generate-requests.c \
    basesrc/crypto/dist/heimdal/kuser/kdestroy.1 \
    basesrc/crypto/dist/heimdal/kuser/kdestroy.c \
    basesrc/crypto/dist/heimdal/kuser/kgetcred.1 \
    basesrc/crypto/dist/heimdal/kuser/klist.c
cvs rdiff -r1.6 -r1.7 basesrc/crypto/dist/heimdal/kuser/kinit.1 \
    basesrc/crypto/dist/heimdal/kuser/kinit.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/kuser/klist.1
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/asn1/gen.c \
    basesrc/crypto/dist/heimdal/lib/asn1/k5.asn1
cvs rdiff -r1.1.1.3 -r0 basesrc/crypto/dist/heimdal/lib/asn1/libasn1.h
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/auth/pam/pam.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/com_err/com_err.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/com_err/com_err.h
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/com_err/lex.h
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/des/rnd_keys.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/gssapi/8003.c
cvs rdiff -r1.7 -r1.8 basesrc/crypto/dist/heimdal/lib/gssapi/acquire_cred.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/gssapi/copy_ccache.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/release_cred.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/lib/gssapi/get_mic.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/gssapi.h \
    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.6 -r1.7 \
    basesrc/crypto/dist/heimdal/lib/gssapi/init_sec_context.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/hdb/db3.c \
    basesrc/crypto/dist/heimdal/lib/hdb/hdb-private.h \
    basesrc/crypto/dist/heimdal/lib/hdb/mkey.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/lib/hdb/hdb-protos.h
cvs rdiff -r1.2 -r0 basesrc/crypto/dist/heimdal/lib/hdb/libasn1.h
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/kadm5/bump_pw_expire.c \
    basesrc/crypto/dist/heimdal/lib/kadm5/kadm5-private.h \
    basesrc/crypto/dist/heimdal/lib/kadm5/kadm5-protos.h \
    basesrc/crypto/dist/heimdal/lib/kadm5/keys.c \
    basesrc/crypto/dist/heimdal/lib/kadm5/truncate_log.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/kadm5/init_c.c \
    basesrc/crypto/dist/heimdal/lib/kadm5/kadm5_err.et
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/kafs/kafs.3
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/kdfs/ChangeLog \
    basesrc/crypto/dist/heimdal/lib/kdfs/k5dfspag.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/kdfs/Makefile.am
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/kdfs/Makefile.in
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/krb5/acl.c \
    basesrc/crypto/dist/heimdal/lib/krb5/eai_to_heim_errno.c \
    basesrc/crypto/dist/heimdal/lib/krb5/get_in_tkt.c \
    basesrc/crypto/dist/heimdal/lib/krb5/init_creds.c \
    basesrc/crypto/dist/heimdal/lib/krb5/keytab_any.c \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_timeofday.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/test_get_addrs.c \
    basesrc/crypto/dist/heimdal/lib/krb5/version.c
cvs rdiff -r1.4 -r1.5 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_build_principal.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_config.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_encrypt.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_free_principal.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_keytab.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/prog_setup.c \
    basesrc/crypto/dist/heimdal/lib/krb5/warn.c
cvs rdiff -r1.6 -r1.7 basesrc/crypto/dist/heimdal/lib/krb5/changepw.c \
    basesrc/crypto/dist/heimdal/lib/krb5/get_addrs.c \
    basesrc/crypto/dist/heimdal/lib/krb5/kerberos.8 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5-protos.h \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_context.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_init_context.3
cvs rdiff -r1.7 -r1.8 basesrc/crypto/dist/heimdal/lib/krb5/context.c
cvs rdiff -r1.8 -r1.9 basesrc/crypto/dist/heimdal/lib/krb5/crypto.c \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5.conf.5
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/lib/krb5/krb5_appdefault.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_auth_context.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/principal.c \
    basesrc/crypto/dist/heimdal/lib/krb5/send_to_kdc.c \
    basesrc/crypto/dist/heimdal/lib/krb5/verify_krb5_conf.8
cvs rdiff -r1.3 -r1.4 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_create_checksum.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_crypto_init.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_get_all_client_addrs.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_get_krbhst.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_krbhst_init.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_openlog.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_principal_get_realm.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_verify_user.3 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5_warn.3
cvs rdiff -r1.9 -r1.10 basesrc/crypto/dist/heimdal/lib/krb5/mcache.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/lib/roken/acinclude.m4 \
    basesrc/crypto/dist/heimdal/lib/roken/environment.c \
    basesrc/crypto/dist/heimdal/lib/roken/err.hin \
    basesrc/crypto/dist/heimdal/lib/roken/esetenv.c \
    basesrc/crypto/dist/heimdal/lib/roken/ifaddrs.hin \
    basesrc/crypto/dist/heimdal/lib/roken/mkinstalldirs \
    basesrc/crypto/dist/heimdal/lib/roken/rtbl.c \
    basesrc/crypto/dist/heimdal/lib/roken/strsep_copy.c \
    basesrc/crypto/dist/heimdal/lib/roken/unvis.c
cvs rdiff -r1.1.1.1 -r0 basesrc/crypto/dist/heimdal/lib/roken/compile
cvs rdiff -r1.1 -r0 basesrc/crypto/dist/heimdal/lib/roken/config.h.in
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/roken/getifaddrs.c \
    basesrc/crypto/dist/heimdal/lib/roken/strlcat.c \
    basesrc/crypto/dist/heimdal/lib/roken/strlcpy.c \
    basesrc/crypto/dist/heimdal/lib/roken/write_pid.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/roken/resolve.c \
    basesrc/crypto/dist/heimdal/lib/roken/snprintf.c \
    basesrc/crypto/dist/heimdal/lib/roken/vis.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/roken/roken-common.h
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/sl/lex.l
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/lib/vers/ChangeLog \
    basesrc/crypto/dist/heimdal/lib/vers/Makefile.in
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/vers/Makefile.am
cvs rdiff -r1.1 -r1.2 \
    basesrc/crypto/dist/heimdal/lib/vers/make-print-version.c \
    basesrc/crypto/dist/heimdal/lib/vers/vers.h
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/vers/print_version.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/tools/Makefile.am \
    basesrc/crypto/dist/heimdal/tools/krb5-config.in
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/tools/Makefile.in \
    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.