Module Name:	cryptosrc-us
Committed By:	thorpej
Date:		Sat Mar 11 23:23:43 UTC 2000

Update of /cvsroot/cryptosrc-us/crypto-us/dist/kame
In directory nb00:/tmp/cvs-serv787

Log Message:
Bring in latest racoon from cryptosrc-intl.


Vendor Tag:	netbsd-cryptosrc-intl
Release Tags:	cryptosrc-intl-20000311
		
U cryptosrc-us/crypto-us/dist/kame/racoon/aclocal.m4
U cryptosrc-us/crypto-us/dist/kame/racoon/admin.c
U cryptosrc-us/crypto-us/dist/kame/racoon/admin.h
U cryptosrc-us/crypto-us/dist/kame/racoon/admin_var.h
U cryptosrc-us/crypto-us/dist/kame/racoon/algorithm.c
U cryptosrc-us/crypto-us/dist/kame/racoon/algorithm.h
U cryptosrc-us/crypto-us/dist/kame/racoon/cfparse.h
C cryptosrc-us/crypto-us/dist/kame/racoon/cfparse.y
U cryptosrc-us/crypto-us/dist/kame/racoon/cftoken.h
U cryptosrc-us/crypto-us/dist/kame/racoon/cftoken.l
U cryptosrc-us/crypto-us/dist/kame/racoon/config.guess
U cryptosrc-us/crypto-us/dist/kame/racoon/config.sub
U cryptosrc-us/crypto-us/dist/kame/racoon/configure
U cryptosrc-us/crypto-us/dist/kame/racoon/configure.in
U cryptosrc-us/crypto-us/dist/kame/racoon/crypto_openssl.c
U cryptosrc-us/crypto-us/dist/kame/racoon/crypto_openssl.h
U cryptosrc-us/crypto-us/dist/kame/racoon/debug.h
U cryptosrc-us/crypto-us/dist/kame/racoon/eaytest.c
U cryptosrc-us/crypto-us/dist/kame/racoon/gnuc.h
U cryptosrc-us/crypto-us/dist/kame/racoon/grabmyaddr.c
U cryptosrc-us/crypto-us/dist/kame/racoon/handler.c
U cryptosrc-us/crypto-us/dist/kame/racoon/grabmyaddr.h
U cryptosrc-us/crypto-us/dist/kame/racoon/handler.h
U cryptosrc-us/crypto-us/dist/kame/racoon/install-sh
U cryptosrc-us/crypto-us/dist/kame/racoon/ipsec_doi.c
U cryptosrc-us/crypto-us/dist/kame/racoon/ipsec_doi.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp.c
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_agg.c
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_agg.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_base.c
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_base.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_ident.c
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_ident.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_inf.c
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_inf.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_newg.c
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_newg.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_quick.c
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_quick.h
U cryptosrc-us/crypto-us/dist/kame/racoon/isakmp_var.h
U cryptosrc-us/crypto-us/dist/kame/racoon/kmpstat.c
U cryptosrc-us/crypto-us/dist/kame/racoon/localconf.c
U cryptosrc-us/crypto-us/dist/kame/racoon/main.c
U cryptosrc-us/crypto-us/dist/kame/racoon/localconf.h
U cryptosrc-us/crypto-us/dist/kame/racoon/logger.c
U cryptosrc-us/crypto-us/dist/kame/racoon/logger.h
U cryptosrc-us/crypto-us/dist/kame/racoon/misc.c
U cryptosrc-us/crypto-us/dist/kame/racoon/misc.h
U cryptosrc-us/crypto-us/dist/kame/racoon/oakley.c
U cryptosrc-us/crypto-us/dist/kame/racoon/oakley.h
U cryptosrc-us/crypto-us/dist/kame/racoon/pfkey.c
U cryptosrc-us/crypto-us/dist/kame/racoon/pfkey.h
U cryptosrc-us/crypto-us/dist/kame/racoon/plog.c
U cryptosrc-us/crypto-us/dist/kame/racoon/plog.h
U cryptosrc-us/crypto-us/dist/kame/racoon/policy.c
U cryptosrc-us/crypto-us/dist/kame/racoon/policy.h
U cryptosrc-us/crypto-us/dist/kame/racoon/racoon.8
U cryptosrc-us/crypto-us/dist/kame/racoon/racoon.conf.5
U cryptosrc-us/crypto-us/dist/kame/racoon/remoteconf.c
U cryptosrc-us/crypto-us/dist/kame/racoon/remoteconf.h
U cryptosrc-us/crypto-us/dist/kame/racoon/schedule.c
U cryptosrc-us/crypto-us/dist/kame/racoon/schedule.h
U cryptosrc-us/crypto-us/dist/kame/racoon/session.c
U cryptosrc-us/crypto-us/dist/kame/racoon/session.h
U cryptosrc-us/crypto-us/dist/kame/racoon/signing.c
U cryptosrc-us/crypto-us/dist/kame/racoon/signing.h
U cryptosrc-us/crypto-us/dist/kame/racoon/sockmisc.h
U cryptosrc-us/crypto-us/dist/kame/racoon/str2val.c
U cryptosrc-us/crypto-us/dist/kame/racoon/str2val.h
U cryptosrc-us/crypto-us/dist/kame/racoon/strnames.c
U cryptosrc-us/crypto-us/dist/kame/racoon/strnames.h
U cryptosrc-us/crypto-us/dist/kame/racoon/var.h
U cryptosrc-us/crypto-us/dist/kame/racoon/vmbuf.c
U cryptosrc-us/crypto-us/dist/kame/racoon/vmbuf.h
U cryptosrc-us/crypto-us/dist/kame/racoon/sockmisc.c
U cryptosrc-us/crypto-us/dist/kame/racoon/Makefile.in
U cryptosrc-us/crypto-us/dist/kame/racoon/README.netbsd
U cryptosrc-us/crypto-us/dist/kame/racoon/TODO
U cryptosrc-us/crypto-us/dist/kame/racoon/doc/SantaBarbara-result.jp
U cryptosrc-us/crypto-us/dist/kame/racoon/doc/ibm-result.jp
U cryptosrc-us/crypto-us/dist/kame/racoon/doc/question
U cryptosrc-us/crypto-us/dist/kame/racoon/doc/redmond.txt
U cryptosrc-us/crypto-us/dist/kame/racoon/doc/rules.jp
U cryptosrc-us/crypto-us/dist/kame/racoon/doc/sandiego-result.en
U cryptosrc-us/crypto-us/dist/kame/racoon/doc/sandiego-result.jp
U cryptosrc-us/crypto-us/dist/kame/racoon/missing/addrinfo.h
U cryptosrc-us/crypto-us/dist/kame/racoon/missing/getaddrinfo.c
U cryptosrc-us/crypto-us/dist/kame/racoon/missing/getnameinfo.c
U cryptosrc-us/crypto-us/dist/kame/racoon/missing/strdup.c
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/Makefile
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/basic.conf.in
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/policy.conf.in
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/psk.txt.in
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/racoon.conf.in
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/remote.conf.in
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/sa.conf.in
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/sandiego.conf
U cryptosrc-us/crypto-us/dist/kame/racoon/samples/sandiego.pl

1 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jnetbsd-cryptosrc-intl:yesterday -jnetbsd-cryptosrc-intl cryptosrc-us/crypto-us/dist/kame