[Midnightbsd-cvs] src: crypto/openssh: Resolve conflicts
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 2 12:51:52 EDT 2009
Log Message:
-----------
Resolve conflicts
Modified Files:
--------------
src/crypto/openssh:
ChangeLog (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ChangeLog?r1=1.5&r2=1.6)
Makefile.in (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/Makefile.in?r1=1.5&r2=1.6)
README (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/README?r1=1.5&r2=1.6)
auth-options.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth-options.c?r1=1.4&r2=1.5)
auth-rh-rsa.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth-rh-rsa.c?r1=1.2&r2=1.3)
auth-rsa.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth-rsa.c?r1=1.2&r2=1.3)
auth.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth.c?r1=1.5&r2=1.6)
auth.h (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth.h?r1=1.5&r2=1.6)
auth1.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth1.c?r1=1.5&r2=1.6)
auth2-chall.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth2-chall.c?r1=1.5&r2=1.6)
auth2-hostbased.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth2-hostbased.c?r1=1.2&r2=1.3)
auth2-pubkey.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth2-pubkey.c?r1=1.2&r2=1.3)
auth2.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth2.c?r1=1.5&r2=1.6)
authfile.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/authfile.c?r1=1.2&r2=1.3)
authfile.h (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/authfile.h?r1=1.2&r2=1.3)
bufaux.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/bufaux.c?r1=1.4&r2=1.5)
canohost.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/canohost.c?r1=1.4&r2=1.5)
channels.c (r1.6 -> r1.7)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/channels.c?r1=1.6&r2=1.7)
channels.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/channels.h?r1=1.4&r2=1.5)
cipher.c (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/cipher.c?r1=1.3&r2=1.4)
clientloop.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/clientloop.c?r1=1.5&r2=1.6)
compat.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/compat.c?r1=1.4&r2=1.5)
config.guess (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/config.guess?r1=1.3&r2=1.4)
config.sub (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/config.sub?r1=1.3&r2=1.4)
configure.ac (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/configure.ac?r1=1.5&r2=1.6)
defines.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/defines.h?r1=1.4&r2=1.5)
dns.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/dns.c?r1=1.4&r2=1.5)
gss-serv.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/gss-serv.c?r1=1.4&r2=1.5)
includes.h (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/includes.h?r1=1.5&r2=1.6)
kex.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/kex.c?r1=1.5&r2=1.6)
kexgexs.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/kexgexs.c?r1=1.4&r2=1.5)
log.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/log.h?r1=1.4&r2=1.5)
loginrec.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/loginrec.c?r1=1.5&r2=1.6)
misc.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/misc.c?r1=1.5&r2=1.6)
misc.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/misc.h?r1=1.4&r2=1.5)
monitor.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor.c?r1=1.5&r2=1.6)
monitor.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor.h?r1=1.4&r2=1.5)
monitor_wrap.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor_wrap.c?r1=1.5&r2=1.6)
monitor_wrap.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor_wrap.h?r1=1.4&r2=1.5)
myproposal.h (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/myproposal.h?r1=1.5&r2=1.6)
packet.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/packet.c?r1=1.5&r2=1.6)
pathnames.h (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/pathnames.h?r1=1.3&r2=1.4)
readconf.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/readconf.c?r1=1.5&r2=1.6)
readconf.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/readconf.h?r1=1.4&r2=1.5)
scp.1 (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/scp.1?r1=1.4&r2=1.5)
scp.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/scp.c?r1=1.5&r2=1.6)
servconf.c (r1.6 -> r1.7)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/servconf.c?r1=1.6&r2=1.7)
servconf.h (r1.6 -> r1.7)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/servconf.h?r1=1.6&r2=1.7)
serverloop.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/serverloop.c?r1=1.5&r2=1.6)
session.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/session.c?r1=1.5&r2=1.6)
sftp-client.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp-client.c?r1=1.5&r2=1.6)
sftp-server.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp-server.c?r1=1.5&r2=1.6)
sftp.1 (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp.1?r1=1.3&r2=1.4)
sftp.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp.c?r1=1.5&r2=1.6)
ssh-agent.1 (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-agent.1?r1=1.4&r2=1.5)
ssh-agent.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-agent.c?r1=1.5&r2=1.6)
ssh-keygen.1 (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-keygen.1?r1=1.4&r2=1.5)
ssh-keygen.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-keygen.c?r1=1.5&r2=1.6)
ssh-keyscan.1 (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-keyscan.1?r1=1.4&r2=1.5)
ssh-keyscan.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-keyscan.c?r1=1.5&r2=1.6)
ssh.1 (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh.1?r1=1.4&r2=1.5)
ssh.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh.c?r1=1.5&r2=1.6)
ssh_config (r1.7 -> r1.8)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh_config?r1=1.7&r2=1.8)
ssh_config.5 (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh_config.5?r1=1.5&r2=1.6)
sshconnect.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshconnect.c?r1=1.5&r2=1.6)
sshconnect2.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshconnect2.c?r1=1.4&r2=1.5)
sshd.8 (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd.8?r1=1.5&r2=1.6)
sshd.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd.c?r1=1.8&r2=1.9)
sshd_config (r1.7 -> r1.8)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd_config?r1=1.7&r2=1.8)
sshd_config.5 (r1.6 -> r1.7)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd_config.5?r1=1.6&r2=1.7)
version.h (r1.11 -> r1.12)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/version.h?r1=1.11&r2=1.12)
src/crypto/openssh/openbsd-compat:
Makefile.in (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/Makefile.in?r1=1.4&r2=1.5)
bindresvport.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/bindresvport.c?r1=1.4&r2=1.5)
fake-rfc2553.h (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/fake-rfc2553.h?r1=1.5&r2=1.6)
openbsd-compat.h (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/openbsd-compat.h?r1=1.4&r2=1.5)
port-tun.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/port-tun.c?r1=1.2&r2=1.3)
port-uw.c (r1.4 -> r1.5)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/port-uw.c?r1=1.4&r2=1.5)
rresvport.c (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/rresvport.c?r1=1.3&r2=1.4)
setenv.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/setenv.c?r1=1.2&r2=1.3)
sigact.c (r1.2 -> r1.3)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/sigact.c?r1=1.2&r2=1.3)
src/crypto/openssh/regress:
test-exec.sh (r1.3 -> r1.4)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/regress/test-exec.sh?r1=1.3&r2=1.4)
Removed Files:
-------------
src/crypto/openssh:
MIDNIGHTBSD-Xlist
(http://cvsweb.midnightbsd.org/src/crypto/openssh/MIDNIGHTBSD-Xlist)
MIDNIGHTBSD-tricks
(http://cvsweb.midnightbsd.org/src/crypto/openssh/MIDNIGHTBSD-tricks)
MIDNIGHTBSD-upgrade
(http://cvsweb.midnightbsd.org/src/crypto/openssh/MIDNIGHTBSD-upgrade)
Makefile.inc
(http://cvsweb.midnightbsd.org/src/crypto/openssh/Makefile.inc)
README.compromised-keys
(http://cvsweb.midnightbsd.org/src/crypto/openssh/README.compromised-keys)
RFC.nroff
(http://cvsweb.midnightbsd.org/src/crypto/openssh/RFC.nroff)
blacklist.DSA-1024
(http://cvsweb.midnightbsd.org/src/crypto/openssh/blacklist.DSA-1024)
blacklist.RSA-2048
(http://cvsweb.midnightbsd.org/src/crypto/openssh/blacklist.RSA-2048)
config.h
(http://cvsweb.midnightbsd.org/src/crypto/openssh/config.h)
config.h.in
(http://cvsweb.midnightbsd.org/src/crypto/openssh/config.h.in)
configure
(http://cvsweb.midnightbsd.org/src/crypto/openssh/configure)
configure.lineno
(http://cvsweb.midnightbsd.org/src/crypto/openssh/configure.lineno)
ssh-vulnkey.1
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-vulnkey.1)
ssh-vulnkey.c
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-vulnkey.c)
ssh_namespace.h
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh_namespace.h)
version.c
(http://cvsweb.midnightbsd.org/src/crypto/openssh/version.c)
More information about the Midnightbsd-cvs
mailing list