[src/netbsd-3-0]: src/libexec/ftpd Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/da9988f9d2ca
branches:  netbsd-3-0
changeset: 579499:da9988f9d2ca
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Sep 18 19:13:44 2008 +0000

description:
Pull up following revision(s) (requested by lukem in ticket #1959):
        libexec/ftpd/ftpd.c: revision 1.170
NLST should return 450 instead of 550 upon error, per RFC 959.

diffstat:

 libexec/ftpd/ftpd.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r 73ff70c65ef1 -r da9988f9d2ca libexec/ftpd/ftpd.c
--- a/libexec/ftpd/ftpd.c       Thu Sep 18 19:12:08 2008 +0000
+++ b/libexec/ftpd/ftpd.c       Thu Sep 18 19:13:44 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpd.c,v 1.164.2.1.2.1 2008/09/18 19:12:08 bouyer Exp $        */
+/*     $NetBSD: ftpd.c,v 1.164.2.1.2.2 2008/09/18 19:13:44 bouyer Exp $        */
 
 /*
  * Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
 #if 0
 static char sccsid[] = "@(#)ftpd.c     8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: ftpd.c,v 1.164.2.1.2.1 2008/09/18 19:12:08 bouyer Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.164.2.1.2.2 2008/09/18 19:13:44 bouyer Exp $");
 #endif
 #endif /* not lint */
 
@@ -3172,11 +3172,11 @@
                memset(&gl, 0, sizeof(gl));
                freeglob = 1;
                if (glob(whichf, flags, 0, &gl)) {
-                       reply(550, "not found");
+                       reply(450, "Not found");
                        goto cleanup_send_file_list;
                } else if (gl.gl_pathc == 0) {
                        errno = ENOENT;
-                       perror_reply(550, whichf);
+                       perror_reply(450, whichf);
                        goto cleanup_send_file_list;
                }
                dirlist = gl.gl_pathv;
@@ -3205,7 +3205,7 @@
                                retrieve(argv, dirname);
                                goto cleanup_send_file_list;
                        }
-                       perror_reply(550, whichf);
+                       perror_reply(450, whichf);
                        goto cleanup_send_file_list;
                }
 
@@ -3275,9 +3275,9 @@
        }
 
        if (dout == NULL)
-               reply(550, "No files found.");
+               reply(450, "No files found.");
        else if (ferror(dout) != 0)
-               perror_reply(550, "Data connection");
+               perror_reply(451, "Data connection");
        else
                reply(226, "Transfer complete.");