From owner-freebsd-audit Sat Aug 4 14:29:15 2001 Delivered-To: freebsd-audit@freebsd.org Received: from arb.arb.za.net (arb.arb.za.net [196.7.148.4]) by hub.freebsd.org (Postfix) with ESMTP id CB0CE37B427 for ; Sat, 4 Aug 2001 14:29:07 -0700 (PDT) (envelope-from mark@grondar.za) Received: (from uucp@localhost) by arb.arb.za.net (8.11.3/8.11.3) with UUCP id f74LT6V42981 for audit@freebsd.org; Sat, 4 Aug 2001 23:29:06 +0200 (SAST) (envelope-from mark@grondar.za) Received: from grondar.za (mark@localhost [127.0.0.1]) by grimreaper.grondar.za (8.11.4/8.11.4) with ESMTP id f74LFEr17192 for ; Sat, 4 Aug 2001 22:15:14 +0100 (BST) (envelope-from mark@grondar.za) Message-Id: <200108042115.f74LFEr17192@grimreaper.grondar.za> To: audit@freebsd.org Subject: [Patch] Telnet cleanup Date: Sat, 04 Aug 2001 22:15:13 +0100 From: Mark Murray Sender: owner-freebsd-audit@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi all I have gone through our telnets (we have 2 distinct source code sets), and I have attempted to reconcile the relevant differences between the two. "Base" telnet is (or rather, should be) derived by using unifdef(1) to remove the crypto bits from the telnet sources in src/crypto/telnet/. Over time, the two have diverged. "Base" telnet has received the most attention. The telnet in src/crypto/telnet is a later version of the telnet sources, and I have reintegrated some of its (later) features into the "base" telnet. I have tried to reduce as many differences as possible (obviously the #ifdef'ed crypto stuff needs to stay). I'd like to get it such that the base telnet is only ever updated by a script that builds it by unifdef(1)ing the crypto version. That way we can avoid the current divergent sources problem. It will also provide a single place to commit telnet updates instead of having to remember to duplicate effort. There are two diffs for your review; diff.cvs.gz is the commit- candidate diff, relative to CURRENT, and diff.2_vers.gz is the resultant diff between the 2 telnets. Both diffs can be found in http://people.freebsd.org/~markm/patches/. This does not fully achieve the unifdef(1) ideal, but I believe it is in the right direction for further work. Comments please? :-) M -- Mark Murray Warning: this .sig is umop ap!sdn To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-audit" in the body of the message