1 files changed, 32 insertions, 31 deletions

diff --git a/networking/ftpd.c b/networking/ftpd.c
index 2d2a3a44c..6adcb1dee 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -622,7 +622,7 @@ popen_ls(const char *opt)
         pid_t pid;
 
         argv[0] = "ftpd";
-        argv[1] = opt; /* "-l" or "-1" */
+        argv[1] = opt; /* "-lA" or "-1A" */
         argv[2] = "--";
         argv[3] = G.ftp_arg;
         argv[4] = NULL;
@@ -699,7 +699,7 @@ handle_dir_common(int opts)
         if (!(opts & USE_CTRL_CONN) && !port_or_pasv_was_seen())
                 return; /* port_or_pasv_was_seen emitted error response */
 
-        ls_fd = popen_ls((opts & LONG_LISTING) ? "-l" : "-1");
+        ls_fd = popen_ls((opts & LONG_LISTING) ? "-lA" : "-1A");
         ls_fp = xfdopen_for_read(ls_fd);
 /* FIXME: filenames with embedded newlines are mishandled */
 
@@ -1102,10 +1102,11 @@ enum {
 #if !BB_MMU
         OPT_l = (1 << 0),
         OPT_1 = (1 << 1),
+        OPT_A = (1 << 2),
 #endif
-        OPT_v = (1 << ((!BB_MMU) * 2 + 0)),
-        OPT_S = (1 << ((!BB_MMU) * 2 + 1)),
-        OPT_w = (1 << ((!BB_MMU) * 2 + 2)) * ENABLE_FEATURE_FTP_WRITE,
+        OPT_v = (1 << ((!BB_MMU) * 3 + 0)),
+        OPT_S = (1 << ((!BB_MMU) * 3 + 1)),
+        OPT_w = (1 << ((!BB_MMU) * 3 + 2)) * ENABLE_FEATURE_FTP_WRITE,
 };
 
 int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -1126,12 +1127,11 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
         G.timeout = 2 * 60;
         opt_complementary = "t+:T+:vv:SS";
 #if BB_MMU
-        opts = getopt32(argv,   "vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
+        opts = getopt32(argv,    "vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
 #else
-        opts = getopt32(argv, "l1vS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
+        opts = getopt32(argv, "l1AvS" IF_FEATURE_FTP_WRITE("w") "t:T:", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
         if (opts & (OPT_l|OPT_1)) {
                 /* Our secret backdoor to ls */
-/* TODO: pass -A? It shows dot files */
 /* TODO: pass --group-directories-first? would be nice, but ls doesn't do that yet */
                 if (fchdir(3) != 0)
                         _exit(127);
@@ -1172,18 +1172,6 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
         if (logmode)
                 applet_name = xasprintf("%s[%u]", applet_name, (int)getpid());
 
-#if !BB_MMU
-        G.root_fd = -1;
-#endif
-        argv += optind;
-        if (argv[0]) {
-#if !BB_MMU
-                G.root_fd = xopen("/", O_RDONLY | O_DIRECTORY);
-                close_on_exec_on(G.root_fd);
-#endif
-                xchroot(argv[0]);
-        }
-
         //umask(077); - admin can set umask before starting us
 
         /* Signals. We'll always take -EPIPE rather than a rude signal, thanks */
@@ -1199,23 +1187,22 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
         WRITE_OK(FTP_GREET);
         signal(SIGALRM, timeout_handler);
 
-#ifdef IF_WE_WANT_TO_REQUIRE_LOGIN
+#if ENABLE_FEATURE_FTP_AUTHENTICATION
         {
-                smallint user_was_specified = 0;
+                struct passwd *pw = NULL;
+
                 while (1) {
                         uint32_t cmdval = cmdio_get_cmd_and_arg();
 
                         if (cmdval == const_USER) {
-                                if (G.ftp_arg == NULL || strcasecmp(G.ftp_arg, "anonymous") != 0)
-                                        cmdio_write_raw(STR(FTP_LOGINERR)" Server is anonymous only\r\n");
-                                else {
-                                        user_was_specified = 1;
-                                        cmdio_write_raw(STR(FTP_GIVEPWORD)" Please specify the password\r\n");
-                                }
+                                pw = getpwnam(G.ftp_arg);
+                                cmdio_write_raw(STR(FTP_GIVEPWORD)" Please specify password\r\n");
                         } else if (cmdval == const_PASS) {
-                                if (user_was_specified)
-                                        break;
-                                cmdio_write_raw(STR(FTP_NEEDUSER)" Login with USER\r\n");
+                                if (check_password(pw, G.ftp_arg) > 0) {
+                                        break;  /* login success */
+                                }
+                                cmdio_write_raw(STR(FTP_LOGINERR)" Login failed\r\n");
+                                pw = NULL;
                         } else if (cmdval == const_QUIT) {
                                 WRITE_OK(FTP_GOODBYE);
                                 return 0;
@@ -1223,10 +1210,24 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
                                 cmdio_write_raw(STR(FTP_LOGINERR)" Login with USER and PASS\r\n");
                         }
                 }
+                change_identity(pw);
         }
         WRITE_OK(FTP_LOGINOK);
 #endif
 
+        /* Do this after auth, else /etc/passwd is not accessible */
+#if !BB_MMU
+        G.root_fd = -1;
+#endif
+        argv += optind;
+        if (argv[0]) {
+#if !BB_MMU
+                G.root_fd = xopen("/", O_RDONLY | O_DIRECTORY);
+                close_on_exec_on(G.root_fd);
+#endif
+                xchroot(argv[0]);
+        }
+
         /* RFC-959 Section 5.1
          * The following commands and options MUST be supported by every
          * server-FTP and user-FTP, except in cases where the underlying