From owner-FreeBSD-net-jp@jp.freebsd.org  Mon Feb 14 12:57:48 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA72340;
	Mon, 14 Feb 2000 12:57:48 +0900 (JST)
	(envelope-from owner-FreeBSD-net-jp@jp.FreeBSD.org)
Received: from rins.st.ryukoku.ac.jp (rins.st.ryukoku.ac.jp [133.83.4.1])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id MAA72319
	for <FreeBSD-net-jp@jp.freebsd.org>; Mon, 14 Feb 2000 12:57:47 +0900 (JST)
	(envelope-from kjm@ideon.st.ryukoku.ac.jp)
Received: from ideon.st.ryukoku.ac.jp (ideon.st.ryukoku.ac.jp [133.83.36.5])
	by rins.st.ryukoku.ac.jp (8.9.3+3.2W/3.7W/RINS-1.9.6-NOSPAM) with ESMTP id MAA09828
	for <FreeBSD-net-jp@jp.freebsd.org>; Mon, 14 Feb 2000 12:57:46 +0900 (JST)
Received: from ideon.st.ryukoku.ac.jp (kjm@localhost [127.0.0.1])
	by ideon.st.ryukoku.ac.jp (8.9.3/3.7W/kjm-19990628) with ESMTP id MAA72903
	for <FreeBSD-net-jp@jp.freebsd.org>; Mon, 14 Feb 2000 12:57:46 +0900 (JST)
From: kjm@rins.ryukoku.ac.jp (KOJIMA Hajime /
    =?ISO-2022-JP?B?GyRCPi5FZ0glGyhC?=)
To: FreeBSD-net-jp@jp.freebsd.org
In-reply-to: Your message of "Sun, 13 Feb 2000 21:38:17 JST."
	<200002131238.VAA09654@smtpa.mailbank.ne.jp>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-2022-jp
Date: Mon, 14 Feb 2000 12:57:46 +0900
Message-ID: <72899.950500666@ideon.st.ryukoku.ac.jp>
Reply-To: FreeBSD-net-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: FreeBSD-net-jp 2233
Subject: [FreeBSD-net-jp 2233] Re: =?ISO-2022-JP?B?GyRCJVAhPCU4JWcbKEI=?=
 =?ISO-2022-JP?B?GyRCJXMkSiRJJHJJPTwoJDUkOyRKJCRKfUshGyhC?= 
Errors-To: owner-FreeBSD-net-jp@jp.freebsd.org
Sender: owner-FreeBSD-net-jp@jp.freebsd.org
X-Originator: kjm@ideon.st.ryukoku.ac.jp

<200002131238.VAA09654@smtpa.mailbank.ne.jp>$B$K$*$$$F(B
Hujii Takuya $B$5$s$,$*$C$7$c$k$K$O(B:
| 
| $B8=:_(BFreeBSD3.4$B$r;HMQ$7$F$$$^$9!#(B
| inetd.conf$B$N$J$+$G!"(Btelnetd$B$K(B "-h"$B%*%W%7%g%s$r$D$1$k$H!"%m%0%*%sA0$K(B
| $B%P!<%8%g%sI=<($,=P$J$/$J$j$^$9$,!"(Bpop3$B!"(Bftpd$B$J$I$G$bI=<($5$;$J$$$h$&(B
| $B$K$9$k%*%W%7%g%s$N$h$&$J$b$N$O:_$k$N$G$7$g$&$+!)(B

  3.4-RELEASE $B$N(B ftpd $B$K(B -h $B%*%W%7%g%s$r$D$1$F$_$^$7$?!#(B
  $B%W%m%H%3%kE*$K$3$l$G@5$7$$$N$+$I$&$+$h$/$o$+$i$J$$$N$G$9$,!D!D!#(B

--- ftpd.c.dist	Mon Feb 14 12:19:01 2000
+++ ftpd.c	Mon Feb 14 12:55:01 2000
@@ -142,6 +142,7 @@
 int	mode;
 int	usedefault = 1;		/* for data transfers */
 int	pdata = -1;		/* for passive mode */
+int	hostinfo = 1;		/* do we print login banner? */
 sig_atomic_t transflag;
 off_t	file_size;
 off_t	byte_count;
@@ -287,7 +288,7 @@
 
 
 	bind_address.s_addr = htonl(INADDR_ANY);
-	while ((ch = getopt(argc, argv, "AdlDSURt:T:u:va:p:")) != -1) {
+	while ((ch = getopt(argc, argv, "AdlhDSURt:T:u:va:p:")) != -1) {
 		switch (ch) {
 		case 'D':
 			daemon_mode++;
@@ -353,6 +354,10 @@
 			debug = 1;
 			break;
 
+		case 'h':
+			hostinfo = 0;
+			break;
+
 		default:
 			warnx("unknown flag -%c ignored", optopt);
 			break;
@@ -546,7 +551,10 @@
 	(void) gethostname(hostname, MAXHOSTNAMELEN - 1);
 	hostname[MAXHOSTNAMELEN - 1] = '\0';
 #endif
-	reply(220, "%s FTP server (%s) ready.", hostname, version);
+	if (hostinfo)
+	    reply(220, "%s FTP server (%s) ready.", hostname, version);
+	else
+	    reply(220, "Service ready.");
 	(void) setjmp(errcatch);
 	for (;;)
 		(void) yyparse();
@@ -1103,6 +1111,9 @@
 			syslog(LOG_INFO, "ANONYMOUS FTP LOGIN FROM %s, %s",
 			    remotehost, passwd);
 	} else {
+	    if (!hostinfo)
+		lreply(230, "%s FTP server (%s) ready.", hostname, version);
+
 	    if (dochroot)
 		reply(230, "User %s logged in, access restrictions apply.", 
 			pw->pw_name);
--- ftpd.8.dist	Mon Feb 14 12:38:44 2000
+++ ftpd.8	Mon Feb 14 12:43:43 2000
@@ -43,6 +43,7 @@
 .Nm ftpd
 .Op Fl d
 .Op Fl l Op Fl l
+.Op Fl h
 .Op Fl A
 .Op Fl D
 .Op Fl R
@@ -80,6 +81,9 @@
 by default, and may have to be enabled in
 .Xr syslogd 8 Ns 's
 configuration file.
+.It Fl h
+Disable the printing of host-specific information before login
+has been completed.
 .It Fl D
 With this option set,
 .Nm
----
// $BLZ2<@'M:!VM}2J7O$N:nJ85;=Q!WCf8x?7=q(B 624 $B$rFI$b$&(B!!

$B>.Eg(B $BH%(B - KOJIMA Hajime
[Office] kjm@rins.ryukoku.ac.jp, http://www.st.ryukoku.ac.jp/~kjm/
         Phone: 077-543-7414  Fax: 077-543-0706
