[src/netbsd-1-4]: src/libexec/ftpd Apply patch (requested by sommerfeld):

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

details:   https://anonhg.NetBSD.org/src/rev/6d2d3c0e57fb
branches:  netbsd-1-4
changeset: 470592:6d2d3c0e57fb
user:      he <he%NetBSD.org@localhost>
date:      Thu May 11 10:14:37 2000 +0000

description:
Apply patch (requested by sommerfeld):
  Back out unnecessary half of revision 1.70 which breaks parsing
  of /etc/ftpchroot.

diffstat:

 libexec/ftpd/ftpd.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 0cc095f87d69 -r 6d2d3c0e57fb libexec/ftpd/ftpd.c
--- a/libexec/ftpd/ftpd.c       Thu May 11 10:12:44 2000 +0000
+++ b/libexec/ftpd/ftpd.c       Thu May 11 10:14:37 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpd.c,v 1.61.2.1 1999/10/01 12:08:06 he Exp $ */
+/*     $NetBSD: ftpd.c,v 1.61.2.2 2000/05/11 10:14:37 he Exp $ */
 
 /*
  * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)ftpd.c     8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: ftpd.c,v 1.61.2.1 1999/10/01 12:08:06 he Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.61.2.2 2000/05/11 10:14:37 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -489,8 +489,6 @@
                if (glob == NULL || glob[0] == '#')
                        continue;
                perm = strtok(NULL, " \t\n");
-               if (perm == NULL)
-                       continue;
                if (fnmatch(glob, name, 0) == 0)  {
                        if (perm != NULL &&
                            ((strcasecmp(perm, "allow") == 0) ||