Date: Thu, 26 Feb 2004 02:52:33 -0800 (PST) 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-rh-rsa.c auth-rsa.c auth.c auth.h auth1.c auth2.c authfd.c authfile.c... Message-ID: <200402261052.i1QAqXai041849@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
des 2004/02/26 02:52:33 PST
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-rh-rsa.c auth-rsa.c
auth.c auth.h auth1.c auth2.c authfd.c
authfile.c bufaux.c canohost.c channels.h
cipher.c cipher.h compat.c compat.h
configure.ac hostfile.c includes.h key.c
log.h loginrec.c monitor.c monitor.h
monitor_wrap.c monitor_wrap.h pathnames.h
readconf.c readconf.h rijndael.c scp.c
servconf.c servconf.h serverloop.c
session.c session.h ssh-add.c ssh-agent.c
ssh-keyscan.c ssh.1 ssh.c ssh.h
ssh_config.5 sshconnect.c sshconnect2.c
sshd.8 sshd.c sshd_config sshd_config.5
sshpty.c version.h
crypto/openssh/openbsd-compat fake-rfc2553.h
Removed files:
crypto/openssh sftp-glob.h sftp-int.c sftp-int.h
Log:
Resolve conflicts.
Revision Changes Path
1.6 +22 -22 src/crypto/openssh/LICENCE
1.8 +20 -5 src/crypto/openssh/acconfig.h
1.8 +25 -23 src/crypto/openssh/auth-chall.c
1.16 +15 -22 src/crypto/openssh/auth-krb5.c
1.13 +311 -122 src/crypto/openssh/auth-pam.c
1.8 +5 -4 src/crypto/openssh/auth-pam.h
1.16 +68 -75 src/crypto/openssh/auth-passwd.c
1.12 +4 -3 src/crypto/openssh/auth-rh-rsa.c
1.13 +4 -3 src/crypto/openssh/auth-rsa.c
1.15 +15 -52 src/crypto/openssh/auth.c
1.12 +15 -10 src/crypto/openssh/auth.h
1.29 +8 -12 src/crypto/openssh/auth1.c
1.22 +4 -21 src/crypto/openssh/auth2.c
1.17 +7 -6 src/crypto/openssh/authfd.c
1.16 +2 -1 src/crypto/openssh/authfile.c
1.15 +23 -22 src/crypto/openssh/bufaux.c
1.14 +33 -27 src/crypto/openssh/canohost.c
1.11 +1 -2 src/crypto/openssh/channels.h
1.18 +23 -10 src/crypto/openssh/cipher.c
1.12 +6 -6 src/crypto/openssh/cipher.h
1.11 +3 -7 src/crypto/openssh/compat.c
1.11 +1 -2 src/crypto/openssh/compat.h
1.8 +336 -223 src/crypto/openssh/configure.ac
1.13 +5 -5 src/crypto/openssh/hostfile.c
1.17 +16 -1 src/crypto/openssh/includes.h
1.17 +21 -19 src/crypto/openssh/key.c
1.5 +3 -8 src/crypto/openssh/log.h
1.6 +9 -4 src/crypto/openssh/loginrec.c
1.14 +47 -18 src/crypto/openssh/monitor.c
1.5 +4 -3 src/crypto/openssh/monitor.h
1.7 +44 -9 src/crypto/openssh/monitor_wrap.c
1.5 +6 -3 src/crypto/openssh/monitor_wrap.h
1.3 +6 -2 src/crypto/openssh/openbsd-compat/fake-rfc2553.h
1.7 +6 -1 src/crypto/openssh/pathnames.h
1.21 +41 -18 src/crypto/openssh/readconf.c
1.14 +6 -3 src/crypto/openssh/readconf.h
1.6 +67 -67 src/crypto/openssh/rijndael.c
1.6 +12 -10 src/crypto/openssh/scp.c
1.44 +26 -11 src/crypto/openssh/servconf.c
1.15 +5 -3 src/crypto/openssh/servconf.h
1.12 +28 -32 src/crypto/openssh/serverloop.c
1.43 +192 -101 src/crypto/openssh/session.c
1.8 +3 -2 src/crypto/openssh/session.h
1.2 +0 -32 src/crypto/openssh/sftp-glob.h (dead)
1.2 +0 -917 src/crypto/openssh/sftp-int.c (dead)
1.2 +0 -27 src/crypto/openssh/sftp-int.h (dead)
1.13 +4 -4 src/crypto/openssh/ssh-add.c
1.21 +10 -11 src/crypto/openssh/ssh-agent.c
1.8 +4 -6 src/crypto/openssh/ssh-keyscan.c
1.28 +281 -211 src/crypto/openssh/ssh.1
1.25 +78 -35 src/crypto/openssh/ssh.c
1.25 +4 -1 src/crypto/openssh/ssh.h
1.12 +95 -26 src/crypto/openssh/ssh_config.5
1.27 +56 -49 src/crypto/openssh/sshconnect.c
1.13 +102 -83 src/crypto/openssh/sshconnect2.c
1.29 +44 -43 src/crypto/openssh/sshd.8
1.36 +65 -45 src/crypto/openssh/sshd.c
1.37 +7 -6 src/crypto/openssh/sshd_config
1.17 +31 -30 src/crypto/openssh/sshd_config.5
1.10 +2 -192 src/crypto/openssh/sshpty.c
1.25 +4 -4 src/crypto/openssh/version.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402261052.i1QAqXai041849>