From owner-cvs-all@FreeBSD.ORG Wed Jan 7 03:16:31 2004 Return-Path: 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 90C3C16A4CE; Wed, 7 Jan 2004 03:16:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FF0643D41; Wed, 7 Jan 2004 03:16:28 -0800 (PST) (envelope-from des@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i07BGS0B010799; Wed, 7 Jan 2004 03:16:28 -0800 (PST) (envelope-from des@repoman.freebsd.org) Received: (from des@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i07BGSW1010798; Wed, 7 Jan 2004 03:16:28 -0800 (PST) (envelope-from des) Message-Id: <200401071116.i07BGSW1010798@repoman.freebsd.org> From: Dag-Erling Smorgrav Date: Wed, 7 Jan 2004 03:16:28 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/crypto/openssh LICENCE acconfig.h auth-krb4.c auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-rh-rsa.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2-pam-freebsd.c auth2-pam.c auth2-pam.h auth2.c authfd.c authfile.c bufaux.c ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jan 2004 11:16:31 -0000 des 2004/01/07 03:16:28 PST FreeBSD src repository Modified files: crypto/openssh LICENCE acconfig.h auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-rh-rsa.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c canohost.c cipher.c compat.c compat.h configure.ac hostfile.c includes.h key.c log.h loginrec.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h myproposal.h packet.h readconf.c readconf.h 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.h 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.h Removed files: crypto/openssh auth-krb4.c auth2-pam-freebsd.c auth2-pam.c auth2-pam.h mdoc2man.pl radix.c radix.h ssh-dss.h ssh-rsa.h crypto/openssh/openbsd-compat basename.h bindresvport.h bsd-arc4random.h bsd-getpeereid.h bsd-snprintf.h daemon.h dirname.h fake-gai-errnos.h fake-getaddrinfo.c fake-getaddrinfo.h fake-getnameinfo.c fake-getnameinfo.h fake-socket.h getcwd.h getgrouplist.h getopt.h inet_aton.h inet_ntoa.h inet_ntop.h mktemp.h realpath.h rresvport.h setenv.h setproctitle.h strlcat.h strlcpy.h strmode.h strsep.h xmmap.h crypto/openssh/regress authorized_keys_root Log: Resolve conflicts and remove obsolete files. Sponsored by: registrar.no Revision Changes Path 1.5 +139 -21 src/crypto/openssh/LICENCE 1.7 +64 -17 src/crypto/openssh/acconfig.h 1.16 +0 -368 src/crypto/openssh/auth-krb4.c (dead) 1.15 +26 -204 src/crypto/openssh/auth-krb5.c 1.12 +639 -346 src/crypto/openssh/auth-pam.c 1.7 +11 -13 src/crypto/openssh/auth-pam.h 1.15 +70 -148 src/crypto/openssh/auth-passwd.c 1.11 +3 -3 src/crypto/openssh/auth-rh-rsa.c 1.12 +3 -3 src/crypto/openssh/auth-rsa.c 1.14 +104 -58 src/crypto/openssh/auth.c 1.11 +15 -25 src/crypto/openssh/auth.h 1.28 +13 -120 src/crypto/openssh/auth1.c 1.8 +8 -6 src/crypto/openssh/auth2-chall.c 1.15 +0 -634 src/crypto/openssh/auth2-pam-freebsd.c (dead) 1.8 +0 -165 src/crypto/openssh/auth2-pam.c (dead) 1.2 +0 -8 src/crypto/openssh/auth2-pam.h (dead) 1.21 +31 -22 src/crypto/openssh/auth2.c 1.16 +29 -12 src/crypto/openssh/authfd.c 1.15 +11 -2 src/crypto/openssh/authfile.c 1.14 +3 -7 src/crypto/openssh/bufaux.c 1.13 +32 -20 src/crypto/openssh/canohost.c 1.17 +33 -349 src/crypto/openssh/cipher.c 1.10 +10 -9 src/crypto/openssh/compat.c 1.10 +4 -4 src/crypto/openssh/compat.h 1.7 +371 -197 src/crypto/openssh/configure.ac 1.12 +3 -3 src/crypto/openssh/hostfile.c 1.16 +8 -5 src/crypto/openssh/includes.h 1.16 +7 -5 src/crypto/openssh/key.c 1.4 +4 -4 src/crypto/openssh/log.h 1.5 +39 -44 src/crypto/openssh/loginrec.c 1.2 +0 -592 src/crypto/openssh/mdoc2man.pl (dead) 1.13 +179 -121 src/crypto/openssh/monitor.c 1.4 +6 -4 src/crypto/openssh/monitor.h 1.6 +97 -61 src/crypto/openssh/monitor_wrap.c 1.4 +15 -16 src/crypto/openssh/monitor_wrap.h 1.6 +4 -3 src/crypto/openssh/myproposal.h 1.2 +0 -12 src/crypto/openssh/openbsd-compat/basename.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/bindresvport.h (dead) 1.2 +0 -37 src/crypto/openssh/openbsd-compat/bsd-arc4random.h (dead) 1.2 +0 -14 src/crypto/openssh/openbsd-compat/bsd-getpeereid.h (dead) 1.2 +0 -19 src/crypto/openssh/openbsd-compat/bsd-snprintf.h (dead) 1.2 +0 -11 src/crypto/openssh/openbsd-compat/daemon.h (dead) 1.2 +0 -5 src/crypto/openssh/openbsd-compat/dirname.h (dead) 1.2 +0 -14 src/crypto/openssh/openbsd-compat/fake-gai-errnos.h (dead) 1.2 +0 -121 src/crypto/openssh/openbsd-compat/fake-getaddrinfo.c (dead) 1.2 +0 -47 src/crypto/openssh/openbsd-compat/fake-getaddrinfo.h (dead) 1.2 +0 -55 src/crypto/openssh/openbsd-compat/fake-getnameinfo.c (dead) 1.2 +0 -20 src/crypto/openssh/openbsd-compat/fake-getnameinfo.h (dead) 1.2 +0 -47 src/crypto/openssh/openbsd-compat/fake-socket.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/getcwd.h (dead) 1.2 +0 -16 src/crypto/openssh/openbsd-compat/getgrouplist.h (dead) 1.2 +0 -14 src/crypto/openssh/openbsd-compat/getopt.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/inet_aton.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/inet_ntoa.h (dead) 1.2 +0 -13 src/crypto/openssh/openbsd-compat/inet_ntop.h (dead) 1.2 +0 -13 src/crypto/openssh/openbsd-compat/mktemp.h (dead) 1.2 +0 -13 src/crypto/openssh/openbsd-compat/realpath.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/rresvport.h (dead) 1.2 +0 -14 src/crypto/openssh/openbsd-compat/setenv.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/setproctitle.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/strlcat.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/strlcpy.h (dead) 1.2 +0 -7 src/crypto/openssh/openbsd-compat/strmode.h (dead) 1.2 +0 -12 src/crypto/openssh/openbsd-compat/strsep.h (dead) 1.2 +0 -23 src/crypto/openssh/openbsd-compat/xmmap.h (dead) 1.13 +9 -6 src/crypto/openssh/packet.h 1.2 +0 -285 src/crypto/openssh/radix.c (dead) 1.2 +0 -28 src/crypto/openssh/radix.h (dead) 1.20 +124 -67 src/crypto/openssh/readconf.c 1.13 +8 -11 src/crypto/openssh/readconf.h 1.2 +0 -2 src/crypto/openssh/regress/authorized_keys_root (dead) 1.5 +46 -62 src/crypto/openssh/scp.c 1.40 +63 -102 src/crypto/openssh/servconf.c 1.14 +6 -15 src/crypto/openssh/servconf.h 1.11 +13 -7 src/crypto/openssh/serverloop.c 1.42 +154 -118 src/crypto/openssh/session.c 1.7 +4 -1 src/crypto/openssh/session.h 1.12 +5 -4 src/crypto/openssh/ssh-add.c 1.20 +28 -11 src/crypto/openssh/ssh-agent.c 1.3 +0 -0 src/crypto/openssh/ssh-dss.h (dead) 1.7 +5 -9 src/crypto/openssh/ssh-keyscan.c 1.3 +0 -0 src/crypto/openssh/ssh-rsa.h (dead) 1.27 +28 -22 src/crypto/openssh/ssh.1 1.24 +38 -56 src/crypto/openssh/ssh.c 1.24 +1 -5 src/crypto/openssh/ssh.h 1.23 +5 -4 src/crypto/openssh/ssh_config 1.11 +67 -58 src/crypto/openssh/ssh_config.5 1.26 +157 -28 src/crypto/openssh/sshconnect.c 1.18 +9 -580 src/crypto/openssh/sshconnect1.c 1.12 +459 -162 src/crypto/openssh/sshconnect2.c 1.28 +48 -22 src/crypto/openssh/sshd.8 1.35 +67 -115 src/crypto/openssh/sshd.c 1.34 +22 -15 src/crypto/openssh/sshd_config 1.14 +60 -63 src/crypto/openssh/sshd_config.5 1.10 +3 -3 src/crypto/openssh/sshlogin.c 1.9 +12 -12 src/crypto/openssh/sshpty.c 1.24 +4 -5 src/crypto/openssh/version.h