From owner-cvs-src@FreeBSD.ORG Sat Sep 30 13:38:07 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4C5E16A412; Sat, 30 Sep 2006 13:38:07 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7600143D45; Sat, 30 Sep 2006 13:38:07 +0000 (GMT) (envelope-from des@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8UDc7vA066031; Sat, 30 Sep 2006 13:38:07 GMT (envelope-from des@repoman.freebsd.org) Received: (from des@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8UDc79a066030; Sat, 30 Sep 2006 13:38:07 GMT (envelope-from des) Message-Id: <200609301338.k8UDc79a066030@repoman.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 30 Sep 2006 13:38:07 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/crypto/openssh LICENCE auth-chall.c auth-krb5.c auth-pam.c 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 ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Sep 2006 13:38:07 -0000 des 2006-09-30 13:38:07 UTC FreeBSD src repository Modified files: crypto/openssh LICENCE auth-chall.c auth-krb5.c auth-pam.c 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 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 myproposal.h packet.h pathnames.h readconf.c readconf.h rsa.c rsa.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.h ssh_config ssh_config.5 ssh_namespace.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshlogin.c sshlogin.h sshpty.c version.h crypto/openssh/openbsd-compat fake-rfc2553.h Log: Merge conflicts. MFC after: 1 week Revision Changes Path 1.9 +2 -0 src/crypto/openssh/LICENCE 1.11 +9 -3 src/crypto/openssh/auth-chall.c 1.22 +13 -3 src/crypto/openssh/auth-krb5.c 1.19 +64 -23 src/crypto/openssh/auth-pam.c 1.21 +11 -2 src/crypto/openssh/auth-passwd.c 1.14 +10 -2 src/crypto/openssh/auth-rh-rsa.c 1.17 +17 -4 src/crypto/openssh/auth-rsa.c 1.17 +16 -13 src/crypto/openssh/auth-skey.c 1.19 +44 -50 src/crypto/openssh/auth.c 1.17 +6 -6 src/crypto/openssh/auth.h 1.34 +21 -3 src/crypto/openssh/auth1.c 1.12 +13 -4 src/crypto/openssh/auth2-chall.c 1.5 +10 -3 src/crypto/openssh/auth2-kbdint.c 1.28 +16 -5 src/crypto/openssh/auth2.c 1.20 +19 -10 src/crypto/openssh/authfd.c 1.20 +22 -10 src/crypto/openssh/authfile.c 1.19 +16 -173 src/crypto/openssh/bufaux.c 1.20 +21 -7 src/crypto/openssh/canohost.c 1.23 +183 -91 src/crypto/openssh/channels.c 1.16 +5 -5 src/crypto/openssh/channels.h 1.23 +8 -3 src/crypto/openssh/cipher.c 1.14 +1 -1 src/crypto/openssh/cipher.h 1.14 +9 -3 src/crypto/openssh/compat.c 1.14 +1 -1 src/crypto/openssh/compat.h 1.14 +299 -98 src/crypto/openssh/configure.ac 1.17 +15 -5 src/crypto/openssh/hostfile.c 1.22 +13 -55 src/crypto/openssh/includes.h 1.21 +16 -24 src/crypto/openssh/key.c 1.8 +3 -4 src/crypto/openssh/log.h 1.14 +20 -4 src/crypto/openssh/loginrec.c 1.21 +62 -21 src/crypto/openssh/monitor.c 1.8 +2 -2 src/crypto/openssh/monitor.h 1.13 +34 -25 src/crypto/openssh/monitor_wrap.c 1.10 +4 -8 src/crypto/openssh/monitor_wrap.h 1.9 +17 -3 src/crypto/openssh/myproposal.h 1.8 +5 -2 src/crypto/openssh/openbsd-compat/fake-rfc2553.h 1.16 +3 -1 src/crypto/openssh/packet.h 1.9 +1 -1 src/crypto/openssh/pathnames.h 1.28 +52 -10 src/crypto/openssh/readconf.c 1.20 +2 -3 src/crypto/openssh/readconf.h 1.13 +7 -2 src/crypto/openssh/rsa.c 1.11 +1 -1 src/crypto/openssh/rsa.h 1.11 +57 -27 src/crypto/openssh/scp.c 1.49 +402 -103 src/crypto/openssh/servconf.c 1.20 +15 -6 src/crypto/openssh/servconf.h 1.16 +48 -10 src/crypto/openssh/serverloop.c 1.49 +74 -33 src/crypto/openssh/session.c 1.11 +5 -2 src/crypto/openssh/session.h 1.18 +28 -9 src/crypto/openssh/ssh-add.c 1.27 +47 -21 src/crypto/openssh/ssh-agent.c 1.14 +30 -16 src/crypto/openssh/ssh-keyscan.c 1.34 +91 -32 src/crypto/openssh/ssh.1 1.31 +102 -45 src/crypto/openssh/ssh.c 1.27 +1 -15 src/crypto/openssh/ssh.h 1.30 +4 -2 src/crypto/openssh/ssh_config 1.20 +198 -104 src/crypto/openssh/ssh_config.5 1.2 +18 -2 src/crypto/openssh/ssh_namespace.h 1.32 +89 -54 src/crypto/openssh/sshconnect.c 1.9 +13 -13 src/crypto/openssh/sshconnect.h 1.22 +21 -9 src/crypto/openssh/sshconnect1.c 1.18 +34 -24 src/crypto/openssh/sshconnect2.c 1.34 +274 -286 src/crypto/openssh/sshd.8 1.43 +429 -347 src/crypto/openssh/sshd.c 1.45 +16 -9 src/crypto/openssh/sshd_config 1.26 +216 -96 src/crypto/openssh/sshd_config.5 1.13 +20 -6 src/crypto/openssh/sshlogin.c 1.5 +3 -8 src/crypto/openssh/sshlogin.h 1.13 +26 -5 src/crypto/openssh/sshpty.c 1.33 +3 -3 src/crypto/openssh/version.h