summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2001-06-26 19:30:44 +0000
committerlukem <lukem@NetBSD.org>2001-06-26 19:30:44 +0000
commitafa0abb87ff8de59a14c89dcdb9965ced83f5ca3 (patch)
tree2fc3f8008b9f8c67962db733ca46a599f77d1d10 /libexec
parentead93c630b947647dbf7cc0cd8af28b736876b06 (diff)
s/tise/tize/ in docco, add "advertize" as synonym for "advertise"
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ftpd/conf.c7
-rw-r--r--libexec/ftpd/ftpd.810
-rw-r--r--libexec/ftpd/ftpd.c6
-rw-r--r--libexec/ftpd/ftpd.conf.511
-rw-r--r--libexec/ftpd/version.h4
5 files changed, 20 insertions, 18 deletions
diff --git a/libexec/ftpd/conf.c b/libexec/ftpd/conf.c
index d7de8e348c5..ef12a6f2885 100644
--- a/libexec/ftpd/conf.c
+++ b/libexec/ftpd/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.42 2001/05/25 23:40:25 kristerw Exp $ */
+/* $NetBSD: conf.c,v 1.43 2001/06/26 19:30:44 lukem Exp $ */
/*-
* Copyright (c) 1997-2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: conf.c,v 1.42 2001/05/25 23:40:25 kristerw Exp $");
+__RCSID("$NetBSD: conf.c,v 1.43 2001/06/26 19:30:44 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -208,7 +208,8 @@ parse_conf(const char *findclass)
if (0) {
/* no-op */
- } else if (strcasecmp(word, "advertise") == 0) {
+ } else if ((strcasecmp(word, "advertise") == 0)
+ || (strcasecmp(word, "advertize") == 0)) {
struct addrinfo hints, *res;
int error;
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 65f993a484a..be661be9e11 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,6 +1,6 @@
-.\" $NetBSD: ftpd.8,v 1.63 2000/12/18 02:32:51 lukem Exp $
+.\" $NetBSD: ftpd.8,v 1.64 2001/06/26 19:30:45 lukem Exp $
.\"
-.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1997-2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -67,7 +67,7 @@
.\"
.\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94
.\"
-.Dd December 18, 2000
+.Dd June 27, 2001
.Dt FTPD 8
.Os
.Sh NAME
@@ -142,7 +142,7 @@ for the
escape sequence (see
.Sx Display file escape sequences )
.It Fl h Ar hostname
-Explicitly set the hostname to advertise as to
+Explicitly set the hostname to advertize as to
.Ar hostname .
The default is the hostname associated with the IP address that
.Nm
@@ -218,7 +218,7 @@ This is the default.
.It Fl V Ar version
Use
.Ar version
-as the version to advertise in the login banner and in the output of
+as the version to advertize in the login banner and in the output of
.Sy STAT
and
.Sy SYST
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 05d617d5cd8..4e6acaada24 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.126 2001/06/11 01:50:51 wiz Exp $ */
+/* $NetBSD: ftpd.c,v 1.127 2001/06/26 19:30:45 lukem Exp $ */
/*
* Copyright (c) 1997-2001 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: ftpd.c,v 1.126 2001/06/11 01:50:51 wiz Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.127 2001/06/26 19:30:45 lukem Exp $");
#endif
#endif /* not lint */
@@ -2070,7 +2070,7 @@ statcmd(void)
(void *)&curclass.advertise.su_addr,
buf, sizeof(buf));
if (bp != NULL)
- reply(0, "PASV advertise address: %s", bp);
+ reply(0, "PASV advertize address: %s", bp);
}
if (curclass.portmin && curclass.portmax)
reply(0, "PASV port range: %d - %d",
diff --git a/libexec/ftpd/ftpd.conf.5 b/libexec/ftpd/ftpd.conf.5
index 0c7dc687bda..0394def8bf7 100644
--- a/libexec/ftpd/ftpd.conf.5
+++ b/libexec/ftpd/ftpd.conf.5
@@ -1,6 +1,6 @@
-.\" $NetBSD: ftpd.conf.5,v 1.15 2000/12/18 02:32:51 lukem Exp $
+.\" $NetBSD: ftpd.conf.5,v 1.16 2001/06/26 19:30:45 lukem Exp $
.\"
-.\" Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1997-2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -34,7 +34,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 18, 2000
+.Dd June 27, 2001
.Dt FTPD.CONF 5
.Os
.Sh NAME
@@ -119,7 +119,8 @@ command will return the class settings for the current user as defined by
Each configuration line may be one of:
.Bl -tag -width 4n
.It Sy advertise Ar class Ar host
-Set the address to advertise in the response to the
+.It Sy advertize Ar class Ar host
+Set the address to advertize in the response to the
.Sy PASV
and
.Sy LPSV
@@ -127,7 +128,7 @@ commands to the address for
.Ar host
(which may be either a host name or IP address).
This may be useful in some firewall configurations, although many
-ftp clients may not work if the address being advertised is different
+ftp clients may not work if the address being advertized is different
to the address that they've connected to.
If
.Ar class
diff --git a/libexec/ftpd/version.h b/libexec/ftpd/version.h
index 1a075c7c8f6..43aa74c1f72 100644
--- a/libexec/ftpd/version.h
+++ b/libexec/ftpd/version.h
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.32 2001/04/25 01:46:26 lukem Exp $ */
+/* $NetBSD: version.h,v 1.33 2001/06/26 19:30:45 lukem Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,5 +36,5 @@
*/
#ifndef FTPD_VERSION
-#define FTPD_VERSION "NetBSD-ftpd 20010425"
+#define FTPD_VERSION "NetBSD-ftpd 20010627"
#endif