Attachment 7804 Details for Bug 16705 – file.diff

[patch] file.diff

file.diff (text/plain), 1.76 KB, created by KOJIMA Hajime on 2000-02-14 04:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: KOJIMA Hajime

Created: 2000-02-14 04:20:01 UTC

Size: 1.76 KB

patch

obsolete

>--- 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

Actions: View | Diff

Attachments on bug 16705: 7804 | 7805