Module Name:	basesrc
Committed By:	itojun
Date:		Sun Jan 14 05:22:34 UTC 2001

Modified Files:
	basesrc/crypto/dist/ssh: auth-rhosts.c auth-skey.c auth1.c canohost.c
	    channels.c cipher.c clientloop.c deattack.c kex.c packet.c scp.c
	    servconf.c servconf.h sftp-server.c ssh-add.c ssh-agent.c
	    ssh-keygen.c ssh.1 ssh.c ssh.h sshd.8 version.h
	basesrc/distrib/sets/lists/base: mi
	basesrc/distrib/sets/lists/man: mi
	basesrc/usr.bin/ssh: Makefile
	basesrc/usr.bin/ssh/libssh: Makefile
	basesrc/usr.bin/ssh/scp: Makefile
	basesrc/usr.bin/ssh/ssh: Makefile
	basesrc/usr.bin/ssh/sshd: Makefile
Added Files:
	basesrc/usr.bin/ssh/sftp-server: Makefile
	basesrc/usr.bin/ssh/ssh-keyscan: Makefile
Removed Files:
	basesrc/crypto/dist/ssh: dsa.c dsa.h

Log Message:
crypto/dist/ssh: resolve conflicts with 2.3.0/20010105.
usr.bin/ssh: add ssh-keyscan and sftp-server into SUBDIR.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/crypto/dist/ssh/auth-rhosts.c \
    basesrc/crypto/dist/ssh/auth-skey.c basesrc/crypto/dist/ssh/auth1.c \
    basesrc/crypto/dist/ssh/canohost.c basesrc/crypto/dist/ssh/channels.c \
    basesrc/crypto/dist/ssh/cipher.c basesrc/crypto/dist/ssh/clientloop.c \
    basesrc/crypto/dist/ssh/deattack.c basesrc/crypto/dist/ssh/kex.c \
    basesrc/crypto/dist/ssh/scp.c basesrc/crypto/dist/ssh/servconf.c \
    basesrc/crypto/dist/ssh/servconf.h basesrc/crypto/dist/ssh/sftp-server.c \
    basesrc/crypto/dist/ssh/ssh-keygen.c basesrc/crypto/dist/ssh/ssh.h \
    basesrc/crypto/dist/ssh/sshd.8
cvs rdiff -r1.1.1.1 -r0 basesrc/crypto/dist/ssh/dsa.c \
    basesrc/crypto/dist/ssh/dsa.h
cvs rdiff -r1.3 -r1.4 basesrc/crypto/dist/ssh/packet.c \
    basesrc/crypto/dist/ssh/ssh-add.c basesrc/crypto/dist/ssh/ssh-agent.c \
    basesrc/crypto/dist/ssh/ssh.c basesrc/crypto/dist/ssh/version.h
cvs rdiff -r1.4 -r1.5 basesrc/crypto/dist/ssh/ssh.1
cvs rdiff -r1.210 -r1.211 basesrc/distrib/sets/lists/base/mi
cvs rdiff -r1.304 -r1.305 basesrc/distrib/sets/lists/man/mi
cvs rdiff -r1.9 -r1.10 basesrc/usr.bin/ssh/Makefile
cvs rdiff -r1.2 -r1.3 basesrc/usr.bin/ssh/libssh/Makefile
cvs rdiff -r1.1 -r1.2 basesrc/usr.bin/ssh/scp/Makefile
cvs rdiff -r0 -r1.1 basesrc/usr.bin/ssh/sftp-server/Makefile
cvs rdiff -r1.3 -r1.4 basesrc/usr.bin/ssh/ssh/Makefile
cvs rdiff -r0 -r1.1 basesrc/usr.bin/ssh/ssh-keyscan/Makefile
cvs rdiff -r1.1 -r1.2 basesrc/usr.bin/ssh/sshd/Makefile

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