cvs commit: src/crypto/heimdal TODO acinclude.m4 src/crypto/heimdal/appl/ftp/ftp ftp.cat1 src/crypto/heimdal/appl/ftp/ftpd ftpd.cat8 ftpusers.cat5 src/crypto/heimdal/appl/kf kf.cat1 kfd.cat8 ...

[Jacques Vidrine]

nectar      2004/04/03 13:31:10 PST

  FreeBSD src repository

  Modified files:
    crypto/heimdal/lib/hdb hdb_locl.h 
    crypto/heimdal/lib/krb5 crypto.c 
  Removed files:
    crypto/heimdal       TODO acinclude.m4 
    crypto/heimdal/admin ktutil.cat8 
    crypto/heimdal/appl/ftp/ftp ftp.cat1 
    crypto/heimdal/appl/ftp/ftpd ftpd.cat8 ftpusers.cat5 
    crypto/heimdal/appl/kf kf.cat1 kfd.cat8 
    crypto/heimdal/appl/push pfrom.cat1 push.cat8 
    crypto/heimdal/appl/telnet/telnet telnet.cat1 
    crypto/heimdal/appl/telnet/telnetd telnetd.cat8 
    crypto/heimdal/kadmin kadmin.cat8 kadmind.cat8 
    crypto/heimdal/kdc   hprop.cat8 hpropd.cat8 kdc.cat8 
                         kstash.cat8 string2key.cat8 
    crypto/heimdal/kpasswd kpasswd.cat1 kpasswdd.cat8 
    crypto/heimdal/kuser kdestroy.cat1 kgetcred.cat1 kinit.cat1 
                         klist.cat1 
    crypto/heimdal/lib/kafs kafs.cat3 
    crypto/heimdal/lib/roken config.h.in 
    crypto/heimdal/tools krb5-config.cat1 
  Log:
  Resolve conflicts after import of Heimdal 0.6.1.
  
  Revision  Changes    Path
  1.2       +0 -103    src/crypto/heimdal/TODO (dead)
  1.2       +0 -9      src/crypto/heimdal/acinclude.m4 (dead)
  1.2       +0 -71     src/crypto/heimdal/admin/ktutil.cat8 (dead)
  1.2       +0 -650    src/crypto/heimdal/appl/ftp/ftp/ftp.cat1 (dead)
  1.2       +0 -296    src/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8 (dead)
  1.2       +0 -27     src/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5 (dead)
  1.2       +0 -46     src/crypto/heimdal/appl/kf/kf.cat1 (dead)
  1.2       +0 -31     src/crypto/heimdal/appl/kf/kfd.cat8 (dead)
  1.2       +0 -17     src/crypto/heimdal/appl/push/pfrom.cat1 (dead)
  1.2       +0 -77     src/crypto/heimdal/appl/push/push.cat8 (dead)
  1.2       +0 -718    src/crypto/heimdal/appl/telnet/telnet/telnet.cat1 (dead)
  1.2       +0 -297    src/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8 (dead)
  1.2       +0 -123    src/crypto/heimdal/kadmin/kadmin.cat8 (dead)
  1.2       +0 -93     src/crypto/heimdal/kadmin/kadmind.cat8 (dead)
  1.2       +0 -103    src/crypto/heimdal/kdc/hprop.cat8 (dead)
  1.2       +0 -43     src/crypto/heimdal/kdc/hpropd.cat8 (dead)
  1.2       +0 -118    src/crypto/heimdal/kdc/kdc.cat8 (dead)
  1.2       +0 -34     src/crypto/heimdal/kdc/kstash.cat8 (dead)
  1.2       +0 -42     src/crypto/heimdal/kdc/string2key.cat8 (dead)
  1.2       +0 -20     src/crypto/heimdal/kpasswd/kpasswd.cat1 (dead)
  1.2       +0 -54     src/crypto/heimdal/kpasswd/kpasswdd.cat8 (dead)
  1.2       +0 -30     src/crypto/heimdal/kuser/kdestroy.cat1 (dead)
  1.2       +0 -27     src/crypto/heimdal/kuser/kgetcred.cat1 (dead)
  1.2       +0 -119    src/crypto/heimdal/kuser/kinit.cat1 (dead)
  1.2       +0 -89     src/crypto/heimdal/kuser/klist.cat1 (dead)
  1.8       +4 -1      src/crypto/heimdal/lib/hdb/hdb_locl.h
  1.2       +0 -95     src/crypto/heimdal/lib/kafs/kafs.cat3 (dead)
  1.10      +192 -109  src/crypto/heimdal/lib/krb5/crypto.c
  1.2       +0 -1      src/crypto/heimdal/lib/roken/config.h.in (dead)
  1.2       +0 -52     src/crypto/heimdal/tools/krb5-config.cat1 (dead)