Date: Sun, 5 Jun 2005 15:46:09 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh LICENCE acconfig.h auth-chall.c auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2-kbdint.c auth2.c authfile.c bufaux.c canohost.c channels.c channels.h cipher.c compat.c ... Message-ID: <200506051546.j55Fk9Jj065364@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
des 2005-06-05 15:46:09 UTC
FreeBSD src repository
Modified files:
crypto/openssh LICENCE acconfig.h auth-chall.c
auth-krb5.c auth-pam.c auth-pam.h
auth-passwd.c auth-rsa.c auth.c auth.h
auth1.c auth2-chall.c auth2-kbdint.c
auth2.c authfile.c bufaux.c canohost.c
channels.c channels.h cipher.c compat.c
compat.h configure.ac hostfile.c
includes.h key.c loginrec.c monitor.c
monitor.h monitor_wrap.c monitor_wrap.h
readconf.c readconf.h scp.c servconf.c
servconf.h session.c ssh-add.c
ssh-agent.c ssh-keyscan.c ssh.1 ssh.c
ssh.h ssh_config ssh_config.5
sshconnect.c sshd.8 sshd.c sshd_config
sshd_config.5 version.h
crypto/openssh/openbsd-compat fake-rfc2553.h
Log:
Resolve conflicts.
Revision Changes Path
1.7 +3 -2 src/crypto/openssh/LICENCE
1.11 +2 -5 src/crypto/openssh/acconfig.h
1.9 +8 -1 src/crypto/openssh/auth-chall.c
1.19 +6 -1 src/crypto/openssh/auth-krb5.c
1.16 +104 -65 src/crypto/openssh/auth-pam.c
1.11 +3 -2 src/crypto/openssh/auth-pam.h
1.19 +57 -9 src/crypto/openssh/auth-passwd.c
1.15 +5 -6 src/crypto/openssh/auth-rsa.c
1.17 +69 -17 src/crypto/openssh/auth.c
1.15 +9 -1 src/crypto/openssh/auth.h
1.32 +30 -5 src/crypto/openssh/auth1.c
1.10 +28 -9 src/crypto/openssh/auth2-chall.c
1.3 +2 -2 src/crypto/openssh/auth2-kbdint.c
1.25 +28 -5 src/crypto/openssh/auth2.c
1.18 +11 -6 src/crypto/openssh/authfile.c
1.16 +172 -45 src/crypto/openssh/bufaux.c
1.17 +14 -9 src/crypto/openssh/canohost.c
1.20 +78 -21 src/crypto/openssh/channels.c
1.13 +7 -4 src/crypto/openssh/channels.h
1.20 +6 -4 src/crypto/openssh/cipher.c
1.12 +13 -9 src/crypto/openssh/compat.c
1.13 +2 -1 src/crypto/openssh/compat.h
1.11 +385 -164 src/crypto/openssh/configure.ac
1.14 +117 -6 src/crypto/openssh/hostfile.c
1.19 +2 -2 src/crypto/openssh/includes.h
1.19 +27 -11 src/crypto/openssh/key.c
1.9 +461 -363 src/crypto/openssh/loginrec.c
1.17 +73 -4 src/crypto/openssh/monitor.c
1.6 +2 -1 src/crypto/openssh/monitor.h
1.10 +36 -1 src/crypto/openssh/monitor_wrap.c
1.8 +7 -1 src/crypto/openssh/monitor_wrap.h
1.6 +3 -2 src/crypto/openssh/openbsd-compat/fake-rfc2553.h
1.25 +134 -41 src/crypto/openssh/readconf.c
1.17 +10 -6 src/crypto/openssh/readconf.h
1.8 +10 -7 src/crypto/openssh/scp.c
1.46 +59 -38 src/crypto/openssh/servconf.c
1.17 +3 -2 src/crypto/openssh/servconf.h
1.46 +62 -11 src/crypto/openssh/session.c
1.15 +3 -3 src/crypto/openssh/ssh-add.c
1.24 +9 -23 src/crypto/openssh/ssh-agent.c
1.11 +14 -4 src/crypto/openssh/ssh-keyscan.c
1.31 +1 -2 src/crypto/openssh/ssh.1
1.28 +137 -65 src/crypto/openssh/ssh.c
1.26 +8 -1 src/crypto/openssh/ssh.h
1.27 +6 -4 src/crypto/openssh/ssh_config
1.17 +87 -18 src/crypto/openssh/ssh_config.5
1.29 +30 -28 src/crypto/openssh/sshconnect.c
1.31 +41 -13 src/crypto/openssh/sshd.8
1.39 +46 -33 src/crypto/openssh/sshd.c
1.42 +4 -3 src/crypto/openssh/sshd_config
1.23 +28 -15 src/crypto/openssh/sshd_config.5
1.29 +4 -3 src/crypto/openssh/version.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506051546.j55Fk9Jj065364>