Module Name: src
Committed By: adam
Date: Sun Nov 21 18:29:49 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh/dist: addrmatch.c auth-options.c
auth-options.h auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h
auth1.c auth2-hostbased.c auth2-none.c auth2-pubkey.c authfd.c
authfd.h authfile.c authfile.h bufaux.c buffer.c buffer.h
canohost.c channels.c channels.h clientloop.c clientloop.h dh.c
dns.c dns.h hostfile.c hostfile.h jpake.c kex.c kex.h kexdhs.c
kexgexs.c key.c key.h match.h misc.c misc.h monitor.c
monitor_fdpass.c monitor_wrap.c mux.c myproposal.h nchan.c packet.c
pathnames.h readconf.c readconf.h roaming_common.c scp.1 scp.c
servconf.c servconf.h session.c sftp-client.c sftp-client.h
sftp-common.c sftp-common.h sftp-server.8 sftp-server.c sftp.1
sftp.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-dss.c
ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8
ssh-keysign.c ssh-rsa.c ssh.1 ssh.c ssh.h ssh2.h ssh_config
ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config
sshd_config.5 sshpty.h sshtty.c version.h
Removed Files:
src/crypto/external/bsd/openssh/dist: README.smartcard scard.c scard.h
src/crypto/external/bsd/openssh/dist/scard: Makefile Ssh.bin.uu
Ssh.java
Log Message:
Resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openssh/dist/README.smartcard
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/addrmatch.c \
src/crypto/external/bsd/openssh/dist/auth-options.c \
src/crypto/external/bsd/openssh/dist/auth-options.h \
src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c \
src/crypto/external/bsd/openssh/dist/auth-rhosts.c \
src/crypto/external/bsd/openssh/dist/auth-rsa.c \
src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/auth.h \
src/crypto/external/bsd/openssh/dist/auth1.c \
src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \
src/crypto/external/bsd/openssh/dist/auth2-none.c \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/authfd.h \
src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/authfile.h \
src/crypto/external/bsd/openssh/dist/bufaux.c \
src/crypto/external/bsd/openssh/dist/buffer.c \
src/crypto/external/bsd/openssh/dist/buffer.h \
src/crypto/external/bsd/openssh/dist/channels.h \
src/crypto/external/bsd/openssh/dist/clientloop.h \
src/crypto/external/bsd/openssh/dist/dh.c \
src/crypto/external/bsd/openssh/dist/dns.c \
src/crypto/external/bsd/openssh/dist/dns.h \
src/crypto/external/bsd/openssh/dist/hostfile.c \
src/crypto/external/bsd/openssh/dist/hostfile.h \
src/crypto/external/bsd/openssh/dist/key.c \
src/crypto/external/bsd/openssh/dist/key.h \
src/crypto/external/bsd/openssh/dist/match.h \
src/crypto/external/bsd/openssh/dist/misc.h \
src/crypto/external/bsd/openssh/dist/monitor_fdpass.c \
src/crypto/external/bsd/openssh/dist/mux.c \
src/crypto/external/bsd/openssh/dist/myproposal.h \
src/crypto/external/bsd/openssh/dist/nchan.c \
src/crypto/external/bsd/openssh/dist/roaming_common.c \
src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/servconf.h \
src/crypto/external/bsd/openssh/dist/sftp-client.h \
src/crypto/external/bsd/openssh/dist/sftp-common.c \
src/crypto/external/bsd/openssh/dist/sftp-common.h \
src/crypto/external/bsd/openssh/dist/ssh-add.c \
src/crypto/external/bsd/openssh/dist/ssh-dss.c \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c \
src/crypto/external/bsd/openssh/dist/ssh-rsa.c \
src/crypto/external/bsd/openssh/dist/ssh.h \
src/crypto/external/bsd/openssh/dist/ssh2.h \
src/crypto/external/bsd/openssh/dist/sshpty.h \
src/crypto/external/bsd/openssh/dist/sshtty.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/canohost.c \
src/crypto/external/bsd/openssh/dist/channels.c \
src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/jpake.c \
src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/kexdhs.c \
src/crypto/external/bsd/openssh/dist/kexgexs.c \
src/crypto/external/bsd/openssh/dist/misc.c \
src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/packet.c \
src/crypto/external/bsd/openssh/dist/pathnames.h \
src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/scp.c \
src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/session.c \
src/crypto/external/bsd/openssh/dist/sftp-client.c \
src/crypto/external/bsd/openssh/dist/sftp-server.8 \
src/crypto/external/bsd/openssh/dist/sftp-server.c \
src/crypto/external/bsd/openssh/dist/sftp.c \
src/crypto/external/bsd/openssh/dist/ssh-add.1 \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1 \
src/crypto/external/bsd/openssh/dist/ssh-keygen.c \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.1 \
src/crypto/external/bsd/openssh/dist/ssh-keyscan.c \
src/crypto/external/bsd/openssh/dist/ssh-keysign.8 \
src/crypto/external/bsd/openssh/dist/ssh.c \
src/crypto/external/bsd/openssh/dist/ssh_config \
src/crypto/external/bsd/openssh/dist/sshconnect.c \
src/crypto/external/bsd/openssh/dist/sshd.c \
src/crypto/external/bsd/openssh/dist/sshd_config \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/openssh/dist/scard.c \
src/crypto/external/bsd/openssh/dist/scard.h
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/sftp.1 \
src/crypto/external/bsd/openssh/dist/ssh-agent.1 \
src/crypto/external/bsd/openssh/dist/ssh-agent.c \
src/crypto/external/bsd/openssh/dist/ssh_config.5 \
src/crypto/external/bsd/openssh/dist/sshconnect2.c \
src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openssh/dist/scard/Makefile \
src/crypto/external/bsd/openssh/dist/scard/Ssh.bin.uu
cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/openssh/dist/scard/Ssh.java
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
