Attachment 7805 Details for Bug 16705 – ftpd.hinfo.fbsd5.patch

[patch] ftpd.hinfo.fbsd5.patch

ftpd.hinfo.fbsd5.patch (text/plain; charset=us-ascii), 2.45 KB, created by jontow on 2002-06-09 16:45:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jontow

Created: 2002-06-09 16:45:10 UTC

Size: 2.45 KB

patch

obsolete

>*** ftpd.c.orig	Tue May 28 14:55:04 2002
>--- ftpd.c	Sun Jun  9 11:36:05 2002
>***************
>*** 139,144 ****
>--- 139,145 ----
>  int	mode;
>  int	usedefault = 1;		/* for data transfers */
>  int	pdata = -1;		/* for passive mode */
>+ int	hostinfo = 1;		/* do we print login banner? */
>  int	readonly=0;		/* Server is in readonly mode.	*/
>  int	noepsv=0;		/* EPSV command is disabled.	*/
>  int	noretr=0;		/* RETR command is disabled.	*/
>***************
>*** 297,303 ****
>  #endif /* OLD_SETPROCTITLE */
>  
>  
>! 	while ((ch = getopt(argc, argv, "AdlDESURrt:T:u:vOoa:p:46")) != -1) {
>  		switch (ch) {
>  		case 'D':
>  			daemon_mode++;
>--- 298,304 ----
>  #endif /* OLD_SETPROCTITLE */
>  
>  
>! 	while ((ch = getopt(argc, argv, "AdlhDESURrt:T:u:vOoa:p:46")) != -1) {
>  		switch (ch) {
>  		case 'D':
>  			daemon_mode++;
>***************
>*** 388,393 ****
>--- 389,398 ----
>  			noretr = 1;
>  			break;
>  
>+ 		case 'h':
>+ 			hostinfo = 0;
>+ 			break;
>+ 
>  		default:
>  			warnx("unknown flag -%c ignored", optopt);
>  			break;
>***************
>*** 620,626 ****
>  	(void) gethostname(hostname, MAXHOSTNAMELEN - 1);
>  	hostname[MAXHOSTNAMELEN - 1] = '\0';
>  #endif
>! 	reply(220, "%s FTP server (%s) ready.", hostname, version);
>  	for (;;)
>  		(void) yyparse();
>  	/* NOTREACHED */
>--- 625,636 ----
>  	(void) gethostname(hostname, MAXHOSTNAMELEN - 1);
>  	hostname[MAXHOSTNAMELEN - 1] = '\0';
>  #endif
>! 
>! 	if (hostinfo)
>! 		reply(220, "%s FTP server (%s) ready.", hostname, version);
>! 	else
>! 		reply(220, "Service ready.");
>! 
>  	for (;;)
>  		(void) yyparse();
>  	/* NOTREACHED */
>***************
>*** 1438,1443 ****
>--- 1448,1455 ----
>  			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.orig	Mon Oct  1 08:58:03 2001
>--- ftpd.8	Sun Jun  9 11:32:23 2002
>***************
>*** 42,47 ****
>--- 42,48 ----
>  .Nm
>  .Op Fl 46ADEORSUdro
>  .Op Fl l Op Fl l
>+ .Op Fl h
>  .Op Fl T Ar maxtimeout
>  .Op Fl a Ar address
>  .Op Fl p Ar file
>***************
>*** 149,154 ****
>--- 150,158 ----
>  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 T
>  A client may also request a different timeout period;
>  the maximum period allowed may be set to

Actions: View | Diff

Attachments on bug 16705: 7804 | 7805