3572541ce7
- cleanup the spec file
- drop patches fixed upstream: vsftpd-1.0.1-missingok.patch
vsftpd-1.2.1-nonrootconf.patch vsftpd-2.0.1-tcp_wrappers.patch
vsftpd-2.0.2-signal.patch vsftpd-2.0.3-daemonize_fds.patch
vsftpd-2.0.5-correct_comments.patch vsftpd-2.0.5-pasv_dot.patch
vsftpd-2.0.5-write_race.patch vsftpd-2.0.5-fix_unique.patch
vsftpd-2.0.5-uname_size.patch vsftpd-2.0.5-bind_denied.patch
vsftpd-2.0.5-pam_end.patch vsftpd-2.0.5-underscore_uname.patch
vsftpd-2.0.6-listen.patch
- join all configuration patches into one: vsftpd-1.1.3-rh.patch
vsftpd-1.2.1-conffile.patch vsftpd-2.0.1-dir.patch
vsftpd-2.0.1-server_args.patch vsftpd-2.0.3-background.patch
vsftpd-2.0.5-default_ipv6.patch vsftpd-2.0.5-add_ipv6_option.patch
vsftpd-2.0.5-man.patch
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
diff -up vsftpd-2.1.0/ls.c.filter vsftpd-2.1.0/ls.c
|
|
--- vsftpd-2.1.0/ls.c.filter 2008-02-02 02:30:41.000000000 +0100
|
|
+++ vsftpd-2.1.0/ls.c 2009-01-08 19:31:15.000000000 +0100
|
|
@@ -239,9 +239,31 @@ vsf_filename_passes_filter(const struct
|
|
int ret = 0;
|
|
char last_token = 0;
|
|
int must_match_at_current_pos = 1;
|
|
+
|
|
+
|
|
str_copy(&filter_remain_str, p_filter_str);
|
|
- str_copy(&name_remain_str, p_filename_str);
|
|
-
|
|
+
|
|
+ if (!str_isempty (&filter_remain_str) && !str_isempty(p_filename_str)) {
|
|
+ if (str_get_char_at(p_filter_str, 0) == '/') {
|
|
+ if (str_get_char_at(p_filename_str, 0) != '/') {
|
|
+ str_getcwd (&name_remain_str);
|
|
+
|
|
+ if (str_getlen(&name_remain_str) > 1) /* cwd != root dir */
|
|
+ str_append_char (&name_remain_str, '/');
|
|
+
|
|
+ str_append_str (&name_remain_str, p_filename_str);
|
|
+ }
|
|
+ else
|
|
+ str_copy (&name_remain_str, p_filename_str);
|
|
+ } else {
|
|
+ if (str_get_char_at(p_filter_str, 0) != '{')
|
|
+ str_basename (&name_remain_str, p_filename_str);
|
|
+ else
|
|
+ str_copy (&name_remain_str, p_filename_str);
|
|
+ }
|
|
+ } else
|
|
+ str_copy(&name_remain_str, p_filename_str);
|
|
+
|
|
while (!str_isempty(&filter_remain_str))
|
|
{
|
|
static struct mystr s_match_needed_str;
|
|
diff -up vsftpd-2.1.0/str.c.filter vsftpd-2.1.0/str.c
|
|
--- vsftpd-2.1.0/str.c.filter 2008-12-17 06:54:16.000000000 +0100
|
|
+++ vsftpd-2.1.0/str.c 2009-01-08 19:31:15.000000000 +0100
|
|
@@ -680,3 +680,14 @@ str_replace_unprintable(struct mystr* p_
|
|
}
|
|
}
|
|
|
|
+void
|
|
+str_basename (struct mystr* d_str, const struct mystr* path)
|
|
+{
|
|
+ static struct mystr tmp;
|
|
+
|
|
+ str_copy (&tmp, path);
|
|
+ str_split_char_reverse(&tmp, d_str, '/');
|
|
+
|
|
+ if (str_isempty(d_str))
|
|
+ str_copy (d_str, path);
|
|
+}
|
|
diff -up vsftpd-2.1.0/str.h.filter vsftpd-2.1.0/str.h
|
|
--- vsftpd-2.1.0/str.h.filter 2008-12-17 06:53:23.000000000 +0100
|
|
+++ vsftpd-2.1.0/str.h 2009-01-08 19:32:14.000000000 +0100
|
|
@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst
|
|
int str_atoi(const struct mystr* p_str);
|
|
filesize_t str_a_to_filesize_t(const struct mystr* p_str);
|
|
unsigned int str_octal_to_uint(const struct mystr* p_str);
|
|
+void str_basename (struct mystr* d_str, const struct mystr* path);
|
|
|
|
/* PURPOSE: Extract a line of text (delimited by \n or EOF) from a string
|
|
* buffer, starting at character position 'p_pos'. The extracted line will
|