From owner-cvs-all  Sun Sep 10  2:35:45 2000
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 83A5437B424; Sun, 10 Sep 2000 02:35:41 -0700 (PDT)
Received: (from kris@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id CAA16278;
	Sun, 10 Sep 2000 02:35:41 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Message-Id: <200009100935.CAA16278@freefall.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sun, 10 Sep 2000 02:35:40 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssh auth-krb4.c auth-passwd.c
         auth-rh-rsa.c auth-rsa.c auth-skey.c auth.c auth1.c auth2.c
         authfd.c authfile.c bufaux.c canohost.c cipher.c cipher.h
         hostfile.c includes.h key.c login.c mpaux.c packet.h pty.c ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

kris        2000/09/10 02:35:40 PDT

  Modified files:
    crypto/openssh       auth-krb4.c auth-passwd.c auth-rh-rsa.c 
                         auth-rsa.c auth-skey.c auth.c auth1.c 
                         auth2.c authfd.c authfile.c bufaux.c 
                         canohost.c cipher.c cipher.h hostfile.c 
                         includes.h key.c login.c mpaux.c packet.h 
                         pty.c readconf.c readconf.h rsa.c rsa.h 
                         servconf.c servconf.h session.c 
                         ssh-agent.c ssh.1 ssh.c ssh.h ssh_config 
                         sshconnect.c sshconnect1.c sshd.8 sshd.c 
                         sshd_config 
  Log:
  Resolve conflicts and update for OpenSSH 2.2.0
  
  Reviewed by:	gshapiro, peter, green
  
  Revision  Changes    Path
  1.6       +29 -7     src/crypto/openssh/auth-krb4.c
  1.5       +55 -5     src/crypto/openssh/auth-passwd.c
  1.5       +7 -9      src/crypto/openssh/auth-rh-rsa.c
  1.6       +11 -198   src/crypto/openssh/auth-rsa.c
  1.6       +26 -3     src/crypto/openssh/auth-skey.c
  1.5       +29 -15    src/crypto/openssh/auth.c
  1.8       +14 -8     src/crypto/openssh/auth1.c
  1.5       +49 -29    src/crypto/openssh/auth2.c
  1.6       +316 -355  src/crypto/openssh/authfd.c
  1.5       +85 -9     src/crypto/openssh/authfile.c
  1.6       +29 -9     src/crypto/openssh/bufaux.c
  1.4       +7 -9      src/crypto/openssh/canohost.c
  1.7       +35 -11    src/crypto/openssh/cipher.c
  1.6       +7 -8      src/crypto/openssh/cipher.h
  1.5       +32 -10    src/crypto/openssh/hostfile.c
  1.8       +8 -10     src/crypto/openssh/includes.h
  1.6       +41 -22    src/crypto/openssh/key.c
  1.6       +30 -9     src/crypto/openssh/login.c
  1.5       +8 -10     src/crypto/openssh/mpaux.c
  1.6       +7 -9      src/crypto/openssh/packet.h
  1.5       +7 -9      src/crypto/openssh/pty.c
  1.9       +97 -89    src/crypto/openssh/readconf.c
  1.5       +8 -9      src/crypto/openssh/readconf.h
  1.7       +38 -13    src/crypto/openssh/rsa.c
  1.5       +8 -10     src/crypto/openssh/rsa.h
  1.15      +140 -79   src/crypto/openssh/servconf.c
  1.6       +18 -9     src/crypto/openssh/servconf.h
  1.10      +399 -280  src/crypto/openssh/session.c
  1.7       +348 -195  src/crypto/openssh/ssh-agent.c
  1.15      +38 -10    src/crypto/openssh/ssh.1
  1.10      +71 -35    src/crypto/openssh/ssh.c
  1.12      +11 -9     src/crypto/openssh/ssh.h
  1.6       +1 -1      src/crypto/openssh/ssh_config
  1.9       +30 -21    src/crypto/openssh/sshconnect.c
  1.4       +26 -24    src/crypto/openssh/sshconnect1.c
  1.14      +107 -23   src/crypto/openssh/sshd.8
  1.15      +219 -99   src/crypto/openssh/sshd.c
  1.12      +5 -1      src/crypto/openssh/sshd_config



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