From owner-cvs-src@FreeBSD.ORG Thu Oct 28 16:11:32 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 080B816A4CE; Thu, 28 Oct 2004 16:11:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCF7A43D2D; Thu, 28 Oct 2004 16:11:31 +0000 (GMT) (envelope-from des@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9SGBVVA086248; Thu, 28 Oct 2004 16:11:31 GMT (envelope-from des@repoman.freebsd.org) Received: (from des@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9SGBVgZ086247; Thu, 28 Oct 2004 16:11:31 GMT (envelope-from des) Message-Id: <200410281611.i9SGBVgZ086247@repoman.freebsd.org> From: Dag-Erling Smorgrav Date: Thu, 28 Oct 2004 16:11:31 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/crypto/openssh acconfig.h auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c canohost.c channels.c channels.h cipher.c cipher.h compat.h config.h configure.ac ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2004 16:11:32 -0000 des 2004-10-28 16:11:31 UTC FreeBSD src repository Modified files: crypto/openssh acconfig.h auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c canohost.c channels.c channels.h cipher.c cipher.h compat.h config.h configure.ac includes.h key.c log.h loginrec.c monitor.c monitor_wrap.c monitor_wrap.h myproposal.h packet.h pathnames.h readconf.c readconf.h rijndael.c scp.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_config ssh_config.5 sshconnect.c sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshlogin.c sshpty.c version.c version.h crypto/openssh/openbsd-compat fake-rfc2553.h Removed files: crypto/openssh moduli.h readpass.h sshtty.h tildexpand.h crypto/openssh/contrib Makefile README findssl.sh gnome-ssh-askpass1.c gnome-ssh-askpass2.c ssh-copy-id ssh-copy-id.1 sshd.pam.freebsd sshd.pam.generic crypto/openssh/contrib/aix README buildbff.sh inventory.sh pam.conf crypto/openssh/contrib/caldera openssh.spec ssh-host-keygen sshd.init sshd.pam crypto/openssh/contrib/cygwin Makefile README ssh-host-config ssh-user-config crypto/openssh/contrib/hpux README egd egd.rc sshd sshd.rc crypto/openssh/contrib/redhat gnome-ssh-askpass.csh gnome-ssh-askpass.sh openssh.spec sshd.init sshd.pam crypto/openssh/contrib/solaris README buildpkg.sh opensshd.in crypto/openssh/contrib/suse openssh.spec rc.config.sshd rc.sshd Log: Resolve conflicts Revision Changes Path 1.10 +14 -2 src/crypto/openssh/acconfig.h 1.18 +6 -2 src/crypto/openssh/auth-krb5.c 1.15 +188 -20 src/crypto/openssh/auth-pam.c 1.10 +3 -2 src/crypto/openssh/auth-pam.h 1.18 +7 -1 src/crypto/openssh/auth-passwd.c 1.14 +5 -6 src/crypto/openssh/auth-rsa.c 1.16 +11 -33 src/crypto/openssh/auth.c 1.14 +2 -4 src/crypto/openssh/auth.h 1.31 +16 -12 src/crypto/openssh/auth1.c 1.9 +2 -3 src/crypto/openssh/auth2-chall.c 1.24 +5 -5 src/crypto/openssh/auth2.c 1.18 +5 -14 src/crypto/openssh/authfd.c 1.17 +15 -9 src/crypto/openssh/authfile.c 1.16 +22 -16 src/crypto/openssh/canohost.c 1.19 +159 -39 src/crypto/openssh/channels.c 1.12 +8 -3 src/crypto/openssh/channels.h 1.19 +26 -26 src/crypto/openssh/cipher.c 1.13 +2 -2 src/crypto/openssh/cipher.h 1.12 +2 -2 src/crypto/openssh/compat.h 1.10 +35 -1 src/crypto/openssh/config.h 1.10 +90 -15 src/crypto/openssh/configure.ac 1.2 +0 -15 src/crypto/openssh/contrib/Makefile (dead) 1.2 +0 -60 src/crypto/openssh/contrib/README (dead) 1.2 +0 -50 src/crypto/openssh/contrib/aix/README (dead) 1.2 +0 -383 src/crypto/openssh/contrib/aix/buildbff.sh (dead) 1.2 +0 -63 src/crypto/openssh/contrib/aix/inventory.sh (dead) 1.2 +0 -20 src/crypto/openssh/contrib/aix/pam.conf (dead) 1.2 +0 -366 src/crypto/openssh/contrib/caldera/openssh.spec (dead) 1.2 +0 -36 src/crypto/openssh/contrib/caldera/ssh-host-keygen (dead) 1.2 +0 -125 src/crypto/openssh/contrib/caldera/sshd.init (dead) 1.2 +0 -8 src/crypto/openssh/contrib/caldera/sshd.pam (dead) 1.2 +0 -56 src/crypto/openssh/contrib/cygwin/Makefile (dead) 1.2 +0 -224 src/crypto/openssh/contrib/cygwin/README (dead) 1.2 +0 -592 src/crypto/openssh/contrib/cygwin/ssh-host-config (dead) 1.2 +0 -250 src/crypto/openssh/contrib/cygwin/ssh-user-config (dead) 1.2 +0 -159 src/crypto/openssh/contrib/findssl.sh (dead) 1.2 +0 -171 src/crypto/openssh/contrib/gnome-ssh-askpass1.c (dead) 1.2 +0 -220 src/crypto/openssh/contrib/gnome-ssh-askpass2.c (dead) 1.2 +0 -45 src/crypto/openssh/contrib/hpux/README (dead) 1.2 +0 -15 src/crypto/openssh/contrib/hpux/egd (dead) 1.2 +0 -98 src/crypto/openssh/contrib/hpux/egd.rc (dead) 1.2 +0 -5 src/crypto/openssh/contrib/hpux/sshd (dead) 1.2 +0 -90 src/crypto/openssh/contrib/hpux/sshd.rc (dead) 1.2 +0 -1 src/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh (dead) 1.2 +0 -2 src/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh (dead) 1.2 +0 -804 src/crypto/openssh/contrib/redhat/openssh.spec (dead) 1.2 +0 -154 src/crypto/openssh/contrib/redhat/sshd.init (dead) 1.2 +0 -8 src/crypto/openssh/contrib/redhat/sshd.pam (dead) 1.2 +0 -24 src/crypto/openssh/contrib/solaris/README (dead) 1.2 +0 -386 src/crypto/openssh/contrib/solaris/buildpkg.sh (dead) 1.2 +0 -82 src/crypto/openssh/contrib/solaris/opensshd.in (dead) 1.2 +0 -50 src/crypto/openssh/contrib/ssh-copy-id (dead) 1.2 +0 -67 src/crypto/openssh/contrib/ssh-copy-id.1 (dead) 1.2 +0 -5 src/crypto/openssh/contrib/sshd.pam.freebsd (dead) 1.2 +0 -8 src/crypto/openssh/contrib/sshd.pam.generic (dead) 1.2 +0 -199 src/crypto/openssh/contrib/suse/openssh.spec (dead) 1.2 +0 -5 src/crypto/openssh/contrib/suse/rc.config.sshd (dead) 1.2 +0 -80 src/crypto/openssh/contrib/suse/rc.sshd (dead) 1.18 +13 -2 src/crypto/openssh/includes.h 1.18 +3 -3 src/crypto/openssh/key.c 1.6 +4 -4 src/crypto/openssh/log.h 1.8 +31 -7 src/crypto/openssh/loginrec.c 1.2 +0 -23 src/crypto/openssh/moduli.h (dead) 1.16 +82 -76 src/crypto/openssh/monitor.c 1.9 +24 -19 src/crypto/openssh/monitor_wrap.c 1.7 +5 -5 src/crypto/openssh/monitor_wrap.h 1.7 +5 -3 src/crypto/openssh/myproposal.h 1.5 +1 -1 src/crypto/openssh/openbsd-compat/fake-rfc2553.h 1.14 +2 -2 src/crypto/openssh/packet.h 1.8 +2 -2 src/crypto/openssh/pathnames.h 1.24 +45 -5 src/crypto/openssh/readconf.c 1.16 +11 -3 src/crypto/openssh/readconf.h 1.2 +0 -20 src/crypto/openssh/readpass.h (dead) 1.7 +3 -3 src/crypto/openssh/rijndael.c 1.7 +23 -18 src/crypto/openssh/scp.c 1.45 +63 -16 src/crypto/openssh/servconf.c 1.16 +12 -4 src/crypto/openssh/servconf.h 1.13 +15 -3 src/crypto/openssh/serverloop.c 1.45 +83 -37 src/crypto/openssh/session.c 1.9 +6 -4 src/crypto/openssh/session.h 1.14 +1 -8 src/crypto/openssh/ssh-add.c 1.23 +6 -11 src/crypto/openssh/ssh-agent.c 1.10 +6 -9 src/crypto/openssh/ssh-keyscan.c 1.30 +85 -20 src/crypto/openssh/ssh.1 1.27 +245 -74 src/crypto/openssh/ssh.c 1.26 +2 -2 src/crypto/openssh/ssh_config 1.16 +71 -8 src/crypto/openssh/ssh_config.5 1.28 +6 -7 src/crypto/openssh/sshconnect.c 1.19 +9 -9 src/crypto/openssh/sshconnect1.c 1.15 +4 -3 src/crypto/openssh/sshconnect2.c 1.30 +3 -3 src/crypto/openssh/sshd.8 1.38 +247 -34 src/crypto/openssh/sshd.c 1.41 +12 -5 src/crypto/openssh/sshd_config 1.22 +62 -15 src/crypto/openssh/sshd_config.5 1.12 +46 -5 src/crypto/openssh/sshlogin.c 1.11 +20 -20 src/crypto/openssh/sshpty.c 1.2 +0 -65 src/crypto/openssh/sshtty.h (dead) 1.2 +0 -19 src/crypto/openssh/tildexpand.h (dead) 1.5 +0 -1 src/crypto/openssh/version.c 1.28 +4 -4 src/crypto/openssh/version.h