From owner-cvs-all@FreeBSD.ORG Wed Apr 23 10:10:55 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E59537B401; Wed, 23 Apr 2003 10:10:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D062C43FE5; Wed, 23 Apr 2003 10:10:54 -0700 (PDT) (envelope-from des@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3NHAs0U089493; Wed, 23 Apr 2003 10:10:54 -0700 (PDT) (envelope-from des@repoman.freebsd.org) Received: (from des@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3NHAs8J089487; Wed, 23 Apr 2003 10:10:54 -0700 (PDT) Message-Id: <200304231710.h3NHAs8J089487@repoman.freebsd.org> From: Dag-Erling Smorgrav Date: Wed, 23 Apr 2003 10:10:54 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/crypto/openssh auth-krb4.c auth-krb5.c auth-pam.c auth-passwd.c auth.c auth1.c auth2-pam.c auth2.c authfd.c authfile.c bufaux.c canohost.c channels.c cipher.c compat.c compat.h includes.h key.c loginrec.c monitor.c monitor_wrap.c ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2003 17:10:56 -0000 des 2003/04/23 10:10:54 PDT FreeBSD src repository Modified files: crypto/openssh auth-krb4.c auth-krb5.c auth-pam.c auth-passwd.c auth.c auth1.c auth2-pam.c auth2.c authfd.c authfile.c bufaux.c canohost.c channels.c cipher.c compat.c compat.h includes.h key.c loginrec.c monitor.c monitor_wrap.c packet.h readconf.c readconf.h scp.c servconf.c serverloop.c session.c ssh-add.c ssh-agent.c ssh-dss.h ssh-keyscan.c ssh-rsa.h ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshpty.c version.h Log: Resolve conflicts. Revision Changes Path 1.14 +3 -3 src/crypto/openssh/auth-krb4.c 1.14 +3 -3 src/crypto/openssh/auth-krb5.c 1.10 +2 -10 src/crypto/openssh/auth-pam.c 1.14 +44 -45 src/crypto/openssh/auth-passwd.c 1.13 +33 -19 src/crypto/openssh/auth.c 1.27 +4 -6 src/crypto/openssh/auth1.c 1.6 +3 -4 src/crypto/openssh/auth2-pam.c 1.20 +3 -4 src/crypto/openssh/auth2.c 1.14 +7 -5 src/crypto/openssh/authfd.c 1.13 +28 -6 src/crypto/openssh/authfile.c 1.13 +3 -3 src/crypto/openssh/bufaux.c 1.11 +20 -7 src/crypto/openssh/canohost.c 1.14 +15 -10 src/crypto/openssh/channels.c 1.15 +3 -3 src/crypto/openssh/cipher.c 1.9 +14 -10 src/crypto/openssh/compat.c 1.8 +3 -2 src/crypto/openssh/compat.h 1.15 +5 -1 src/crypto/openssh/includes.h 1.14 +4 -6 src/crypto/openssh/key.c 1.4 +56 -13 src/crypto/openssh/loginrec.c 1.12 +27 -17 src/crypto/openssh/monitor.c 1.5 +23 -11 src/crypto/openssh/monitor_wrap.c 1.12 +1 -1 src/crypto/openssh/packet.h 1.19 +16 -12 src/crypto/openssh/readconf.c 1.12 +3 -1 src/crypto/openssh/readconf.h 1.3 +137 -201 src/crypto/openssh/scp.c 1.39 +3 -2 src/crypto/openssh/servconf.c 1.9 +2 -2 src/crypto/openssh/serverloop.c 1.40 +44 -15 src/crypto/openssh/session.c 1.10 +21 -7 src/crypto/openssh/ssh-add.c 1.18 +71 -10 src/crypto/openssh/ssh-agent.c 1.2 +0 -41 src/crypto/openssh/ssh-dss.h 1.5 +4 -2 src/crypto/openssh/ssh-keyscan.c 1.2 +0 -41 src/crypto/openssh/ssh-rsa.h 1.26 +21 -15 src/crypto/openssh/ssh.1 1.23 +12 -9 src/crypto/openssh/ssh.c 1.21 +2 -2 src/crypto/openssh/ssh_config 1.9 +29 -22 src/crypto/openssh/ssh_config.5 1.24 +7 -7 src/crypto/openssh/sshconnect.c 1.10 +21 -21 src/crypto/openssh/sshconnect2.c 1.27 +16 -11 src/crypto/openssh/sshd.8 1.33 +24 -10 src/crypto/openssh/sshd.c 1.32 +2 -2 src/crypto/openssh/sshd_config 1.11 +20 -16 src/crypto/openssh/sshd_config.5 1.7 +4 -4 src/crypto/openssh/sshpty.c 1.20 +4 -4 src/crypto/openssh/version.h