From: tedu <tedu@openbsd.org>
Date: Fri, 26 Aug 2016 06:32:10 +0000 (+0000)
Subject: trim down some NBBY references. 8 bits ought to be enough for anyone.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=08cb63c286f34c4f4cea15e62c517cb81ae97549;p=openbsd

trim down some NBBY references. 8 bits ought to be enough for anyone.
---

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 80b86c667f3..b8bce1930b4 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftpcmd.y,v 1.63 2016/08/14 22:56:29 guenther Exp $	*/
+/*	$OpenBSD: ftpcmd.y,v 1.64 2016/08/26 06:32:10 tedu Exp $	*/
 /*	$NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $	*/
 
 /*
@@ -574,7 +574,7 @@ cmd
 	| SYST check_login CRLF
 		{
 			if ($2)
-			reply(215, "UNIX Type: L%d", NBBY);
+			reply(215, "UNIX Type: L8");
 		}
 
 		/*
@@ -833,7 +833,7 @@ type_code
 	| L
 		{
 			cmd_type = TYPE_L;
-			cmd_bytesz = NBBY;
+			cmd_bytesz = 8;
 		}
 	| L SP byte_size
 		{
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index b53cda1f7ae..723933c7bb8 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftpd.c,v 1.218 2016/08/14 22:56:29 guenther Exp $	*/
+/*	$OpenBSD: ftpd.c,v 1.219 2016/08/26 06:32:10 tedu Exp $	*/
 /*	$NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $	*/
 
 /*
@@ -1827,11 +1827,7 @@ statcmd(void)
 	if (type == TYPE_A || type == TYPE_E)
 		printf(", FORM: %s", formnames[form]);
 	if (type == TYPE_L)
-#if NBBY == 8
-		printf(" %d", NBBY);
-#else
-		printf(" %d", bytesize);	/* need definition! */
-#endif
+		printf(" 8");
 	printf("; STRUcture: %s; transfer MODE: %s\r\n",
 	    strunames[stru], modenames[mode]);
 	ispassive = 0;