From e02897fa5ba3963f2dd7d477ae5e791410e0bf58 Mon Sep 17 00:00:00 2001 From: Philippe Charnier Date: Fri, 21 Nov 1997 07:38:43 +0000 Subject: [PATCH] Cosmetics in man page. Exit(-1) -> exit(1). --- libexec/ftpd/ftpcmd.y | 5 ++++- libexec/ftpd/ftpd.8 | 30 ++++++++++++++---------------- libexec/ftpd/ftpd.c | 10 +++++----- libexec/ftpd/logwtmp.c | 6 ++++-- libexec/ftpd/popen.c | 8 ++++---- libexec/ftpd/skey-stuff.c | 7 +++++-- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 1e9f1cd18b97..51a6f44623f5 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -31,7 +31,6 @@ * SUCH DAMAGE. * * @(#)ftpcmd.y 8.3 (Berkeley) 4/6/94 - * $Id: ftpcmd.y,v 1.11 1997/07/24 09:26:10 davidn Exp $ */ /* @@ -42,7 +41,11 @@ %{ #ifndef lint +#if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; +#endif +static const char rcsid[] = + "$Id$"; #endif /* not lint */ #include diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index b3fa6bdaa620..676a7f6b862d 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $Id: ftpd.8,v 1.17 1997/04/27 08:29:21 davidn Exp $ +.\" $Id: ftpd.8,v 1.18 1997/04/29 12:42:07 davidn Exp $ .\" .Dd April 19, 1994 .Dt FTPD 8 @@ -63,7 +63,7 @@ service specification; see .Xr services 5 . .Pp Available options: -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl d Debugging information is written to the syslog using LOG_FTP. .It Fl l @@ -80,35 +80,33 @@ by default, and may have to be enabled in configuration file. .It Fl D With this option set, -.Nm ftpd +.Nm will detach and become a daemon, accepting connections on the FTP port and forking children processes to handle them. This is lower overhead than starting -.Nm ftpd +.Nm from .Xr inetd 8 and is thus useful on busy servers to reduce load. .It Fl R With this option set, -.Nm ftpd +.Nm will revert to historical behavior with regard to security checks on user operations and restrictions on PORT requests. Currently, -.Nm ftpd +.Nm will only honor PORT commands directed to unprivileged ports on the remote user's host (which violates the FTP protocol specification but closes some security holes). -. .It Fl S With this option set, -.Nm ftpd +.Nm logs all anonymous transfers to the file .Pa /var/log/ftpd when this file exists. -. .It Fl U In previous versions of -.Nm ftpd , +.Nm Ns , when a passive mode client requested a data connection to the server, the server would use data ports in the range 1024..4999. Now, by default, the server will use data ports in the range 40000..44999. Specifying this @@ -136,7 +134,7 @@ When is specified, write the daemon's process ID to .Ar file . .It Fl A -Allow only anonymous ftp access +Allow only anonymous ftp access. .El .Pp The file @@ -161,7 +159,7 @@ prints it after a successful login. The ftp server currently supports the following ftp requests. The case of the requests is ignored. .Bl -column "Request" -offset indent -.It Request Ta "Description" +.It Sy Request Ta Sy "Description" .It ABOR Ta "abort previous command" .It ACCT Ta "specify account (ignored)" .It ALLO Ta "allocate storage (vacuously)" @@ -213,7 +211,7 @@ SITE request. .It UMASK Ta change umask, e.g. ``SITE UMASK 002'' .It IDLE Ta set idle-timer, e.g. ``SITE IDLE 60'' .It CHMOD Ta change mode of a file, e.g. ``SITE CHMOD 755 filename'' -.It HELP Ta give help information. +.It HELP Ta give help information .El .Pp The remaining ftp requests specified in Internet RFC 959 @@ -307,7 +305,7 @@ option is set, all transfers are logged as well. .El .Pp In the last case, -.Nm ftpd +.Nm takes special measures to restrict the client's access privileges. The server performs a .Xr chroot 2 @@ -358,7 +356,7 @@ account in this directory. .El .Pp If the system has multiple IP addresses, -.Nm ftpd +.Nm supports the idea of virtual hosts, which provides the ability to define multiple anonymous ftp areas, each one allocated to a different internet address. @@ -405,7 +403,7 @@ to setup and maintenance to guard against security related problems. If compiled with the .Em INTERNAL_LS option, -.Nm ftpd +.Nm will have internal support for handling remote requests to list files, and will not execute .Pa /bin/ls diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index d96154664680..df735aae1813 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -29,8 +29,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: ftpd.c,v 1.41 1997/07/24 09:26:12 davidn Exp $ */ #if 0 @@ -41,11 +39,13 @@ static char copyright[] = #endif /* not lint */ #endif -#if 0 #ifndef lint +#if 0 static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; -#endif /* not lint */ #endif +static const char rcsid[] = + "$Id$"; +#endif /* not lint */ /* * FTP server. @@ -551,7 +551,7 @@ lostconn(signo) if (debug) syslog(LOG_DEBUG, "lost connection"); - dologout(-1); + dologout(1); } #ifdef VIRTUAL_HOSTING diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c index 25deb506f5c7..5c9cd3fc2a3f 100644 --- a/libexec/ftpd/logwtmp.c +++ b/libexec/ftpd/logwtmp.c @@ -29,12 +29,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: logwtmp.c,v 1.5 1997/02/22 14:21:29 peter Exp $ */ #ifndef lint +#if 0 static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93"; +#endif +static const char rcsid[] = + "$Id$"; #endif /* not lint */ #include diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index ac0b76a9145c..c761446fe27e 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -32,15 +32,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: popen.c,v 1.7 1997/02/22 14:21:31 peter Exp $ */ -#if 0 #ifndef lint +#if 0 static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; -#endif /* not lint */ #endif +static const char rcsid[] = + "$Id$"; +#endif /* not lint */ #include #include diff --git a/libexec/ftpd/skey-stuff.c b/libexec/ftpd/skey-stuff.c index b6aba40d8a42..97f1650d7adc 100644 --- a/libexec/ftpd/skey-stuff.c +++ b/libexec/ftpd/skey-stuff.c @@ -1,8 +1,11 @@ /* Author: Wietse Venema, Eindhoven University of Technology. - * - * $Id$ */ +#ifndef lint +static const char rcsid[] = + "$Id$"; +#endif /* not lint */ + #include #include #include