Date: Tue, 20 Apr 2004 02:46:42 -0700 (PDT) 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 acconfig.h auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-skey.c auth.h auth1.c auth2.c canohost.c configure.ac loginrec.c monitor.c monitor_wrap.c monitor_wrap.h readconf.c readconf.h session.c ssh-agent.c ... Message-ID: <200404200946.i3K9kg9v022019@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
des 2004/04/20 02:46:41 PDT
FreeBSD src repository
Modified files:
crypto/openssh acconfig.h auth-krb5.c auth-pam.c
auth-pam.h auth-passwd.c auth-skey.c
auth.h auth1.c auth2.c canohost.c
configure.ac loginrec.c monitor.c
monitor_wrap.c monitor_wrap.h readconf.c
readconf.h session.c ssh-agent.c
ssh-keyscan.c ssh.1 ssh.c ssh_config.5
sshconnect2.c sshd.c sshd_config.5
sshlogin.c version.h
crypto/openssh/openbsd-compat fake-rfc2553.h
Log:
Resolve conflicts.
Revision Changes Path
1.9 +11 -2 src/crypto/openssh/acconfig.h
1.17 +9 -1 src/crypto/openssh/auth-krb5.c
1.14 +26 -15 src/crypto/openssh/auth-pam.c
1.9 +3 -3 src/crypto/openssh/auth-pam.h
1.17 +1 -8 src/crypto/openssh/auth-passwd.c
1.15 +3 -2 src/crypto/openssh/auth-skey.c
1.13 +2 -1 src/crypto/openssh/auth.h
1.30 +2 -2 src/crypto/openssh/auth1.c
1.23 +4 -4 src/crypto/openssh/auth2.c
1.15 +3 -3 src/crypto/openssh/canohost.c
1.9 +111 -12 src/crypto/openssh/configure.ac
1.7 +2 -2 src/crypto/openssh/loginrec.c
1.15 +10 -9 src/crypto/openssh/monitor.c
1.8 +8 -4 src/crypto/openssh/monitor_wrap.c
1.6 +2 -2 src/crypto/openssh/monitor_wrap.h
1.4 +4 -1 src/crypto/openssh/openbsd-compat/fake-rfc2553.h
1.22 +13 -1 src/crypto/openssh/readconf.c
1.15 +2 -1 src/crypto/openssh/readconf.h
1.44 +11 -3 src/crypto/openssh/session.c
1.22 +10 -1 src/crypto/openssh/ssh-agent.c
1.9 +2 -2 src/crypto/openssh/ssh-keyscan.c
1.29 +2 -1 src/crypto/openssh/ssh.1
1.26 +10 -51 src/crypto/openssh/ssh.c
1.15 +19 -1 src/crypto/openssh/ssh_config.5
1.14 +2 -2 src/crypto/openssh/sshconnect2.c
1.37 +18 -27 src/crypto/openssh/sshd.c
1.21 +9 -2 src/crypto/openssh/sshd_config.5
1.11 +18 -18 src/crypto/openssh/sshlogin.c
1.27 +1 -1 src/crypto/openssh/version.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404200946.i3K9kg9v022019>