Date: Sat, 3 Sep 2005 07:04:25 +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-rh-rsa.c auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-kbdint.c auth2.c authfd.c authfile.c bufaux.c canohost.c ... Message-ID: <200509030704.j8374QWP028152@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
des 2005-09-03 07:04:25 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-rh-rsa.c auth-rsa.c
auth-skey.c auth.c auth.h auth1.c
auth2-chall.c auth2-kbdint.c auth2.c
authfd.c authfile.c bufaux.c canohost.c
channels.c channels.h cipher.c compat.c
config.h configure.ac hostfile.c
includes.h key.c log.h loginrec.c
monitor.c monitor.h monitor_wrap.c
monitor_wrap.h myproposal.h packet.h
readconf.c readconf.h 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_config
ssh_config.5 sshconnect.c sshconnect1.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 mpaux.c mpaux.h tildexpand.c
Log:
Resolve conflicts.
Revision Changes Path
1.8 +2 -0 src/crypto/openssh/LICENCE
1.12 +2 -8 src/crypto/openssh/acconfig.h
1.10 +1 -1 src/crypto/openssh/auth-chall.c
1.20 +32 -27 src/crypto/openssh/auth-krb5.c
1.17 +31 -16 src/crypto/openssh/auth-pam.c
1.12 +1 -1 src/crypto/openssh/auth-pam.h
1.20 +4 -2 src/crypto/openssh/auth-passwd.c
1.13 +2 -2 src/crypto/openssh/auth-rh-rsa.c
1.16 +4 -2 src/crypto/openssh/auth-rsa.c
1.16 +2 -2 src/crypto/openssh/auth-skey.c
1.18 +27 -43 src/crypto/openssh/auth.c
1.16 +7 -3 src/crypto/openssh/auth.h
1.33 +196 -134 src/crypto/openssh/auth1.c
1.11 +6 -7 src/crypto/openssh/auth2-chall.c
1.4 +1 -1 src/crypto/openssh/auth2-kbdint.c
1.26 +2 -2 src/crypto/openssh/auth2.c
1.19 +6 -6 src/crypto/openssh/authfd.c
1.19 +9 -7 src/crypto/openssh/authfile.c
1.17 +3 -3 src/crypto/openssh/bufaux.c
1.18 +5 -4 src/crypto/openssh/canohost.c
1.21 +60 -46 src/crypto/openssh/channels.c
1.14 +5 -4 src/crypto/openssh/channels.h
1.21 +41 -61 src/crypto/openssh/cipher.c
1.13 +1 -1 src/crypto/openssh/compat.c
1.12 +1 -1 src/crypto/openssh/config.h
1.12 +334 -71 src/crypto/openssh/configure.ac
1.15 +2 -2 src/crypto/openssh/hostfile.c
1.20 +11 -2 src/crypto/openssh/includes.h
1.20 +2 -2 src/crypto/openssh/key.c
1.7 +1 -1 src/crypto/openssh/log.h
1.10 +21 -20 src/crypto/openssh/loginrec.c
1.18 +5 -5 src/crypto/openssh/monitor.c
1.7 +1 -1 src/crypto/openssh/monitor.h
1.11 +13 -14 src/crypto/openssh/monitor_wrap.c
1.9 +1 -1 src/crypto/openssh/monitor_wrap.h
1.10 +0 -46 src/crypto/openssh/mpaux.c (dead)
1.2 +0 -32 src/crypto/openssh/mpaux.h (dead)
1.8 +5 -4 src/crypto/openssh/myproposal.h
1.7 +12 -6 src/crypto/openssh/openbsd-compat/fake-rfc2553.h
1.15 +4 -2 src/crypto/openssh/packet.h
1.26 +28 -5 src/crypto/openssh/readconf.c
1.18 +6 -1 src/crypto/openssh/readconf.h
1.9 +23 -19 src/crypto/openssh/scp.c
1.47 +32 -6 src/crypto/openssh/servconf.c
1.18 +1 -1 src/crypto/openssh/servconf.h
1.14 +3 -3 src/crypto/openssh/serverloop.c
1.47 +122 -13 src/crypto/openssh/session.c
1.10 +3 -2 src/crypto/openssh/session.h
1.16 +2 -2 src/crypto/openssh/ssh-add.c
1.25 +1 -1 src/crypto/openssh/ssh-agent.c
1.12 +21 -13 src/crypto/openssh/ssh-keyscan.c
1.32 +57 -44 src/crypto/openssh/ssh.1
1.29 +94 -142 src/crypto/openssh/ssh.c
1.28 +2 -2 src/crypto/openssh/ssh_config
1.18 +67 -19 src/crypto/openssh/ssh_config.5
1.30 +22 -48 src/crypto/openssh/sshconnect.c
1.20 +2 -2 src/crypto/openssh/sshconnect1.c
1.16 +10 -8 src/crypto/openssh/sshconnect2.c
1.32 +17 -17 src/crypto/openssh/sshd.8
1.40 +27 -13 src/crypto/openssh/sshd.c
1.43 +5 -5 src/crypto/openssh/sshd_config
1.24 +23 -18 src/crypto/openssh/sshd_config.5
1.12 +2 -2 src/crypto/openssh/sshpty.c
1.2 +0 -66 src/crypto/openssh/tildexpand.c (dead)
1.31 +4 -4 src/crypto/openssh/version.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509030704.j8374QWP028152>