From owner-cvs-all Mon Aug 20 5:30: 9 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 A017937B411; Mon, 20 Aug 2001 05:30:00 -0700 (PDT) (envelope-from markm@FreeBSD.org) Received: (from markm@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f7KCSfV43977; Mon, 20 Aug 2001 05:28:41 -0700 (PDT) (envelope-from markm) Message-Id: <200108201228.f7KCSfV43977@freefall.freebsd.org> From: Mark Murray Date: Mon, 20 Aug 2001 05:28:41 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/telnet/libtelnet auth.h enc_des.c genget.c getent.c kerberos5.c misc-proto.h misc.c pk.c sra.c src/crypto/telnet/telnet commands.c main.c ring.c ring.h sys_bsd.c telnet.1 telnet.c utilities.c src/crypto/telnet/telnetd ext.h ... 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 markm 2001/08/20 05:28:41 PDT Modified files: crypto/telnet/libtelnet auth.h enc_des.c genget.c getent.c kerberos5.c misc-proto.h misc.c pk.c sra.c crypto/telnet/telnet commands.c main.c ring.c ring.h sys_bsd.c telnet.1 telnet.c utilities.c crypto/telnet/telnetd ext.h pathnames.h state.c sys_term.c telnetd.8 telnetd.c termstat.c utility.c Log: Code merge and diff reduce with "base" telnet. This is the "later" telnet, so it was treated as the reference code, except where later commits were made to "base" telnet. Revision Changes Path 1.2 +2 -1 src/crypto/telnet/libtelnet/auth.h 1.5 +3 -2 src/crypto/telnet/libtelnet/enc_des.c 1.5 +11 -16 src/crypto/telnet/libtelnet/genget.c 1.5 +8 -5 src/crypto/telnet/libtelnet/getent.c 1.2 +9 -10 src/crypto/telnet/libtelnet/kerberos5.c 1.2 +2 -0 src/crypto/telnet/libtelnet/misc-proto.h 1.5 +5 -1 src/crypto/telnet/libtelnet/misc.c 1.6 +24 -58 src/crypto/telnet/libtelnet/pk.c 1.10 +33 -53 src/crypto/telnet/libtelnet/sra.c 1.20 +22 -25 src/crypto/telnet/telnet/commands.c 1.13 +29 -9 src/crypto/telnet/telnet/main.c 1.5 +7 -7 src/crypto/telnet/telnet/ring.c 1.2 +3 -2 src/crypto/telnet/telnet/ring.h 1.6 +4 -4 src/crypto/telnet/telnet/sys_bsd.c 1.16 +51 -52 src/crypto/telnet/telnet/telnet.1 1.10 +7 -7 src/crypto/telnet/telnet/telnet.c 1.5 +2 -3 src/crypto/telnet/telnet/utilities.c 1.8 +2 -2 src/crypto/telnet/telnetd/ext.h 1.3 +1 -1 src/crypto/telnet/telnetd/pathnames.h 1.10 +6 -1 src/crypto/telnet/telnetd/state.c 1.11 +16 -18 src/crypto/telnet/telnetd/sys_term.c 1.13 +33 -7 src/crypto/telnet/telnetd/telnetd.8 1.18 +6 -5 src/crypto/telnet/telnetd/telnetd.c 1.9 +18 -18 src/crypto/telnet/telnetd/termstat.c 1.11 +2 -6 src/crypto/telnet/telnetd/utility.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message