Module Name:	basesrc
Committed By:	assar
Date:		Sun Feb 11 14:13:13 UTC 2001

Modified Files:
	basesrc/crypto/dist/heimdal/admin: ktutil.c
	basesrc/crypto/dist/heimdal/kadmin: kadm_conn.c kadmin.8 kadmin.c
	    kadmind.c
	basesrc/crypto/dist/heimdal/kdc: 524.c config.c connect.c kdc.8
	    kdc_locl.h main.c
	basesrc/crypto/dist/heimdal/kpasswd: kpasswd.c kpasswdd.c
	basesrc/crypto/dist/heimdal/kuser: kdestroy.c kinit.c klist.c
	basesrc/crypto/dist/heimdal/lib/auth/pam: pam.c
	basesrc/crypto/dist/heimdal/lib/gssapi: 8003.c acquire_cred.c get_mic.c
	    gssapi.h init_sec_context.c unwrap.c verify_mic.c wrap.c
	basesrc/crypto/dist/heimdal/lib/hdb: hdb-protos.h
	basesrc/crypto/dist/heimdal/lib/krb5: changepw.c context.c crypto.c
	    get_addrs.c kerberos.8 krb5-protos.h krb5.conf.5 mcache.c
	    principal.c prog_setup.c send_to_kdc.c warn.c
	basesrc/crypto/dist/heimdal/lib/roken: make-print-version.c
	    roken-common.h

Log Message:
fix merge conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/admin/ktutil.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/kadmin/kadm_conn.c
cvs rdiff -r1.1 -r1.2 basesrc/crypto/dist/heimdal/kadmin/kadmin.8
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kadmin/kadmin.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kadmin/kadmind.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kdc/524.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/kdc/config.c \
    basesrc/crypto/dist/heimdal/kdc/kdc.8 \
    basesrc/crypto/dist/heimdal/kdc/main.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/heimdal/kdc/connect.c \
    basesrc/crypto/dist/heimdal/kdc/kdc_locl.h
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kpasswd/kpasswd.c \
    basesrc/crypto/dist/heimdal/kpasswd/kpasswdd.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/kuser/kdestroy.c \
    basesrc/crypto/dist/heimdal/kuser/kinit.c \
    basesrc/crypto/dist/heimdal/kuser/klist.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/auth/pam/pam.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/gssapi/8003.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/get_mic.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/init_sec_context.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.3 -r1.4 basesrc/crypto/dist/heimdal/lib/gssapi/acquire_cred.c \
    basesrc/crypto/dist/heimdal/lib/gssapi/gssapi.h
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/hdb/hdb-protos.h
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/heimdal/lib/krb5/changepw.c \
    basesrc/crypto/dist/heimdal/lib/krb5/crypto.c \
    basesrc/crypto/dist/heimdal/lib/krb5/kerberos.8 \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5-protos.h \
    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.4 -r1.5 basesrc/crypto/dist/heimdal/lib/krb5/context.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/heimdal/lib/krb5/get_addrs.c \
    basesrc/crypto/dist/heimdal/lib/krb5/krb5.conf.5
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/heimdal/lib/krb5/mcache.c
cvs rdiff -r1.2 -r1.3 \
    basesrc/crypto/dist/heimdal/lib/roken/make-print-version.c \
    basesrc/crypto/dist/heimdal/lib/roken/roken-common.h

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