Date: Sat, 29 Jun 2002 04:49:00 -0700 (PDT) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh acconfig.h auth2-chall.c auth2-pam.c authfd.c authfile.c bufaux.c channels.c channels.h cipher.c configure.ac key.c monitor.c servconf.c serverloop.c session.c session.h ssh-agent.c ssh.1 ssh.h sshconnect.c ... Message-ID: <200206291149.g5TBn0kt070322@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
des 2002/06/29 04:49:00 PDT
Modified files:
crypto/openssh acconfig.h auth2-chall.c auth2-pam.c
authfd.c authfile.c bufaux.c channels.c
channels.h cipher.c configure.ac key.c
monitor.c servconf.c serverloop.c
session.c session.h ssh-agent.c ssh.1
ssh.h sshconnect.c sshconnect2.c sshd.8
sshd.c sshd_config.5 sshlogin.c sshpty.c
version.h
Log:
Resolve conflicts.
Sponsored by: DARPA, NAI Labs
Revision Changes Path
1.3 +7 -4 src/crypto/openssh/acconfig.h
1.6 +12 -6 src/crypto/openssh/auth2-chall.c
1.4 +11 -1 src/crypto/openssh/auth2-pam.c
1.12 +3 -2 src/crypto/openssh/authfd.c
1.12 +4 -3 src/crypto/openssh/authfile.c
1.12 +21 -5 src/crypto/openssh/bufaux.c
1.12 +19 -13 src/crypto/openssh/channels.c
1.8 +10 -9 src/crypto/openssh/channels.h
1.13 +14 -1 src/crypto/openssh/cipher.c
1.3 +33 -20 src/crypto/openssh/configure.ac
1.12 +9 -2 src/crypto/openssh/key.c
1.6 +16 -12 src/crypto/openssh/monitor.c
1.37 +12 -11 src/crypto/openssh/servconf.c
1.7 +3 -4 src/crypto/openssh/serverloop.c
1.34 +27 -14 src/crypto/openssh/session.c
1.4 +5 -4 src/crypto/openssh/session.h
1.15 +41 -42 src/crypto/openssh/ssh-agent.c
1.24 +3 -3 src/crypto/openssh/ssh.1
1.21 +4 -3 src/crypto/openssh/ssh.h
1.22 +3 -3 src/crypto/openssh/sshconnect.c
1.8 +9 -5 src/crypto/openssh/sshconnect2.c
1.23 +9 -2 src/crypto/openssh/sshd.8
1.30 +38 -11 src/crypto/openssh/sshd.c
1.5 +8 -2 src/crypto/openssh/sshd_config.5
1.6 +4 -6 src/crypto/openssh/sshlogin.c
1.5 +9 -8 src/crypto/openssh/sshpty.c
1.16 +3 -3 src/crypto/openssh/version.h
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206291149.g5TBn0kt070322>