ftpd: work around LIST -aXYZ too, not only LIST -lXYZ

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-04-21 18:05:10 -04:00
parent 5a7c72015c
commit 238c83bd82
2 changed files with 4 additions and 4 deletions

View File

@ -122,8 +122,8 @@ config FEATURE_FTPD_ACCEPT_BROKEN_LIST
default y default y
depends on FTPD depends on FTPD
help help
Some ftp-clients (among them KDE's Konqueror) issue illegal Some ftp clients (among them KDE's Konqueror) issue illegal
"LIST -la" requests. This option works around those problems. "LIST -l" requests. This option works around such problems.
It might prevent you from listing files starting with "-" and It might prevent you from listing files starting with "-" and
it increases the code size by ~40 bytes. it increases the code size by ~40 bytes.
Most other ftp servers seem to behave similar to this. Most other ftp servers seem to behave similar to this.

View File

@ -618,10 +618,10 @@ popen_ls(const char *opt)
argv[4] = NULL; argv[4] = NULL;
/* Improve compatibility with non-RFC conforming FTP clients /* Improve compatibility with non-RFC conforming FTP clients
* which send e.g. "LIST -l", "LIST -la". * which send e.g. "LIST -l", "LIST -la", "LIST -aL".
* See https://bugs.kde.org/show_bug.cgi?id=195578 */ * See https://bugs.kde.org/show_bug.cgi?id=195578 */
if (ENABLE_FEATURE_FTPD_ACCEPT_BROKEN_LIST if (ENABLE_FEATURE_FTPD_ACCEPT_BROKEN_LIST
&& G.ftp_arg && G.ftp_arg[0] == '-' && G.ftp_arg[1] == 'l' && G.ftp_arg && G.ftp_arg[0] == '-'
) { ) {
const char *tmp = strchr(G.ftp_arg, ' '); const char *tmp = strchr(G.ftp_arg, ' ');
if (tmp) /* skip the space */ if (tmp) /* skip the space */