From owner-cvs-all  Sat Jul  7  7:19:59 2001
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id E3D8537B406; Sat,  7 Jul 2001 07:19:55 -0700 (PDT)
	(envelope-from green@FreeBSD.org)
Received: (from green@localhost)
	by freefall.freebsd.org (8.11.3/8.11.3) id f67EJtV82216;
	Sat, 7 Jul 2001 07:19:55 -0700 (PDT)
	(envelope-from green)
Message-Id: <200107071419.f67EJtV82216@freefall.freebsd.org>
From: Brian Feldman <green@FreeBSD.org>
Date: Sat, 7 Jul 2001 07:19:55 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssh sshconnect1.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?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

green       2001/07/07 07:19:55 PDT

  Modified files:
    crypto/openssh       sshconnect1.c 
  Log:
  Fix an incorrect conflict resolution which prevented TISAuthentication
  from working right in 2.9.
  
  Revision  Changes    Path
  1.11      +3 -26     src/crypto/openssh/sshconnect1.c


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message