From 08c61d3cd817ea94328da014536a508ed4b4e261 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Thu, 28 Feb 2002 15:50:14 +0000
Subject: [PATCH] if builtin_ls failes, return error

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10859 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftpd/ftpd.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index fe1064c06..154a92729 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -312,6 +312,11 @@ main(int argc, char **argv)
 		defumask = val;
 	}
     }
+    sp = getservbyname("ftp", "tcp");
+    if(sp)
+	port = sp->s_port;
+    else
+	port = htons(21);
     if(port_string) {
 	sp = getservbyname(port_string, "tcp");
 	if(sp)
@@ -321,12 +326,6 @@ main(int argc, char **argv)
 		port = htons(atoi(port_string));
 	    else
 		warnx("bad value for -p");
-    } else {
-	sp = getservbyname("ftp", "tcp");
-	if(sp)
-	    port = sp->s_port;
-	else
-	    port = htons(21);
     }
 		    
     if (maxtimeout < ftpd_timeout)
@@ -2165,8 +2164,10 @@ list_file(char *file)
 	if (dout == NULL)
 	    return;
 	set_buffer_size(fileno(dout), 0);
-	builtin_ls(dout, file);
-	reply(226, "Transfer complete.");
+	if(builtin_ls(dout, file) == 0)
+	    reply(226, "Transfer complete.");
+	else
+	    reply(451, "Requested action aborted. Local error in processing.");
 	fclose(dout);
 	data = -1;
 	pdata = -1;