Module Name:	basesrc
Committed By:	joda
Date:		Thu Sep 12 12:33:16 UTC 2002

Modified Files:
	basesrc/crypto/dist/krb4/admin: ext_srvtab.c kdb_util.c kstash.c
	basesrc/crypto/dist/krb4/appl/bsd: kcmd.c login.c rlogind.c su.c
	basesrc/crypto/dist/krb4/appl/kauth: kauth.c rkinit.c
	basesrc/crypto/dist/krb4/appl/kip: kipd.c
	basesrc/crypto/dist/krb4/appl/kx: krb4.c
	basesrc/crypto/dist/krb4/appl/otp: otp.c
	basesrc/crypto/dist/krb4/kadmin: ksrvutil.c ksrvutil_get.c
	basesrc/crypto/dist/krb4/lib/auth/pam: pam.c
	basesrc/crypto/dist/krb4/lib/kadm: kadm_cli_wrap.c kadm_locl.h
	basesrc/crypto/dist/krb4/lib/kafs: kafs.3
	basesrc/crypto/dist/krb4/lib/kdb: kdb_locl.h krb_kdb_utils.c
	basesrc/crypto/dist/krb4/lib/krb: decomp_ticket.c encrypt_ktext.c
	    extra.c get_krbrlm.c kdc_reply.c klog.h krb-archaeology.h
	    krb-protos.h krb.equiv.5 krb.h.in krb_locl.h logging.c mk_priv.c
	    mk_safe.c rd_priv.c rd_safe.c rw.c send_to_kdc.c str2key.c
	    tf_util.c
	basesrc/crypto/dist/krb4/lib/roken: resolve.c snprintf.c
	basesrc/crypto/dist/krb4/slave: kprop.c

Log Message:
resolve import conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/admin/ext_srvtab.c \
    basesrc/crypto/dist/krb4/admin/kdb_util.c \
    basesrc/crypto/dist/krb4/admin/kstash.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/appl/bsd/kcmd.c \
    basesrc/crypto/dist/krb4/appl/bsd/login.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/krb4/appl/bsd/rlogind.c \
    basesrc/crypto/dist/krb4/appl/bsd/su.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/appl/kauth/kauth.c \
    basesrc/crypto/dist/krb4/appl/kauth/rkinit.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/krb4/appl/kip/kipd.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/appl/kx/krb4.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/appl/otp/otp.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/kadmin/ksrvutil.c \
    basesrc/crypto/dist/krb4/kadmin/ksrvutil_get.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/krb4/lib/auth/pam/pam.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/krb4/lib/kadm/kadm_cli_wrap.c \
    basesrc/crypto/dist/krb4/lib/kadm/kadm_locl.h
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/lib/kafs/kafs.3
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/lib/kdb/kdb_locl.h
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/krb4/lib/kdb/krb_kdb_utils.c
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/krb4/lib/krb/decomp_ticket.c \
    basesrc/crypto/dist/krb4/lib/krb/encrypt_ktext.c \
    basesrc/crypto/dist/krb4/lib/krb/extra.c \
    basesrc/crypto/dist/krb4/lib/krb/kdc_reply.c \
    basesrc/crypto/dist/krb4/lib/krb/krb-protos.h \
    basesrc/crypto/dist/krb4/lib/krb/krb.equiv.5 \
    basesrc/crypto/dist/krb4/lib/krb/krb_locl.h \
    basesrc/crypto/dist/krb4/lib/krb/rd_priv.c \
    basesrc/crypto/dist/krb4/lib/krb/rw.c \
    basesrc/crypto/dist/krb4/lib/krb/str2key.c \
    basesrc/crypto/dist/krb4/lib/krb/tf_util.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/krb4/lib/krb/get_krbrlm.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/lib/krb/klog.h \
    basesrc/crypto/dist/krb4/lib/krb/krb-archaeology.h \
    basesrc/crypto/dist/krb4/lib/krb/krb.h.in \
    basesrc/crypto/dist/krb4/lib/krb/mk_priv.c \
    basesrc/crypto/dist/krb4/lib/krb/mk_safe.c \
    basesrc/crypto/dist/krb4/lib/krb/rd_safe.c \
    basesrc/crypto/dist/krb4/lib/krb/send_to_kdc.c
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/krb4/lib/krb/logging.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/lib/roken/resolve.c \
    basesrc/crypto/dist/krb4/lib/roken/snprintf.c
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/krb4/slave/kprop.c

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