Module Name:	basesrc
Committed By:	itojun
Date:		Tue Nov 27 04:10:26 UTC 2001

Modified Files:
	basesrc/crypto/dist/ssh: auth.c auth2.c channels.h clientloop.c
	    deattack.c key.c packet.c radix.c readconf.c readpass.c servconf.c
	    serverloop.c ssh-agent.1 ssh-agent.c ssh-dss.c ssh-keygen.1
	    ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.1 sshconnect2.c sshd.8
	    sshd.c

Log Message:
resolve conflicts on 3.0.1 import


To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 basesrc/crypto/dist/ssh/auth.c
cvs rdiff -r1.11 -r1.12 basesrc/crypto/dist/ssh/auth2.c \
    basesrc/crypto/dist/ssh/ssh-agent.c
cvs rdiff -r1.5 -r1.6 basesrc/crypto/dist/ssh/channels.h \
    basesrc/crypto/dist/ssh/radix.c
cvs rdiff -r1.12 -r1.13 basesrc/crypto/dist/ssh/clientloop.c \
    basesrc/crypto/dist/ssh/packet.c basesrc/crypto/dist/ssh/readconf.c \
    basesrc/crypto/dist/ssh/servconf.c basesrc/crypto/dist/ssh/serverloop.c \
    basesrc/crypto/dist/ssh/ssh-keygen.c \
    basesrc/crypto/dist/ssh/ssh-keyscan.c
cvs rdiff -r1.8 -r1.9 basesrc/crypto/dist/ssh/deattack.c \
    basesrc/crypto/dist/ssh/ssh-agent.1
cvs rdiff -r1.10 -r1.11 basesrc/crypto/dist/ssh/key.c \
    basesrc/crypto/dist/ssh/ssh-keygen.1
cvs rdiff -r1.7 -r1.8 basesrc/crypto/dist/ssh/readpass.c
cvs rdiff -r1.6 -r1.7 basesrc/crypto/dist/ssh/ssh-dss.c \
    basesrc/crypto/dist/ssh/ssh-rsa.c
cvs rdiff -r1.15 -r1.16 basesrc/crypto/dist/ssh/ssh.1
cvs rdiff -r1.13 -r1.14 basesrc/crypto/dist/ssh/sshconnect2.c
cvs rdiff -r1.17 -r1.18 basesrc/crypto/dist/ssh/sshd.8
cvs rdiff -r1.14 -r1.15 basesrc/crypto/dist/ssh/sshd.c

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