From owner-cvs-all Sun Jun 23 9: 9:18 2002 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 739B237B403; Sun, 23 Jun 2002 09:09:10 -0700 (PDT) Received: (from des@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5NG9AO66770; Sun, 23 Jun 2002 09:09:10 -0700 (PDT) (envelope-from des) Message-Id: <200206231609.g5NG9AO66770@freefall.freebsd.org> From: Dag-Erling Smorgrav Date: Sun, 23 Jun 2002 09:09:10 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/openssh LICENCE auth-krb4.c auth-krb5.c auth-passwd.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c canohost.c channels.c channels.h cipher.c cipher.h 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/06/23 09:09:10 PDT Modified files: crypto/openssh LICENCE auth-krb4.c auth-krb5.c auth-passwd.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c canohost.c channels.c channels.h cipher.c cipher.h compat.c compat.h key.c monitor.c myproposal.h packet.h pathnames.h readconf.c readconf.h servconf.c servconf.h serverloop.c session.c ssh-add.c ssh-agent.c ssh.c ssh.h ssh_config sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c sshd_config version.h Log: Resolve conflicts. Known issues: - sshd fails to set TERM correctly. - privilege separation may break PAM and is currently turned off. - man pages have not yet been updated I will have these issues resolved, and privilege separation turned on by default, in time for DP2. Sponsored by: DARPA, NAI Labs Revision Changes Path 1.3 +3 -0 src/crypto/openssh/LICENCE 1.11 +4 -3 src/crypto/openssh/auth-krb4.c 1.10 +26 -1 src/crypto/openssh/auth-krb5.c 1.10 +14 -9 src/crypto/openssh/auth-passwd.c 1.9 +35 -24 src/crypto/openssh/auth-rh-rsa.c 1.10 +125 -84 src/crypto/openssh/auth-rsa.c 1.11 +16 -9 src/crypto/openssh/auth-skey.c 1.9 +88 -6 src/crypto/openssh/auth.c 1.6 +41 -6 src/crypto/openssh/auth.h 1.22 +26 -25 src/crypto/openssh/auth1.c 1.3 +21 -2 src/crypto/openssh/auth2-chall.c 1.15 +46 -517 src/crypto/openssh/auth2.c 1.10 +47 -9 src/crypto/openssh/authfd.c 1.10 +2 -2 src/crypto/openssh/authfile.c 1.10 +23 -5 src/crypto/openssh/bufaux.c 1.8 +4 -3 src/crypto/openssh/canohost.c 1.10 +24 -110 src/crypto/openssh/channels.c 1.6 +13 -3 src/crypto/openssh/channels.h 1.11 +181 -11 src/crypto/openssh/cipher.c 1.10 +8 -1 src/crypto/openssh/cipher.h 1.6 +20 -10 src/crypto/openssh/compat.c 1.5 +3 -1 src/crypto/openssh/compat.h 1.10 +48 -1 src/crypto/openssh/key.c 1.2 +6 -5 src/crypto/openssh/monitor.c 1.3 +2 -2 src/crypto/openssh/myproposal.h 1.10 +12 -1 src/crypto/openssh/packet.h 1.5 +7 -1 src/crypto/openssh/pathnames.h 1.15 +15 -25 src/crypto/openssh/readconf.c 1.10 +1 -3 src/crypto/openssh/readconf.h 1.33 +26 -3 src/crypto/openssh/servconf.c 1.11 +2 -2 src/crypto/openssh/servconf.h 1.5 +12 -13 src/crypto/openssh/serverloop.c 1.30 +192 -113 src/crypto/openssh/session.c 1.7 +76 -7 src/crypto/openssh/ssh-add.c 1.13 +238 -122 src/crypto/openssh/ssh-agent.c 1.19 +80 -139 src/crypto/openssh/ssh.c 1.19 +12 -2 src/crypto/openssh/ssh.h 1.13 +8 -10 src/crypto/openssh/ssh_config 1.20 +27 -48 src/crypto/openssh/sshconnect.c 1.6 +28 -5 src/crypto/openssh/sshconnect.h 1.14 +10 -6 src/crypto/openssh/sshconnect1.c 1.6 +169 -17 src/crypto/openssh/sshconnect2.c 1.28 +309 -49 src/crypto/openssh/sshd.c 1.23 +8 -8 src/crypto/openssh/sshd_config 1.13 +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