From owner-cvs-all Tue Oct 29 2:17:15 2002 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 2C76337B401; Tue, 29 Oct 2002 02:17:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5D1C43E42; Tue, 29 Oct 2002 02:17:12 -0800 (PST) (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 g9TAG3mV094861; Tue, 29 Oct 2002 02:16:03 -0800 (PST) (envelope-from des@repoman.freebsd.org) Received: (from des@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9TAG3PV094860; Tue, 29 Oct 2002 02:16:03 -0800 (PST) Message-Id: <200210291016.g9TAG3PV094860@repoman.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 29 Oct 2002 02:16:03 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh acconfig.h auth-krb4.c auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-pam-freebsd.c auth2-pam.c auth2.c authfd.c canohost.c channels.c channels.h cipher.c compat.c ... X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG des 2002/10/29 02:16:03 PST Modified files: crypto/openssh acconfig.h auth-krb4.c auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2-pam-freebsd.c auth2-pam.c auth2.c authfd.c canohost.c channels.c channels.h cipher.c compat.c compat.h configure.ac hostfile.c includes.h key.c loginrec.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h readconf.c rijndael.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 sshconnect.c sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshlogin.c sshlogin.h sshpty.c version.c version.h Log: Resolve conflicts. Revision Changes Path 1.4 +10 -7 src/crypto/openssh/acconfig.h 1.13 +7 -12 src/crypto/openssh/auth-krb4.c 1.13 +9 -12 src/crypto/openssh/auth-krb5.c 1.9 +47 -17 src/crypto/openssh/auth-pam.c 1.5 +30 -2 src/crypto/openssh/auth-pam.h 1.13 +14 -2 src/crypto/openssh/auth-passwd.c 1.14 +2 -2 src/crypto/openssh/auth-skey.c 1.12 +16 -3 src/crypto/openssh/auth.c 1.9 +3 -3 src/crypto/openssh/auth.h 1.25 +37 -13 src/crypto/openssh/auth1.c 1.7 +2 -2 src/crypto/openssh/auth2-chall.c 1.5 +10 -10 src/crypto/openssh/auth2-pam-freebsd.c 1.5 +5 -6 src/crypto/openssh/auth2-pam.c 1.18 +17 -11 src/crypto/openssh/auth2.c 1.13 +19 -1 src/crypto/openssh/authfd.c 1.10 +16 -11 src/crypto/openssh/canohost.c 1.13 +25 -9 src/crypto/openssh/channels.c 1.9 +1 -0 src/crypto/openssh/channels.h 1.14 +17 -2 src/crypto/openssh/cipher.c 1.8 +6 -3 src/crypto/openssh/compat.c 1.7 +3 -1 src/crypto/openssh/compat.h 1.5 +140 -77 src/crypto/openssh/configure.ac 1.10 +37 -8 src/crypto/openssh/hostfile.c 1.14 +11 -0 src/crypto/openssh/includes.h 1.13 +15 -15 src/crypto/openssh/key.c 1.3 +5 -4 src/crypto/openssh/loginrec.c 1.10 +112 -14 src/crypto/openssh/monitor.c 1.3 +3 -1 src/crypto/openssh/monitor.h 1.4 +87 -17 src/crypto/openssh/monitor_wrap.c 1.3 +12 -2 src/crypto/openssh/monitor_wrap.h 1.18 +1 -1 src/crypto/openssh/readconf.c 1.4 +3 -2 src/crypto/openssh/rijndael.c 1.38 +11 -3 src/crypto/openssh/servconf.c 1.13 +3 -1 src/crypto/openssh/servconf.h 1.8 +14 -5 src/crypto/openssh/serverloop.c 1.38 +82 -27 src/crypto/openssh/session.c 1.5 +2 -2 src/crypto/openssh/session.h 1.9 +4 -3 src/crypto/openssh/ssh-add.c 1.16 +36 -24 src/crypto/openssh/ssh-agent.c 1.4 +27 -24 src/crypto/openssh/ssh-keyscan.c 1.25 +37 -20 src/crypto/openssh/ssh.1 1.22 +39 -21 src/crypto/openssh/ssh.c 1.22 +0 -4 src/crypto/openssh/ssh.h 1.18 +2 -1 src/crypto/openssh/ssh_config 1.6 +35 -7 src/crypto/openssh/ssh_config.5 1.23 +87 -31 src/crypto/openssh/sshconnect.c 1.16 +3 -2 src/crypto/openssh/sshconnect1.c 1.9 +6 -6 src/crypto/openssh/sshconnect2.c 1.25 +27 -13 src/crypto/openssh/sshd.8 1.31 +50 -43 src/crypto/openssh/sshd.c 1.29 +2 -1 src/crypto/openssh/sshd_config 1.7 +54 -8 src/crypto/openssh/sshd_config.5 1.8 +1 -1 src/crypto/openssh/sshlogin.c 1.3 +2 -2 src/crypto/openssh/sshlogin.h 1.6 +4 -4 src/crypto/openssh/sshpty.c 1.4 +1 -1 src/crypto/openssh/version.c 1.18 +3 -3 src/crypto/openssh/version.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message