[src/trunk]: src/libexec/ftpd s/tise/tize/ in docco, add "advertize" as synon...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b77a15899ecc
branches:  trunk
changeset: 511775:b77a15899ecc
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jun 26 19:30:44 2001 +0000

description:
s/tise/tize/ in docco, add "advertize" as synonym for "advertise"

diffstat:

 libexec/ftpd/conf.c      |   7 ++++---
 libexec/ftpd/ftpd.8      |  10 +++++-----
 libexec/ftpd/ftpd.c      |   6 +++---
 libexec/ftpd/ftpd.conf.5 |  11 ++++++-----
 libexec/ftpd/version.h   |   4 ++--
 5 files changed, 20 insertions(+), 18 deletions(-)

diffs (150 lines):

diff -r 748e4818bbc6 -r b77a15899ecc libexec/ftpd/conf.c
--- a/libexec/ftpd/conf.c       Tue Jun 26 19:22:02 2001 +0000
+++ b/libexec/ftpd/conf.c       Tue Jun 26 19:30:44 2001 +0000
@@ -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 @@
                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 -r 748e4818bbc6 -r b77a15899ecc libexec/ftpd/ftpd.8
--- a/libexec/ftpd/ftpd.8       Tue Jun 26 19:22:02 2001 +0000
+++ b/libexec/ftpd/ftpd.8       Tue Jun 26 19:30:44 2001 +0000
@@ -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 @@
 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 @@
 .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 -r 748e4818bbc6 -r b77a15899ecc libexec/ftpd/ftpd.c
--- a/libexec/ftpd/ftpd.c       Tue Jun 26 19:22:02 2001 +0000
+++ b/libexec/ftpd/ftpd.c       Tue Jun 26 19:30:44 2001 +0000
@@ -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 @@
 #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 @@
                            (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 -r 748e4818bbc6 -r b77a15899ecc libexec/ftpd/ftpd.conf.5
--- a/libexec/ftpd/ftpd.conf.5  Tue Jun 26 19:22:02 2001 +0000
+++ b/libexec/ftpd/ftpd.conf.5  Tue Jun 26 19:30:44 2001 +0000
@@ -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 @@
 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 @@
 .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 -r 748e4818bbc6 -r b77a15899ecc libexec/ftpd/version.h
--- a/libexec/ftpd/version.h    Tue Jun 26 19:22:02 2001 +0000
+++ b/libexec/ftpd/version.h    Tue Jun 26 19:30:44 2001 +0000
@@ -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