wok view busybox/stuff/busybox-1.26-ftpd.u @ rev 20175
fake-sane: fix path
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Jan 24 14:55:51 2018 +0100 (2018-01-24) |
| parents | |
| children |
line source
1 Keep anonynous default usage, need -a for authentication check
2 --- busybox-1.26/networking/ftpd.c
3 +++ busybox-1.26/networking/ftpd.c
4 @@ -47,7 +47,7 @@
5 //kbuild:lib-$(CONFIG_FTPD) += ftpd.o
7 //usage:#define ftpd_trivial_usage
8 -//usage: "[-wvS] [-t N] [-T N] [DIR]"
9 +//usage: "[-wvSa] [-t N] [-T N] [DIR]"
10 //usage:#define ftpd_full_usage "\n\n"
11 //usage: "Anonymous FTP server\n"
12 //usage: "\n"
13 @@ -59,6 +59,7 @@
14 //usage: "\n -w Allow upload"
15 //usage: "\n -v Log errors to stderr. -vv: verbose log"
16 //usage: "\n -S Log errors to syslog. -SS: verbose log"
17 +//usage: "\n -a Authentication check"
18 //usage: "\n -t,-T Idle and absolute timeouts"
19 //usage: "\n DIR Change root to this directory"
21 @@ -1142,7 +1143,8 @@
22 #endif
23 OPT_v = (1 << ((!BB_MMU) * 3 + 0)),
24 OPT_S = (1 << ((!BB_MMU) * 3 + 1)),
25 - OPT_w = (1 << ((!BB_MMU) * 3 + 2)) * ENABLE_FEATURE_FTPD_WRITE,
26 + OPT_a = (1 << ((!BB_MMU) * 3 + 2)),
27 + OPT_w = (1 << ((!BB_MMU) * 3 + 3)) * ENABLE_FEATURE_FTPD_WRITE,
28 };
30 int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
31 @@ -1166,9 +1168,9 @@
32 G.timeout = 2 * 60;
33 opt_complementary = "vv:SS";
34 #if BB_MMU
35 - opts = getopt32(argv, "vS" IF_FEATURE_FTPD_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
36 + opts = getopt32(argv, "vSa" IF_FEATURE_FTPD_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
37 #else
38 - opts = getopt32(argv, "l1AvS" IF_FEATURE_FTPD_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
39 + opts = getopt32(argv, "l1AvSa" IF_FEATURE_FTPD_WRITE("w") "t:+T:+", &G.timeout, &abs_timeout, &G.verbose, &verbose_S);
40 if (opts & (OPT_l|OPT_1)) {
41 /* Our secret backdoor to ls */
42 /* TODO: pass --group-directories-first? would be nice, but ls doesn't do that yet */
43 @@ -1232,7 +1234,7 @@
44 signal(SIGALRM, timeout_handler);
46 #if ENABLE_FEATURE_FTPD_AUTHENTICATION
47 - while (1) {
48 + if (opts & OPT_a) while (1) {
49 uint32_t cmdval = cmdio_get_cmd_and_arg();
50 if (cmdval == const_USER) {
51 pw = getpwnam(G.ftp_arg);
52 @@ -1282,7 +1284,7 @@
53 }
55 #if ENABLE_FEATURE_FTPD_AUTHENTICATION
56 - change_identity(pw);
57 + if (opts & OPT_a) change_identity(pw);
58 #endif
60 /* RFC-959 Section 5.1