From owner-freebsd-hackers@FreeBSD.ORG  Fri Apr  4 16:17:24 2003
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6384537B401
	for <hackers@freebsd.org>; Fri,  4 Apr 2003 16:17:24 -0800 (PST)
Received: from snark.ratmir.ru (snark.ratmir.ru [213.24.248.177])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2BCE443FAF
	for <hackers@freebsd.org>; Fri,  4 Apr 2003 16:17:23 -0800 (PST)
	(envelope-from freebsd@snark.ratmir.ru)
Received: from snark.ratmir.ru (freebsd@localhost [127.0.0.1])
	by snark.ratmir.ru (8.12.9/8.12.9) with ESMTP id h350HLDR094555;
	Sat, 5 Apr 2003 04:17:22 +0400 (MSD)
	(envelope-from freebsd@snark.ratmir.ru)
Received: (from freebsd@localhost)
	by snark.ratmir.ru (8.12.9/8.12.9/Submit) id h350HKAT094554;
	Sat, 5 Apr 2003 04:17:21 +0400 (MSD)
Date: Sat, 5 Apr 2003 04:17:19 +0400
From: Alex Semenyaka <alexs@ratmir.ru>
To: Socketd <db@traceroute.dk>
Message-ID: <20030405001719.GA90728@snark.ratmir.ru>
References: <20030404230140.GC17008@main>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20030404230140.GC17008@main>
User-Agent: Mutt/1.5.4i
cc: hackers@freebsd.org
Subject: Re: ftpd -h
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 00:17:24 -0000

On Sat, Apr 05, 2003 at 01:01:40AM +0200, Socketd wrote:
> When updating to FreeBSD 4.8 I saw that you can give ftpd a -h flag 
> when writing "syst" I still get:
> 215 UNIX Type: L8 Version: BSD-199506

You are right, there is no check. Here is the patch to fix it:

Index: ftpcmd.y
===================================================================
RCS file: /usr/local/FreeBSD/src/libexec/ftpd/ftpcmd.y,v
retrieving revision 1.50
diff -u -U1 -r1.50 ftpcmd.y
--- ftpcmd.y	5 Feb 2003 11:11:32 -0000	1.50
+++ ftpcmd.y	5 Apr 2003 00:11:58 -0000
@@ -690,13 +690,17 @@
 		{
-			if ($2)
+			if ($2) {
+				if (hostinfo)
 #ifdef unix
 #ifdef BSD
-			reply(215, "UNIX Type: L%d Version: BSD-%d",
-				CHAR_BIT, BSD);
+					reply(215, "UNIX Type: L%d Version: BSD-%d",
+					CHAR_BIT, BSD);
 #else /* BSD */
-			reply(215, "UNIX Type: L%d", CHAR_BIT);
+					reply(215, "UNIX Type: L%d", CHAR_BIT);
 #endif /* BSD */
 #else /* unix */
-			reply(215, "UNKNOWN Type: L%d", CHAR_BIT);
+					reply(215, "UNKNOWN Type: L%d", CHAR_BIT);
 #endif /* unix */
+				else
+					reply(215, "UNKNOWN Type: L%d", CHAR_BIT);
+				}
 		}


Comments?

Alex