From owner-cvs-all  Sat Jun 29  4:49:33 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 686AD37B400; Sat, 29 Jun 2002 04:49:23 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EB69943E0A; Sat, 29 Jun 2002 04:49:07 -0700 (PDT)
	(envelope-from des@FreeBSD.org)
Received: from freefall.freebsd.org (des@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TBn0JU070325;
	Sat, 29 Jun 2002 04:49:00 -0700 (PDT)
	(envelope-from des@freefall.freebsd.org)
Received: (from des@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TBn0kt070322;
	Sat, 29 Jun 2002 04:49:00 -0700 (PDT)
Message-Id: <200206291149.g5TBn0kt070322@freefall.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Sat, 29 Jun 2002 04:49:00 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssh acconfig.h auth2-chall.c
         auth2-pam.c authfd.c authfile.c bufaux.c channels.c channels.h
         cipher.c configure.ac key.c monitor.c servconf.c serverloop.c
         session.c session.h ssh-agent.c ssh.1 ssh.h sshconnect.c ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

des         2002/06/29 04:49:00 PDT

  Modified files:
    crypto/openssh       acconfig.h auth2-chall.c auth2-pam.c 
                         authfd.c authfile.c bufaux.c channels.c 
                         channels.h cipher.c configure.ac key.c 
                         monitor.c servconf.c serverloop.c 
                         session.c session.h ssh-agent.c ssh.1 
                         ssh.h sshconnect.c sshconnect2.c sshd.8 
                         sshd.c sshd_config.5 sshlogin.c sshpty.c 
                         version.h 
  Log:
  Resolve conflicts.
  
  Sponsored by:   DARPA, NAI Labs
  
  Revision  Changes    Path
  1.3       +7 -4      src/crypto/openssh/acconfig.h
  1.6       +12 -6     src/crypto/openssh/auth2-chall.c
  1.4       +11 -1     src/crypto/openssh/auth2-pam.c
  1.12      +3 -2      src/crypto/openssh/authfd.c
  1.12      +4 -3      src/crypto/openssh/authfile.c
  1.12      +21 -5     src/crypto/openssh/bufaux.c
  1.12      +19 -13    src/crypto/openssh/channels.c
  1.8       +10 -9     src/crypto/openssh/channels.h
  1.13      +14 -1     src/crypto/openssh/cipher.c
  1.3       +33 -20    src/crypto/openssh/configure.ac
  1.12      +9 -2      src/crypto/openssh/key.c
  1.6       +16 -12    src/crypto/openssh/monitor.c
  1.37      +12 -11    src/crypto/openssh/servconf.c
  1.7       +3 -4      src/crypto/openssh/serverloop.c
  1.34      +27 -14    src/crypto/openssh/session.c
  1.4       +5 -4      src/crypto/openssh/session.h
  1.15      +41 -42    src/crypto/openssh/ssh-agent.c
  1.24      +3 -3      src/crypto/openssh/ssh.1
  1.21      +4 -3      src/crypto/openssh/ssh.h
  1.22      +3 -3      src/crypto/openssh/sshconnect.c
  1.8       +9 -5      src/crypto/openssh/sshconnect2.c
  1.23      +9 -2      src/crypto/openssh/sshd.8
  1.30      +38 -11    src/crypto/openssh/sshd.c
  1.5       +8 -2      src/crypto/openssh/sshd_config.5
  1.6       +4 -6      src/crypto/openssh/sshlogin.c
  1.5       +9 -8      src/crypto/openssh/sshpty.c
  1.16      +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