Date: Fri, 10 Nov 2006 16:52:41 +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 audit-bsm.c auth-rsa.c auth.c bufaux.h configure.ac key.c monitor.c rsa.c serverloop.c session.c ssh-agent.c ssh-keyscan.c ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c sshconnect1.c sshd.c sshd_config sshd_config.5 ... Message-ID: <200611101652.kAAGqgpN068293@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
des 2006-11-10 16:52:41 UTC
FreeBSD src repository
Modified files:
crypto/openssh audit-bsm.c auth-rsa.c auth.c
configure.ac key.c monitor.c rsa.c
serverloop.c session.c ssh-agent.c
ssh-keyscan.c ssh.1 ssh.c ssh_config
ssh_config.5 sshconnect.c sshconnect1.c
sshd.c sshd_config sshd_config.5
version.h
Removed files:
crypto/openssh bufaux.h
Log:
Resolve conflicts.
Revision Changes Path
1.3 +2 -2 src/crypto/openssh/audit-bsm.c
1.18 +6 -4 src/crypto/openssh/auth-rsa.c
1.20 +1 -3 src/crypto/openssh/auth.c
1.2 +0 -55 src/crypto/openssh/bufaux.h (dead)
1.17 +5 -2 src/crypto/openssh/configure.ac
1.22 +9 -7 src/crypto/openssh/key.c
1.22 +5 -5 src/crypto/openssh/monitor.c
1.14 +10 -8 src/crypto/openssh/rsa.c
1.17 +5 -3 src/crypto/openssh/serverloop.c
1.50 +2 -2 src/crypto/openssh/session.c
1.28 +2 -2 src/crypto/openssh/ssh-agent.c
1.15 +1 -1 src/crypto/openssh/ssh-keyscan.c
1.35 +17 -7 src/crypto/openssh/ssh.1
1.32 +2 -2 src/crypto/openssh/ssh.c
1.32 +2 -2 src/crypto/openssh/ssh_config
1.22 +2 -2 src/crypto/openssh/ssh_config.5
1.33 +5 -6 src/crypto/openssh/sshconnect.c
1.23 +14 -8 src/crypto/openssh/sshconnect1.c
1.45 +15 -11 src/crypto/openssh/sshd.c
1.47 +2 -2 src/crypto/openssh/sshd_config
1.28 +2 -2 src/crypto/openssh/sshd_config.5
1.35 +4 -4 src/crypto/openssh/version.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611101652.kAAGqgpN068293>